cleanup

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/MnTableCreator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/MnTableCreator.java
index 83a33b89fcc2a09ba41025cb6449d7124339e6a1..cabaa8d68e57386d6e6410c0977a3957406d5680 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/MnTableCreator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/MnTableCreator.java
@@ -27,7 +27,8 @@ public class MnTableCreator extends TableCreator {
        private boolean is1toM;\r
        private String sortIndexOrMapkeyColName;\r
 \r
-       public static MnTableCreator NewMnInstance(String stepName, String firstTableName, String secondTableName, boolean includeAudTable, boolean isList, boolean is1toM){\r
+       public static MnTableCreator NewMnInstance(String stepName, String firstTableName,\r
+               String secondTableName, boolean includeAudTable, boolean isList, boolean is1toM){\r
                MnTableCreator result = new MnTableCreator(stepName, firstTableName, null, null,\r
                        secondTableName, null, null, new String[]{}, new String[]{}, null, null,\r
                        includeAudTable, isList, is1toM, false, false, false, null);\r
@@ -49,7 +50,8 @@ public class MnTableCreator extends TableCreator {
         * <code>true</code> but for {@link List lists} should be <code>false</code>.\r
         * @return\r
         */\r
-       public static MnTableCreator NewMnInstance(String stepName, String firstTableName, String firstTableAlias, String secondTableName, String secondTableAlias, String attributeName,\r
+       public static MnTableCreator NewMnInstance(String stepName, String firstTableName, String firstTableAlias,\r
+               String secondTableName, String secondTableAlias, String attributeName,\r
                boolean includeAudTable, boolean isList, boolean is1toM){\r
                MnTableCreator result = new MnTableCreator(stepName, firstTableName, firstTableAlias, null, secondTableName, secondTableAlias, attributeName,\r
                        new String[]{}, new String[]{}, null, null,\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SimpleSchemaUpdaterStep.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SimpleSchemaUpdaterStep.java
index 7b3f1131d7c6a2db66084b655e7a664e6f83ea5d..fea3aea7e01afbff052fd9556570513dd00db682 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SimpleSchemaUpdaterStep.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SimpleSchemaUpdaterStep.java
@@ -28,8 +28,8 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 public class SimpleSchemaUpdaterStep extends SchemaUpdaterStepBase {\r
        private static final Logger logger = Logger.getLogger(SimpleSchemaUpdaterStep.class);\r
 \r
-       private final Map<DatabaseTypeEnum, String> queryMap = new HashMap<DatabaseTypeEnum, String>();\r
-       private final Map<DatabaseTypeEnum, String> auditQueryMap = new HashMap<DatabaseTypeEnum, String>();\r
+       private final Map<DatabaseTypeEnum, String> queryMap = new HashMap<>();\r
+       private final Map<DatabaseTypeEnum, String> auditQueryMap = new HashMap<>();\r
 \r
        private boolean includeAudit = false;\r
 //     private String tableName;\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TableCreator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TableCreator.java
index 3513f72b217d2fdaa243894275cf8157d363ebbd..e73e935f4cfb4fc40d660da368a8d88bee4c4109 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TableCreator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TableCreator.java
@@ -198,7 +198,6 @@ public class TableCreator extends AuditedSchemaUpdaterStepBase {
                        //Rights\r
                        stepName= "Add @tableName rights";\r
                        stepName = stepName.replace("@tableName", tableName);\r
-                       tableCreator = MnTableCreator.NewMnInstance(stepName, tableName, "RightsInfo", SchemaUpdaterBase.INCLUDE_AUDIT, !IS_LIST, IS_M_TO_M);\r
                        tableCreator = MnTableCreator.NewMnInstance(stepName, tableName, null, "Rights", "RightsInfo", "rights", SchemaUpdaterBase.INCLUDE_AUDIT, !IS_LIST, IS_M_TO_M);\r
             mnTablesStepList.add(tableCreator);\r
                }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/VocabularyOrderUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/VocabularyOrderUpdater.java
index abfbcc174650375317acaf13a6880dfecd91c3f0..f2ae302979b0455f89f65db3ce11a6c1d4b37a47 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/VocabularyOrderUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_50/VocabularyOrderUpdater.java
@@ -26,9 +26,10 @@ import eu.etaxonomy.cdm.database.update.SchemaUpdaterStepBase;
  * Updates the CdmPreference NomenclaturalCode  #3658
  *
  * @author a.mueller
- * @since 13.10.2016
+ * @since 05.05.2018
  */
 public class VocabularyOrderUpdater extends SchemaUpdaterStepBase {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(VocabularyOrderUpdater.class);
 
        private static final String stepName = "Update vocabulary order";