Cleanup

Author: ralscha

pom.xml

@@ -320,7 +320,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.13</version>
+				<version>0.8.14</version>
 			</plugin>
 		</plugins>
 	</reporting>

src/main/java/ch/ralscha/extdirectspring/annotation/ExtDirectMethodType.java

@@ -62,7 +62,7 @@ public boolean isValid(String beanAndMethodName, Class<?> clazz, Method method)
 
 			for (Annotation[] paramAnnotations : allParameterAnnotations) {
 				for (Annotation paramAnnotation : paramAnnotations) {
-					if (RequestParam.class.isInstance(paramAnnotation)) {
+					if ((paramAnnotation instanceof RequestParam)) {
 						log.error("SIMPLE method '" + beanAndMethodName
 								+ "' contains a non supported parameter annotation @RequestParam");
 						return false;
@@ -189,7 +189,7 @@ public boolean isValid(String beanAndMethodName, Class<?> clazz, Method method)
 							+ "' does not support entryClass attribute of @ExtDirectMethod");
 				}
 
-				if (extDirectMethodAnnotation.batched() == false) {
+				if (!extDirectMethodAnnotation.batched()) {
 					log.warn("FORM_POST method '" + beanAndMethodName
 							+ "' does not support batched attribute of @ExtDirectMethod");
 				}
@@ -237,7 +237,7 @@ else if (method.getReturnType().equals(Void.TYPE)) {
 				if (methodAnnotation != null) {
 					boolean hasPostRequestMethod = false;
 					for (RequestMethod requestMethod : methodAnnotation.method()) {
-						if (requestMethod.equals(RequestMethod.POST)) {
+						if (RequestMethod.POST.equals(requestMethod)) {
 							hasPostRequestMethod = true;
 							break;
 						}
@@ -253,7 +253,7 @@ else if (method.getReturnType().equals(Void.TYPE)) {
 				ExtDirectMethod extDirectMethodAnnotation = AnnotatedElementUtils.findMergedAnnotation(method,
 						ExtDirectMethod.class);
 
-				if (extDirectMethodAnnotation.batched() == false) {
+				if (!extDirectMethodAnnotation.batched()) {
 					log.warn("FORM_POST method '" + beanAndMethodName
 							+ "' does not support batched attribute of @ExtDirectMethod");
 				}
@@ -327,7 +327,7 @@ public boolean isValid(String beanAndMethodName, Class<?> clazz, Method method)
 						+ "' does not support entryClass attribute of @ExtDirectMethod");
 			}
 
-			if (extDirectMethodAnnotation.batched() == false) {
+			if (!extDirectMethodAnnotation.batched()) {
 				log.warn("POLL method '" + beanAndMethodName
 						+ "' does not support batched attribute of @ExtDirectMethod");
 			}
@@ -350,7 +350,7 @@ public boolean isValid(String beanAndMethodName, Class<?> clazz, Method method)
 						+ "' does not support event attribute of @ExtDirectMethod");
 			}
 
-			if (extDirectMethodAnnotation.batched() == false) {
+			if (!extDirectMethodAnnotation.batched()) {
 				log.warn("FORM_POST_JSON method '" + beanAndMethodName
 						+ "' does not support batched attribute of @ExtDirectMethod");
 			}
@@ -361,7 +361,7 @@ public boolean isValid(String beanAndMethodName, Class<?> clazz, Method method)
 							+ "' must not have a BindingResult parameter");
 					return false;
 				}
-				else if (clazzz.isAssignableFrom(MultipartFile.class)) {
+				if (clazzz.isAssignableFrom(MultipartFile.class)) {
 					log.error("FORM_POST_JSON method '" + beanAndMethodName
 							+ "' must not have a MultipartFile parameter");
 					return false;

src/main/java/ch/ralscha/extdirectspring/bean/DataType.java

@@ -26,7 +26,7 @@ public enum DataType {
 
 	private final String name;
 
-	private DataType(String name) {
+	DataType(String name) {
 		this.name = name;
 	}
 

src/main/java/ch/ralscha/extdirectspring/bean/EdJsonStoreResult.java

@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.SerializationContext;
 import tools.jackson.databind.ValueSerializer;

src/main/java/ch/ralscha/extdirectspring/bean/EdStoreResult.java

@@ -25,6 +25,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import tools.jackson.databind.annotation.JsonDeserialize;
 import tools.jackson.databind.annotation.JsonSerialize;
 

src/main/java/ch/ralscha/extdirectspring/bean/ExtDirectRawJsonStoreResult.java

@@ -15,7 +15,6 @@
  */
 package ch.ralscha.extdirectspring.bean;
 
-import java.io.IOException;
 import java.util.Collection;
 
 import tools.jackson.core.JsonGenerator;

src/main/java/ch/ralscha/extdirectspring/bean/ExtDirectResponse.java

@@ -15,12 +15,12 @@
  */
 package ch.ralscha.extdirectspring.bean;
 
-import jakarta.servlet.http.HttpServletRequest;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * Represents the response of a Ext Direct call. Internal class
  */

src/main/java/ch/ralscha/extdirectspring/bean/ExtDirectResponseBuilder.java

@@ -22,9 +22,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.MessageSource;
@@ -37,6 +34,8 @@
 import ch.ralscha.extdirectspring.controller.Configuration;
 import ch.ralscha.extdirectspring.controller.RouterController;
 import ch.ralscha.extdirectspring.util.ExtDirectSpringUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * An utility class that helps building the response for a FORM_POST method. The response

src/main/java/ch/ralscha/extdirectspring/bean/ImmutableEdJsonStoreResult.java

@@ -22,6 +22,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import tools.jackson.databind.annotation.JsonSerialize;
 
 public final class ImmutableEdJsonStoreResult extends EdJsonStoreResult {

src/main/java/ch/ralscha/extdirectspring/bean/ImmutableEdStoreResult.java

@@ -57,9 +57,7 @@ public static <T> ImmutableEdStoreResult<T> of(Collection<T> records, @Nullable
 
 	public static <T> ImmutableEdStoreResult<T> copyOf(EdStoreResult<T> instance) {
 		if (instance instanceof ImmutableEdStoreResult<?> immutable) {
-			@SuppressWarnings("unchecked")
-			ImmutableEdStoreResult<T> cast = (ImmutableEdStoreResult<T>) immutable;
-			return cast;
+			return (ImmutableEdStoreResult<T>) immutable;
 		}
 		return new EdStoreResult.Builder<T>().from(instance).build();
 	}