cleanup

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/AbstractOaiPmhController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/AbstractOaiPmhController.java
index 0e6f0d4282d884529b29ca93b49e674a4c2dc425..23e1e984526b13f7c88cff7040edcc7f0367cc0c 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/AbstractOaiPmhController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/AbstractOaiPmhController.java
@@ -357,7 +357,7 @@ public abstract class AbstractOaiPmhController<T extends IdentifiableEntity, SER
                 clazz = resumptionToken.getSet().getSetClass();
             }
 
-            List<AuditCriterion> criteria = new ArrayList<AuditCriterion>();
+            List<AuditCriterion> criteria = new ArrayList<>();
             if(onlyItemsWithLsid){
                 //criteria.add(AuditEntity.property("lsid_lsid").isNotNull());
                 //TODO this isNotNull criterion did not work with mysql, so using a like statement as interim solution

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java
index 3a5cf8b14cd9a3752e26b6212caa4a797cf522f6..77a313b9b4e8ceef8ef668fcc9b79ce3317d5555 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java
@@ -26,11 +26,12 @@ import io.swagger.annotations.Api;
 @Controller
 @Api("OAI-PMH Taxa")
 @RequestMapping(value = "/taxon/oai", params = "verb")
-public class TaxonOaiPmhController extends AbstractOaiPmhController<TaxonBase, ITaxonService> {
+public class TaxonOaiPmhController
+        extends AbstractOaiPmhController<TaxonBase, ITaxonService> {
 
     @Override
     protected List<String> getPropertyPaths() {
-        List<String> propertyPaths = new ArrayList<String>();
+        List<String> propertyPaths = new ArrayList<>();
         propertyPaths.add("createdBy");
         propertyPaths.add("updatedBy");
         propertyPaths.add("name.titleCache");
@@ -57,4 +58,4 @@ public class TaxonOaiPmhController extends AbstractOaiPmhController<TaxonBase, I
     public void setService(ITaxonService service) {
         this.service = service;
     }
-}
+}
\ No newline at end of file

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/ResumptionToken.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/ResumptionToken.java
index 685d865e33cb20dfae5fd35f9798881e118f7132..ef861ce032baa2b41ecf192795707479683ffde9 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/ResumptionToken.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/ResumptionToken.java
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1-b02-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.11.02 at 12:58:05 PM GMT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1-b02-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.11.02 at 12:58:05 PM GMT
 //
 
 
@@ -32,11 +32,11 @@ import eu.etaxonomy.cdm.jaxb.DateTimeAdapter;
  * A resumptionToken may have 3 optional attributes
  *        and can be used in ListSets, ListIdentifiers, ListRecords
  *        responses.
- * 
+ *
  * <p>Java class for resumptionTokenType complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType name="resumptionTokenType">
  *   &lt;simpleContent>
@@ -48,8 +48,8 @@ import eu.etaxonomy.cdm.jaxb.DateTimeAdapter;
  *   &lt;/simpleContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "resumptionTokenType", propOrder = {
@@ -57,32 +57,32 @@ import eu.etaxonomy.cdm.jaxb.DateTimeAdapter;
 })
 public class ResumptionToken implements Serializable {
 
-    /**
-        * 
-        */
-       private static final long serialVersionUID = 1L;
-       
+    private static final long serialVersionUID = 6381710233899646281L;
+
     @XmlValue
     protected String value;
+
     @XmlAttribute
     @XmlJavaTypeAdapter(DateTimeAdapter.class)
     protected DateTime expirationDate;
+
     @XmlAttribute
     @XmlSchemaType(name = "positiveInteger")
     protected BigInteger completeListSize;
+
     @XmlAttribute
     @XmlSchemaType(name = "nonNegativeInteger")
     protected BigInteger cursor;
-    
+
     @XmlTransient
        private MetadataPrefix metadataPrefix;
-    
+
     @XmlTransient
        private DateTime from;
-    
+
     @XmlTransient
        private DateTime until;
-    
+
     @XmlTransient
        private SetSpec set;
 
@@ -101,11 +101,11 @@ public class ResumptionToken implements Serializable {
 
        /**
      * Gets the value of the value property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getValue() {
         return value;
@@ -113,11 +113,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Sets the value of the value property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setValue(String value) {
         this.value = value;
@@ -125,11 +125,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Gets the value of the expirationDate property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link XMLGregorianCalendar }
-     *     
+     *
      */
     public DateTime getExpirationDate() {
         return expirationDate;
@@ -137,11 +137,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Sets the value of the expirationDate property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link XMLGregorianCalendar }
-     *     
+     *
      */
     public void setExpirationDate(DateTime value) {
         this.expirationDate = value;
@@ -149,11 +149,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Gets the value of the completeListSize property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link BigInteger }
-     *     
+     *
      */
     public BigInteger getCompleteListSize() {
         return completeListSize;
@@ -161,11 +161,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Sets the value of the completeListSize property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link BigInteger }
-     *     
+     *
      */
     public void setCompleteListSize(BigInteger value) {
         this.completeListSize = value;
@@ -173,11 +173,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Gets the value of the cursor property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link BigInteger }
-     *     
+     *
      */
     public BigInteger getCursor() {
         return cursor;
@@ -185,11 +185,11 @@ public class ResumptionToken implements Serializable {
 
     /**
      * Sets the value of the cursor property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link BigInteger }
-     *     
+     *
      */
     public void setCursor(BigInteger value) {
         this.cursor = value;
@@ -210,7 +210,7 @@ public class ResumptionToken implements Serializable {
        public SetSpec getSet() {
                return set;
        }
-       
+
        public void updateResults(Pager results) {
                this.completeListSize = BigInteger.valueOf(results.getCount());
                this.cursor = BigInteger.valueOf(results.getPageSize() * results.getCurrentIndex());