From b96dcdf4fd5ae3a332ba718b092f0509eb7467f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 12 Dec 2022 16:42:29 +0100 Subject: [PATCH] cleanup --- .../src/main/java/eu/etaxonomy/cdm/model/ICdmCacher.java | 1 - .../main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java | 2 +- .../java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java | 3 ++- .../main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java | 2 +- .../java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/ICdmCacher.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/ICdmCacher.java index 5b1236d497..bbbcc8389a 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/ICdmCacher.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/ICdmCacher.java @@ -48,7 +48,6 @@ public interface ICdmCacher { public T load(T cdmEntity); /** - * * @param cdmEntity * @return returns true if the cdmEntity is cachable by the * implementation diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java index e507e0f0a7..bba872d05e 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java @@ -541,4 +541,4 @@ public abstract class DefinedTermBase } return null; } -} +} \ No newline at end of file diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java index 82e4a464fe..ff9a0d96e7 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java +++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/OrderedTermBaseTest.java @@ -13,7 +13,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -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.Before; import org.junit.Test; diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java index 10f255a447..8ccda7ad3e 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java @@ -52,7 +52,7 @@ public class CdmTermCacher extends CdmCacherBase { T cachedCdmEntity = getFromCache(cdmEntity); if(cachedCdmEntity == null && isCachable(cdmEntity)) { putToCache(cdmEntity); - cachedCdmEntity = cdmEntity; + cachedCdmEntity = cdmEntity; } return cachedCdmEntity; } diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java index fb34fe41b7..81c8d58419 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java @@ -102,6 +102,9 @@ public class NameServiceImplTest extends CdmTransactionalIntegrationTest { @SpringBeanByName private AuthenticationManager authenticationManager; + /** + * @param token + */ private void setAuthentication(AbstractAuthenticationToken token) { Authentication authentication = authenticationManager.authenticate(token); -- 2.34.1