From: Andreas Müller <a.mueller@bgbm.org>
Date: Wed, 13 Jul 2022 21:27:19 +0000 (+0200)
Subject: cleanup
X-Git-Tag: 5.32.0^2~207
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/f0b8034c5419451daed5339ac6bf048637f6d9bb

cleanup
---

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
index c548a2b0c2..da0d2f4a66 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
@@ -27,7 +27,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-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.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.ListIndexBase;
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
index 8c243d8436..b4bb988eee 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
@@ -21,7 +21,8 @@ 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.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
@@ -1152,7 +1153,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
             List<OrderHint> orderHints, List<String> propertyPaths) {
 
         List<Restriction<?>> allRestrictions = new ArrayList<>();
-        allRestrictions.add(new Restriction<String>(param, matchmode, queryString));
+        allRestrictions.add(new Restriction<>(param, matchmode, queryString));
         if(restrictions != null){
             allRestrictions.addAll(restrictions);
         }
@@ -1174,7 +1175,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
             MatchMode matchmode, List<Restriction<?>> restrictions) {
 
         List<Restriction<?>> allRestrictions = new ArrayList<>();
-        allRestrictions.add(new Restriction<String>(param, matchmode, queryString));
+        allRestrictions.add(new Restriction<>(param, matchmode, queryString));
         if(restrictions != null){
             allRestrictions.addAll(restrictions);
         }
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractBeanProcessor.java
index d9d77920ee..9e21ad8d4e 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractBeanProcessor.java
@@ -17,7 +17,8 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.beanutils.PropertyUtils;
-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.hibernate.Hibernate;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -114,7 +115,7 @@ public abstract class AbstractBeanProcessor<T extends Object> implements JsonBea
             }
 
             try {
-                // ------ reusing snippet from JSONOnbject._fromBean()
+                // ------ reusing snippet from JSONObject._fromBean()
                 Class<?> type = prop.getPropertyType();
                 Object value = PropertyUtils.getProperty( bean, key );
 
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RegistrationDtoBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RegistrationDtoBeanProcessor.java
index cbaec3eb4a..edd8e00ae4 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RegistrationDtoBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RegistrationDtoBeanProcessor.java
@@ -27,7 +27,7 @@ public class RegistrationDtoBeanProcessor extends AbstractBeanProcessor<Registra
                 "blockedBy",
                 "blocked",
                 "submitterUserName"
-                );
+            );
     }
 
     @Override
@@ -35,5 +35,4 @@ public class RegistrationDtoBeanProcessor extends AbstractBeanProcessor<Registra
         // nothing to do here
         return json;
     }
