Removed code smells

Author: HectorBst

pom.xml

@@ -157,6 +157,7 @@
 							<annotationStyle>none</annotationStyle>
 							<useOptionalForGetters>false</useOptionalForGetters>
 							<initializeCollections>false</initializeCollections>
+							<serializable>true</serializable>
 							<formatTypeMapping>
 								<int32>java.lang.Integer</int32>
 								<int64>java.lang.Long</int64>

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/deser/DefaultDefinitionDeserializer.java

@@ -7,13 +7,14 @@
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import java.io.IOException;
+import java.io.Serializable;
 
 /**
  * Custom deserializer returning a default POJO when only a true boolean is specified in schema.
  *
  * @author Hector Basset
  */
-public class DefaultDefinitionDeserializer<T> extends StdDeserializer<T> implements ResolvableDeserializer {
+public class DefaultDefinitionDeserializer<T extends Serializable> extends StdDeserializer<T> implements ResolvableDeserializer {
 
 	private final StdDeserializer<?> defaultDeserializer;
 	private final T defaultDefinition;
@@ -25,6 +26,7 @@ public DefaultDefinitionDeserializer(StdDeserializer<?> defaultDeserializer, T d
 	}
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
 		if (p.getCurrentToken() == null || (p.getCurrentToken().isBoolean() && !p.getBooleanValue())) {
 			return null;

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/deser/DefaultDefinitionDeserializerModifier.java

@@ -15,6 +15,7 @@
 import org.jsonschema2pojo.springframework.data.couchbase.definitions.IdSuffixDef;
 import org.jsonschema2pojo.springframework.data.couchbase.definitions.IndexDef;
 
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.Map;
@@ -54,7 +55,7 @@ public class DefaultDefinitionDeserializerModifier extends BeanDeserializerModif
 	public JsonDeserializer<?> modifyDeserializer(DeserializationConfig config, BeanDescription beanDesc, JsonDeserializer<?> deserializer) {
 
 		if (defaultDefinitions.containsKey(beanDesc.getBeanClass())) {
-			return new DefaultDefinitionDeserializer<>((StdDeserializer<?>) deserializer, defaultDefinitions.get(beanDesc.getBeanClass()));
+			return new DefaultDefinitionDeserializer<>((StdDeserializer<?>) deserializer, (Serializable) defaultDefinitions.get(beanDesc.getBeanClass()));
 		}
 
 		return deserializer;

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/rules/SpringDataCouchbaseObjectRule.java

@@ -22,8 +22,8 @@ protected SpringDataCouchbaseObjectRule(SpringDataCouchbaseRuleFactory ruleFacto
 	}
 
 	@Override
-	public JType apply(String nodeName, JsonNode node, JsonNode parent, JPackage _package, Schema schema) {
-		JType type = super.apply(nodeName, node, parent, _package, schema);
+	public JType apply(String nodeName, JsonNode node, JsonNode parent, JPackage jPackage, Schema schema) {
+		JType type = super.apply(nodeName, node, parent, jPackage, schema);
 
 		if (type instanceof JDefinedClass) {
 			JDefinedClass clazz = (JDefinedClass) type;

src/test/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseCasRuleTest.java

@@ -25,7 +25,7 @@
  * @author Hector Basset
  */
 @RunWith(JUnitPlatform.class)
-public class CouchbaseCasRuleTest {
+class CouchbaseCasRuleTest {
 
 	static final ObjectMapper objectMapper = new ObjectMapper();
 	final JCodeModel owner = new JCodeModel();

src/test/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseFieldRuleTest.java

@@ -27,7 +27,7 @@
  * @author Hector Basset
  */
 @RunWith(JUnitPlatform.class)
-public class CouchbaseFieldRuleTest {
+class CouchbaseFieldRuleTest {
 
 	static final ObjectMapper objectMapper = new ObjectMapper();
 	final JCodeModel owner = new JCodeModel();

src/test/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseIdRuleTest.java

@@ -26,7 +26,7 @@
  * @author Hector Basset
  */
 @RunWith(JUnitPlatform.class)
-public class CouchbaseIdRuleTest {
+class CouchbaseIdRuleTest {
 
 	static final ObjectMapper objectMapper = new ObjectMapper();
 	final JCodeModel owner = new JCodeModel();