cleanup

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 78675d05ec97fe88fa6a007a687ae4c16219ec97..515abdbeb35749815cf6c0003780e85e4e3f130f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -99,12 +99,14 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 /**\r
  * CDM Application Configuration class which manages the configuration for remoting\r
  * clients\r
- *\r
  */\r
 @Component\r
 // TODO split into CdmRepository and proper @Configuration class\r
 public class CdmApplicationRemoteConfiguration implements ICdmRepository, ApplicationContextAware  {\r
 \r
+    @SuppressWarnings("unused")\r
+    private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
+\r
     /**\r
      * Timeout for service lookup etc. This timeout (milliseconds) should me more\r
      * strict than {@link #HTTP_READ_TIMEOUT} to avoid connecting to\r
@@ -132,8 +134,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
      */\r
     public static final int HTTP_READ_TIMEOUT = 70000;\r
 \r
-    @SuppressWarnings("unused")\r
-    private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
 \r
     protected ApplicationContext applicationContext;\r
 \r
@@ -203,26 +203,15 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         this.applicationContext = applicationContext;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#getTransactionManager()\r
-     */\r
     @Override\r
     public PlatformTransactionManager getTransactionManager() throws UnsupportedOperationException {\r
         throw new UnsupportedOperationException("getTransactionManager is not implemented for CdmApplicationRemoteConfiguration");\r
     }\r
 \r
-\r
-\r
-    /**\r
-     * @return\r
-     */\r
     public IEditGeoService getEditGeoService() {\r
         return (IEditGeoService) getService(IEditGeoService.class, "/remoting/editgeo.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
-    /**\r
-     * @return\r
-     */\r
     public ICachedCommonService getCachedCommonService(){\r
         if(cachedCommonService == null) {\r
             cachedCommonService = new CachedCommonServiceImpl();\r
@@ -230,7 +219,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return cachedCommonService;\r
     }\r
 \r
-\r
     public ICdmEntitySessionManager getCdmEntitySessionManager() {\r
         if(cdmEntitySessionManager == null) {\r
             cdmEntitySessionManager = new CdmEntitySessionManager();\r
@@ -238,11 +226,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return cdmEntitySessionManager;\r
     }\r
 \r
-\r
-\r
-\r
-\r
-\r
  // ****************************** GETTER *************************************************/\r
 \r
     @Override\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TimestampingHttpInvokerRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TimestampingHttpInvokerRequestExecutor.java
index c100f4da7ef654be1d6ade7c3de01c7e9d0e69c0..c14f2ca20b4dce3cc2be4cee49282e4691d14214 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TimestampingHttpInvokerRequestExecutor.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TimestampingHttpInvokerRequestExecutor.java
@@ -25,7 +25,6 @@ import eu.etaxonomy.taxeditor.remoting.RemoteExecutionTimestampsUtil;
 /**
  * @author a.kohlbecker
  * @since Jan 17, 2020
- *
  */
 public class TimestampingHttpInvokerRequestExecutor extends HttpComponentsHttpInvokerRequestExecutor {
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
index cd32979116e056dd32e6218c079921903609ffbf..0b60db641b72e71126e7d53aa7d261803e3e2b96 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
@@ -32,22 +32,20 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
  * for <code>HttpInvokerProxyFactoryBean</code> needs to be set to at least {@link org.apache.log4j.Level#INFO}. Otherwise the duration is
  * only reported in case of errors.
  *
- *
  * @author a.kohlbecker
  * @since Feb 4, 2020
- *
  */
 public class CachingHttpInvokerProxyFactoryBean extends HttpInvokerProxyFactoryBean {
 
-    private static final String PROP_KEY_MEASURE_DURATION = "remoting.httpinvoker.measureDuration";
-
     private static final Logger logger = Logger.getLogger(CachingHttpInvokerProxyFactoryBean.class);
 
+    private static final String PROP_KEY_MEASURE_DURATION = "remoting.httpinvoker.measureDuration";
+
     private ICdmEntitySessionManager cdmEntitySessionManager;
 
     private IRemoteInvocationTermCacher remoteInvocationTermCacher;
 
-    protected final static Set<String> persistingMethods = new HashSet<String>();
+    protected final static Set<String> persistingMethods = new HashSet<>();
 
     protected static boolean measureDuration = false;
 
@@ -167,16 +165,9 @@ public class CachingHttpInvokerProxyFactoryBean extends HttpInvokerProxyFactoryB
         }
     }
 
-    /**
-     * @return the remoteInvocationTermCacher
-     */
     public IRemoteInvocationTermCacher getRemoteInvocationTermCacher() {
         return remoteInvocationTermCacher;
     }
-
-    /**
-     * @param remoteInvocationTermCacher the remoteInvocationTermCacher to set
-     */
     public void setRemoteInvocationTermCacher(IRemoteInvocationTermCacher remoteInvocationTermCacher) {
         this.remoteInvocationTermCacher = remoteInvocationTermCacher;
     }