cleanup

diff --git a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DOI.java b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DOI.java
index 8ba12e6f8233ac6fa9d07b7373fa043c93d0da26..84b26e16abdd7d81ea62b262ce7f3eb7661bd4d7 100644 (file)
--- a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DOI.java
+++ b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DOI.java
@@ -18,7 +18,7 @@ import org.apache.commons.lang.StringUtils;
  * A class for handling DOIs (http://www.doi.org).\r
  * It offers parsing and formatting functionality as well as validation.\r
  * A {@link DOI} object can only be created by syntactic valid input.\r
- * It internally stores a doi 2 strings, the first one being the registrant number\r
+ * It internally stores 2 strings, the first one being the registrant number\r
  * (including sub numbers), the second being the suffix.\r
  *\r
  *\r

diff --git a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DynamicBatch.java b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DynamicBatch.java
index ee693b6a63dacf4d0e5ceb4fae97fdca3598b8ec..6bc2d7e94c449b2fbc7259aa78b53e0741f97e93 100644 (file)
--- a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DynamicBatch.java
+++ b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DynamicBatch.java
@@ -125,7 +125,7 @@ public class DynamicBatch {
                    items.add(nextUnprocessed);
                 } else {
                     if(remainingUnprocessed == null) {
-                        remainingUnprocessed = new ArrayList<Integer>(unprocessedIds.size() - i + 1);
+                        remainingUnprocessed = new ArrayList<>(unprocessedIds.size() - i + 1);
                     }
                     remainingUnprocessed.add(nextUnprocessed);
                 }
@@ -151,9 +151,6 @@ public class DynamicBatch {
         batchItemCount++;
     }
 
-    /**
-     *
-     */
     private void reduceSize() {
         manageUnprocessedItems();
         batchSize = itemWhereLimitsTouched;
@@ -170,9 +167,6 @@ public class DynamicBatch {
         }
     }
 
-    /**
-     *
-     */
     protected void manageUnprocessedItems() {
 
         if(itemWhereLimitsTouched > 0) {

diff --git a/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/DoiTest.java b/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/DoiTest.java
index bddc87e6b8c92876aeba97eda40f0ec52fb21b81..80484a08de6a2d41e8c91105db2b4a2e157a35b5 100644 (file)
--- a/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/DoiTest.java
+++ b/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/DoiTest.java
@@ -9,11 +9,9 @@
 package eu.etaxonomy.cdm.common;\r
 \r
 import org.junit.Assert;\r
-import org.junit.Before;\r
 import org.junit.Test;\r
 \r
 /**\r
- *\r
  * Test class for testing the {@link DOI} class.\r
  *\r
  * For doi syntax see also http://www.doi.org/doi_handbook/2_Numbering.html\r
@@ -21,17 +19,9 @@ import org.junit.Test;
  * http://stackoverflow.com/questions/27910/finding-a-doi-in-a-document-or-page\r
  *\r
  * @author a.mueller\r
- *\r
  */\r
 public class DoiTest {\r
 \r
-       /**\r
-        * @throws java.lang.Exception\r
-        */\r
-       @Before\r
-       public void setUp() throws Exception {\r
-       }\r
-\r
        @Test\r
        public void testValidParser() {\r
                String validDoi = "10.1002/1234";\r
@@ -156,8 +146,6 @@ public class DoiTest {
        }\r
 \r
 \r
-\r
-\r
        private void testInvalid(String invalidDoi) {\r
                try {\r
                        DOI.fromString(invalidDoi);\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java
index 5090afb8a3042b088e0ab8e0b5ec31135d30e109..56f1ba49e0dc0f2e37ae5c2704f239c3149ae18e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -42,7 +42,7 @@ public class DOIUserType  extends AbstractUserType implements UserType {
                if (o == null) {\r
             return null;\r
         }\r
-               \r
+\r
                DOI doi = (DOI) o;\r
 \r
         try {\r
@@ -64,10 +64,10 @@ public class DOIUserType  extends AbstractUserType implements UserType {
        }\r
 \r
        @Override\r
-       public DOI nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) \r
+       public DOI nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner)\r
                        throws HibernateException, SQLException {\r
         String val = (String) StandardBasicTypes.STRING.nullSafeGet(rs, names, session, owner);\r
-               \r
+\r
                if(val == null) {\r
                        return null;\r
                } else {\r
@@ -81,11 +81,11 @@ public class DOIUserType  extends AbstractUserType implements UserType {
        }\r
 \r
        @Override\r
-       public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor session) \r
+       public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor session)\r
                        throws HibernateException, SQLException {\r
-               if (value == null) { \r
+               if (value == null) {\r
             StandardBasicTypes.STRING.nullSafeSet(statement, value, index, session);\r
-        } else { \r
+        } else {\r
                DOI doi = (DOI)value;\r
             StandardBasicTypes.STRING.nullSafeSet(statement, doi.toString(), index, session);\r
         }\r
@@ -100,9 +100,4 @@ public class DOIUserType  extends AbstractUserType implements UserType {
        public int[] sqlTypes() {\r
                return SQL_TYPES;\r
        }\r
-\r
-       \r
-\r
-\r
-\r
 }\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DoiBridge.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DoiBridge.java
index 182eafc14ce2cfe79b8dc0715158a6732a7f9ced..3d355b0171f970e9126aa9a585d85d8de9955d90 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DoiBridge.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/DoiBridge.java
@@ -16,10 +16,10 @@ import eu.etaxonomy.cdm.common.DOI;
 /**
  * @author a.mueller
  * @since Sep 05, 2013
- *
  */
 public class DoiBridge implements StringBridge {
 
+    @Override
     public String objectToString(Object object) {
         if(object != null) {
             return ((DOI)object).toString();