cleanup

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/permission/Role.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/permission/Role.java
index b8c567125b3cc0d289bfc0b8367115fb9c466124..b079fbe6eccd630e779a1c66b67b9f4f318914ce 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/permission/Role.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/permission/Role.java
@@ -54,7 +54,6 @@ public class Role extends AuthorityBase {
 
     }
 
-
     // ********************** GETTER / SETTER **************************/
 
     public String getRole() {
@@ -64,10 +63,10 @@ public class Role extends AuthorityBase {
         this.role = role;
     }
 
+    //************************* STRING ***********************************/
+
     @Override
     public String toString() {
         return this.role;
     }
-
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/CdmAuthority.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/CdmAuthority.java
index 4ad77e158228a901d77d2e61d27457544dc62740..1078abeb8985cb0c27c485f6eea57124ef0f4695 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/CdmAuthority.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/CdmAuthority.java
@@ -68,8 +68,7 @@ import eu.etaxonomy.cdm.model.permission.PermissionClass;
  */
 public class CdmAuthority implements GrantedAuthority, ConfigAttribute, IGrantedAuthorityConverter {
 
-    private static final long serialVersionUID = 1L;
-
+    private static final long serialVersionUID = -41894743719582595L;
     public static final Logger logger = Logger.getLogger(CdmAuthority.class);
 
     private static Map<String, CdmAuthority> grantedAuthorityCache = new HashMap<>();

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/Role.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/Role.java
index a8d00b953f7335dbbf4eb585c97775dd6d176174..48fd24391f9befa74b34d3e857dd481e55ea05d0 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/Role.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/Role.java
@@ -33,11 +33,6 @@ public class Role implements GrantedAuthority, IGrantedAuthorityConverter {
     public final static Role ROLE_REMOTING = new Role(UUID.fromString("be004bf6-0498-48e3-9f06-ff93fc9cdc9a"), "ROLE_REMOTING");
 
     private final UUID uuid;
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
     private final String authority;
 
     public Role(UUID uuid, String authority) {
@@ -104,6 +99,10 @@ public class Role implements GrantedAuthority, IGrantedAuthorityConverter {
                return role;
     }
 
+    public UUID getUuid() {
+        return uuid;
+    }
+
     @Override
     public String getAuthority() {
         return authority;
@@ -113,5 +112,4 @@ public class Role implements GrantedAuthority, IGrantedAuthorityConverter {
     public String toString(){
         return getAuthority();
     }
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/FirstDataInserter.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/FirstDataInserter.java
index 2ad5a8471c27c85b25dcd8f3cbbd42c58fb1941d..3954dfcecb1cb1c63b71ad3576494ffe8a597f0e 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/FirstDataInserter.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/FirstDataInserter.java
@@ -18,7 +18,6 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.ContextStartedEvent;
-import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
@@ -141,7 +140,7 @@ public class FirstDataInserter extends AbstractDataInserter {
     private IGrantedAuthorityService grantedAuthorityService;
 
     // not to be autowired, since the FirstdataInserter must be usable without security
-    private AuthenticationProvider runAsAuthenticationProvider = null;
+//    private AuthenticationProvider runAsAuthenticationProvider = null;
 
     protected PlatformTransactionManager transactionManager;
 
@@ -178,7 +177,6 @@ public class FirstDataInserter extends AbstractDataInserter {
         insertFirstData();
     }
 
-
     private void insertFirstData() {
 
         // this ApplicationListener may be called multiple times in nested

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.java
index 2353b5eb0ea51955784029812d1170a194649829..864a9182ae3242010e98cd920f2628ee817bbbf1 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.java
@@ -42,7 +42,7 @@ import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 @DataSet
 public class FirstDataInserterTest extends CdmTransactionalIntegrationTest {
 
-    private final String[] tableNames = new String[]{"USERACCOUNT", "USERACCOUNT_GRANTEDAUTHORITYIMPL", "GRANTEDAUTHORITYIMPL", "CDMMETADATA"};
+    private final String[] tableNames = new String[]{"USERACCOUNT", "USERACCOUNT_GRANTEDAUTHORITYIMPL", "GRANTEDAUTHORITYIMPL", "CDMMETADATA", "GROUP"};
 
     @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(TaxonServiceImplTest.class);