From: Andreas Müller Date: Mon, 29 Jun 2020 00:31:50 +0000 (+0200) Subject: cleanup X-Git-Tag: 5.16.0^2~19 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7c37f7fa7132db8f822d3569e497fb480bd34cdc cleanup --- 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 cc6eea7a0..b59a0273e 100644 --- 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 @@ -61,6 +61,7 @@ import eu.etaxonomy.taxeditor.httpinvoker.TestThread; @DataSet public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(CdmEntitySessionAwareTest.class); UUID polytomousKeyUuid = UUID.fromString("0d53ba20-7de4-4baa-bd8a-401048447d66"); @@ -349,16 +350,11 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { Assert.fail(); } - - - // retrieving subkey shows its null subKey = CdmBase.deproxy(polytomousKeyService.find(subKeyUuid),PolytomousKey.class); Assert.assertNull(subKey); pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class); - - } @@ -434,7 +430,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { try { List features = termService.list(Feature.class, 100, 0, null, null); - List updateTerms = new ArrayList(); + List updateTerms = new ArrayList<>(); for (Feature feature:features){ if (feature.getLabel().equals("UpdateTest")){ updateTerms.add(feature.getUuid()); @@ -518,8 +514,8 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { } @Test - public void testThreadLocalActiveSession() throws InterruptedException { - MockSessionOwner so1 = new MockSessionOwner(); + public void testThreadLocalActiveSession() { + MockSessionOwner so1 = new MockSessionOwner<>(); final ICdmEntitySession activeSession = getCdmEntitySessionManager().newSession(so1, true); TestThread thread = new TestThread(true) { @Override @@ -529,7 +525,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { } }; invokeThread(thread); - MockSessionOwner so2 = new MockSessionOwner(); + MockSessionOwner so2 = new MockSessionOwner<>(); ICdmEntitySession newActiveSession = getCdmEntitySessionManager().newSession(so2, true); Assert.assertFalse(activeSession.equals(newActiveSession)); thread.unblock();