-
-}
+}
\ No newline at end of file
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/DateTimeJSONValueProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/DateTimeJSONValueProcessor.java
index 01be3f28d0..b90cf5f359 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/DateTimeJSONValueProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/DateTimeJSONValueProcessor.java
@@ -31,18 +31,18 @@ public class DateTimeJSONValueProcessor implements JsonValueProcessor {
 	@Override
     public Object processArrayValue(Object object, JsonConfig jsonConfig) {
 		DateTime dateTime = (DateTime) object;
-        return formatDateTime(object);
+        return formatDateTime(dateTime);
 	}
 
 	@Override
     public Object processObjectValue(String key, Object object,
 			JsonConfig jsonConfig) {
-	    return formatDateTime(object);
+	    return formatDateTime((DateTime)object);
 	}
 
-    public Object formatDateTime(Object object) {
+    Object formatDateTime(DateTime object) {
         if(object != null){
-	        DateTime dateTime = (DateTime) object;
+	        DateTime dateTime = object;
 	        // WARNING! null means now!
 	        return DateTimeJSONValueProcessor.iso8601Format.print(dateTime);
 	    } else {
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/HibernateJSONValueProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/HibernateJSONValueProcessor.java
index 5c8acd1b40..37463d7f32 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/HibernateJSONValueProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/HibernateJSONValueProcessor.java
@@ -1,34 +1,34 @@
 /**
  * Copyright (C) 2009 EDIT European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 See LICENSE.TXT at the top of this package for the full license terms.
  */
 
 package eu.etaxonomy.cdm.remote.json.processor.value;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JsonConfig;
-import net.sf.json.processors.JsonValueProcessor;
-
-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 eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.remote.json.processor.matcher.HibernateJSONValueProcessorMatcher;
+import net.sf.json.JSONArray;
+import net.sf.json.JsonConfig;
+import net.sf.json.processors.JsonValueProcessor;
 
 /**
  * Used in conjunction with the {@link HibernateJSONValueProcessorMatcher} to unwrap
  * beans from hibernate proxies. Using this Value processor is essential for
  * properly detecting @Transient annotations which are not inherited by subclasses
  * like the proxies
- * 
+ *
  * @author a.kohlbecker
  */
 public class HibernateJSONValueProcessor implements JsonValueProcessor {
-	
+
 	public static final Logger logger = LogManager.getLogger(HibernateJSONValueProcessor.class);
-	
+
 //	public Object processArrayValue(Object object, JsonConfig jsonConfig) {
 //		if(Hibernate.isInitialized(object)) {
 //			log.debug("Processing array value " + object);
@@ -38,22 +38,22 @@ public class HibernateJSONValueProcessor implements JsonValueProcessor {
 //		    return JSONNull.getInstance();
 //		}
 //	}
-	
-	public Object processArrayValue(Object object, JsonConfig jsonConfig) {
+
+	@Override
+    public Object processArrayValue(Object object, JsonConfig jsonConfig) {
 		// usage of the InitializedHibernatePropertyFiler is expected !!!
 		// retain default processing
 		return JSONArray.fromObject(object,jsonConfig);
 	}
-		
 
-	public Object processObjectValue(String propertyName, Object object, JsonConfig jsonConfig) {
+	@Override
+    public Object processObjectValue(String propertyName, Object object, JsonConfig jsonConfig) {
 		// deproxy
 		Object target = HibernateProxyHelper.deproxy(object, Object.class);
 		if(logger.isDebugEnabled()){
 			logger.debug("deproxying object " + target);
 		}
 		return target;
-		 
-	}
 
-}
+	}
+}
\ No newline at end of file
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/MapJSONValueProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/MapJSONValueProcessor.java
index 49b535fc73..88aaaee4ea 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/MapJSONValueProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/MapJSONValueProcessor.java
@@ -23,7 +23,6 @@ import net.sf.json.processors.JsonValueProcessor;
 /**
  * @author a.kohlbecker
  * @since 23.06.2010
- *
  */
 public class MapJSONValueProcessor implements JsonValueProcessor {
 
@@ -63,13 +62,9 @@ public class MapJSONValueProcessor implements JsonValueProcessor {
 		return JSONObject.fromObject(value, jsonConfig);
 	}
 
-	/* (non-Javadoc)
-	 * @see net.sf.json.processors.JsonValueProcessor#processObjectValue(java.lang.String, java.lang.Object, net.sf.json.JsonConfig)
-	 */
 	@Override
 	public Object processObjectValue(String key, Object value,
 			JsonConfig jsonConfig) {
 		return processArrayValue(value, jsonConfig);
 	}
-
-}
+}
\ No newline at end of file
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/PartialJSONValueProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/PartialJSONValueProcessor.java
index a728bc30a2..0a7f60c777 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/PartialJSONValueProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/PartialJSONValueProcessor.java
@@ -1,37 +1,34 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.cdm.remote.json.processor.value;
 
-import net.sf.json.JsonConfig;
-import net.sf.json.processors.JsonValueProcessor;
-
-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.joda.time.Partial;
 import org.joda.time.format.ISODateTimeFormat;
 
 import eu.etaxonomy.cdm.hibernate.PartialUserType;
+import net.sf.json.JsonConfig;
+import net.sf.json.processors.JsonValueProcessor;
 
 /**
  * Partial time as four digit year, two digit month of year, and two digit day of month (yyyy-MM-dd).
+ *
  * @author a.kohlbecker
  * @since 20.01.2008
- * @version 1.0
  */
 public class PartialJSONValueProcessor implements JsonValueProcessor {
-	private static Logger logger = LogManager.getLogger(PartialJSONValueProcessor.class);
 
-	
-	/* (non-Javadoc)
-	 * @see net.sf.json.processors.JsonValueProcessor#processArrayValue(java.lang.Object, net.sf.json.JsonConfig)
-	 */
-	public Object processArrayValue(Object object, JsonConfig jsonConfig) {
+    private static Logger logger = LogManager.getLogger(PartialJSONValueProcessor.class);
+
+	@Override
+    public Object processArrayValue(Object object, JsonConfig jsonConfig) {
 		if(object == null){
 			return "";
 		}
@@ -42,10 +39,8 @@ public class PartialJSONValueProcessor implements JsonValueProcessor {
         return partial.toString(ISODateTimeFormat.date());
 	}
 
-	/* (non-Javadoc)
-	 * @see net.sf.json.processors.JsonValueProcessor#processObjectValue(java.lang.String, java.lang.Object, net.sf.json.JsonConfig)
-	 */
-	public Object processObjectValue(String key, Object object, JsonConfig jsonConfig) {
+	@Override
+    public Object processObjectValue(String key, Object object, JsonConfig jsonConfig) {
 		if(object == null){
 			return "";
 		}
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/UUIDJSONValueProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/UUIDJSONValueProcessor.java
index 6e8b20364d..660ffdf7d8 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/UUIDJSONValueProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/UUIDJSONValueProcessor.java
@@ -5,12 +5,12 @@
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.cdm.remote.json.processor.value;
 
 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 net.sf.json.JsonConfig;
 import net.sf.json.processors.JsonValueProcessor;
@@ -38,6 +38,5 @@ public class UUIDJSONValueProcessor implements JsonValueProcessor {
 		}
 		UUID uuid = (UUID) obj;
 		return uuid.toString();
-	};
-
-}
+	}
+}
\ No newline at end of file
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java
index e9433b2b07..b3d01b2c00 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java
@@ -17,7 +17,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector;
-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.web.servlet.View;
 
 import eu.etaxonomy.cdm.opt.config.DataSourceProperties;
@@ -114,10 +115,9 @@ public class JsonView extends BaseView implements View {
 
         String contextPath = null;
 
-        if (request != null)
-        	{
+        if (request != null) {
         	contextPath = request.getContextPath();
-        	}
+        }
 
         if(jsonConfig == null){
             logger.error("The jsonConfig must not be null. It must be set in the applicationContext.");
@@ -132,7 +132,7 @@ public class JsonView extends BaseView implements View {
         boolean isCollectionType = false;
         JSON jsonObj;
         if (entity == null){
-          jsonObj = JSONObject.fromObject("{}");
+            jsonObj = JSONObject.fromObject("{}");
         } else if(Collection.class.isAssignableFrom(entity.getClass())){
             isCollectionType = true;
             jsonObj = JSONArray.fromObject(entity, jsonConfig);
@@ -151,8 +151,8 @@ public class JsonView extends BaseView implements View {
             XMLSerializer xmlSerializer = new XMLSerializer();
             if(isCollectionType){
                 xmlSerializer.setArrayName(entity.getClass().getSimpleName());
-                Class elementType = Object.class;
-                Collection c = (Collection)entity;
+                Class<?> elementType = Object.class;
+                Collection<?> c = (Collection<?>)entity;
                 if(c.size() > 0){
                     elementType = c.iterator().next().getClass();
                 }
@@ -205,6 +205,4 @@ public class JsonView extends BaseView implements View {
         // render
         render(entity, writer, jsonpCallback, request, response);
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java
index 21d0374ec7..25ef8844c3 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java
@@ -18,7 +18,8 @@ import java.util.Optional;
 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.hibernate.Hibernate;
 import org.joda.time.DateTime;
 import org.joda.time.Partial;
@@ -466,10 +467,4 @@ public class RegistrationWorkingSetService implements IRegistrationWorkingSetSer
             }
         }
     }
-
-
-
-
-
-
-}
+}
\ No newline at end of file