cleanup

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java
index d350bcd7e3376a779d740d56e1e007688c3db871..d1bf78cd23bc520c488ea9e2f283b321e5cb86bd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java
@@ -14,7 +14,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.remoting.support.RemoteInvocation;
 import org.springframework.remoting.support.RemoteInvocationResult;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
index f24763f552934385ef60b31711dc4dff803161d5..7322133e74f26a6ba6c22717848b948a3771f130 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
@@ -29,7 +29,6 @@ import org.eclipse.ui.commands.ICommandService;
 import eu.etaxonomy.cdm.api.service.dto.DescriptionBaseDto;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.name.NomenclaturalSource;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
@@ -44,6 +43,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * Scans eu.etaxonomy.taxeditor.store.cdmViewer extension point.
+ *
  * @author pplitzner
  * @date Jul 7, 2015
  */
@@ -199,7 +199,7 @@ public class CdmViewerUtil {
                 ReferencingObjectDto dto = (ReferencingObjectDto)o;
                 uuidAndTitleCache = dto.getOpenInTarget() != null ? dto.getOpenInTarget() : dto;
             }else if (o instanceof UuidAndTitleCache){
-                uuidAndTitleCache = (UuidAndTitleCache<CdmBase>)o;
+                uuidAndTitleCache = (UuidAndTitleCache<?>)o;
             }else if (o instanceof TermNodeDto){
                 uuidAndTitleCache = new UuidAndTitleCache<>(DefinedTermBase.class, ((TermNodeDto)o).getTerm().getUuid(), null, ((TermNodeDto)o).getTerm().getTitleCache());
             }else if (o instanceof DescriptionBaseDto){

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
index f29b47d0750cc8f1c47a860cd0a5b1518c945c9b..e4b4cecc607ff94b07067f7ee07e8bce5fd6155a 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
@@ -11,7 +11,8 @@ package eu.etaxonomy.taxeditor.httpinvoker;
 import java.lang.reflect.Field;
 import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.junit.BeforeClass;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -36,13 +37,11 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 import net.sf.ehcache.CacheManager;
 
-
 /**
  * Base class for remoting tests, responsible for
  * - starting / stop the cdm server
  * - running some basic connection tests
  * - setting up the remote configuration.
- *
  */
 @Transactional(TransactionMode.DISABLED)
 @SpringApplicationContext("file:./target/classes/eu/etaxonomy/cdm/testRemotingApplicationContext.xml")
@@ -71,8 +70,6 @@ public abstract class BaseRemotingTest extends ThreadedTest {
             e.printStackTrace();
            // Assert.fail("Server failed to start. Reason : " + e.getMessage());
         }
-
-
     }
 
     public static void emptyAllCachesExceptModelCache() {
@@ -85,7 +82,6 @@ public abstract class BaseRemotingTest extends ThreadedTest {
         }
     }
 
-
     public static void initializeController(String sourceName, String host, int port, String contextPath, String username, String password) {
 
         if(CdmApplicationState.getCurrentAppConfig() != null) {
@@ -116,7 +112,6 @@ public abstract class BaseRemotingTest extends ThreadedTest {
         UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password);
         Authentication authentication = getRemoteApplicationController().getAuthenticationManager().authenticate(token);
 
-
         User user = (User) authentication.getPrincipal();
         /* circumventing problem with hibernate not refreshing the transient collection authorities in this case,
          * see http://dev.e-taxonomy.eu/trac/ticket/4053 */
@@ -126,9 +121,6 @@ public abstract class BaseRemotingTest extends ThreadedTest {
         CdmApplicationState.setCurrentSecurityContext(SecurityContextHolder.getContext());
 
 
-
-
-
 //        SecurityContextHolder.clearContext();
 //        SecurityContextImpl sc = new SecurityContextImpl();
 //        Authentication token = new UsernamePasswordAuthenticationToken(username,password);
@@ -142,7 +134,6 @@ public abstract class BaseRemotingTest extends ThreadedTest {
 
     }
 
-
     protected static CdmApplicationRemoteController getRemoteApplicationController() {
         return (CdmApplicationRemoteController) CdmApplicationState.getCurrentAppConfig();
     }
@@ -159,7 +150,6 @@ public abstract class BaseRemotingTest extends ThreadedTest {
         return cdmEntitySessionManager;
     }
 
-
     protected static CdmEntitySession getSession(ICdmEntitySessionEnabled sessionOwner) {
         Map<ICdmEntitySessionEnabled, CdmEntitySession> ownerSessionMap =
                 (Map<ICdmEntitySessionEnabled, CdmEntitySession>) getFieldValueViaReflection(cdmEntitySessionManager, "ownerSessionMap");
@@ -174,29 +164,20 @@ public abstract class BaseRemotingTest extends ThreadedTest {
         return (ConversationalTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
     }
 
-
     protected static Object getFieldValueViaReflection(Object object, String fieldName) {
         Class<?> clazz = object.getClass();
         try {
             Field field = clazz.getDeclaredField(fieldName);
             field.setAccessible(true);
             return field.get(object);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
+        } catch (NoSuchFieldException | SecurityException |
+                IllegalArgumentException | IllegalAccessException e) {
             e.printStackTrace();
         }
         return null;
     }
 
-
     protected static void authenticateDefaultUser() {
         authenticate(user, password);
     }
-
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
index 4a152ddbdfddaf38db3acac00e98c53491d9a170..c6055064c8bbcb37d608ce74f336826a9622bb42 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
@@ -9,14 +9,14 @@
 package eu.etaxonomy.taxeditor.session;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -336,11 +336,11 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
             Assert.fail();
         }
 
-        Set<Integer> ids = new HashSet<Integer>();
+        List<Integer> ids = new ArrayList<>();
         ids.add(2753);
         ids.add(2754);
         ids.add(2751);
-        List<PolytomousKeyNode> nodes = polytomousKeyNodeService.findById(ids);
+        List<PolytomousKeyNode> nodes = polytomousKeyNodeService.loadByIds(ids, null);
         for (PolytomousKeyNode child:nodes){
             child.setSubkey(null);
            // polytomousKeyNodeService.merge(child);
@@ -367,7 +367,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         PolytomousKeyNode rootNode = pKey.getRoot();
         List<PolytomousKeyNode> children = rootNode.getChildren();
         PolytomousKeyNode child = rootNode.getChildAt(0);
-        DeleteResult result = polytomousKeyNodeService.delete(child.getUuid(), true);
+        polytomousKeyNodeService.delete(child.getUuid(), true);
 
         pKey = CdmBase.deproxy(polytomousKeyService.load(polytomousKeyUuid),PolytomousKey.class);
 
@@ -460,6 +460,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
 
             vocNameFeature.addTerm(newTerm);
 
+            @SuppressWarnings({ "unchecked", "rawtypes"})
             List<MergeResult<TermVocabulary<Feature>>> mergeResults = (List)vocabularyService.merge(vocs, true);
 
             for(MergeResult<TermVocabulary<Feature>> result : mergeResults){