0.4.0: refactoring, code cleanup

jacek99 · Jul 4, 2015 · db1670d · db1670d
1 parent 065f40d
commit db1670d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ The artifacts for this library are published to the popular Bintray JCenter Mave
         jcenter()
     }
 
-    compile "org.immutizer4j:immutizer4j:0.3.0"
+    compile "org.immutizer4j:immutizer4j:0.4.0"
 
 
 ## Maven
@@ -149,7 +149,7 @@ The artifacts for this library are published to the popular Bintray JCenter Mave
             <dependency>
                     <groupId>org.immutizer4j</groupId>
                     <artifactId>immutizer4j</artifactId>
-                    <version>0.3.0</version>
+                    <version>0.4.0</version>
             </dependency>
     </dependencies>
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # speed up Gradle
 org.gradle.daemon=true
 
-version = 0.3.0
+version = 0.4.0
 group = org.immutizer4j
diff --git a/src/main/java/org/immutizer4j/Immutizer.java b/src/main/java/org/immutizer4j/Immutizer.java
@@ -226,15 +226,9 @@ private boolean isSafeType(Class<?> type) {
     // standard handler for reporting errors, returns a new immutable ValidationResult instance
     private ValidationResult addError(Field field, ViolationType violationType, ValidationResult result) {
         // log it as long as it is not marked as @ImmutizerIgnore
-        if (field.getAnnotation(ImmutizerIgnore.class) == null) {
-            ValidationError error = new ValidationError(field.getDeclaringClass(), field.getName(), violationType);
-            log.error("Immutability violation: {}", error);
-            return result.addError(error);
-        } else {
-            log.debug("Skipping immutability violation for field {}.{} due to being marked as @ImmutizerIgnore",
-                    field.getDeclaringClass().getSimpleName(),field.getName());
-            return result;
-        }
+        ValidationError error = new ValidationError(field.getDeclaringClass(), field.getName(), violationType);
+        log.error("Immutability violation: {}", error);
+        return result.addError(error);
     }
 
     /**
@@ -261,7 +255,8 @@ public ValidationResult validateIfGenericsReference(Field field, Class<?> actual
 
             // try to extract actual class name via
             String sig = (String) signatureField.get(field);
-            if (sig.startsWith("T") && sig.endsWith(";")) {
+            // T = var, [T = array of vars
+            if ((sig.startsWith("T") || sig.startsWith("[T")) && sig.endsWith(";")) {
                 // OK, reference to a generic type
                 // unfortunately there is no information on the package of the type so we cannot get to it
                 // need to flag this is a violation
@@ -272,17 +267,4 @@ public ValidationResult validateIfGenericsReference(Field field, Class<?> actual
         return result;
     }
 
-//    // figures out the standard JavaBean getter method name for a field
-//    private String getGetterName(Field field) {
-//        StringBuilder sb = ThreadLocals.STRINGBUILDER.get().append(ImmutizerConstants.GETTER_PREFIX);
-//
-//        if (field.getName().length() == 1) {
-//            sb.append(field.getName().toUpperCase());
-//        } else {
-//            sb.append(field.getName().substring(0,1).toUpperCase())
-//                    .append(field.getName().substring(1));
-//        }
-//        return sb.toString();
-//    }
-
 }
diff --git a/src/main/java/org/immutizer4j/ImmutizerConstants.java b/src/main/java/org/immutizer4j/ImmutizerConstants.java
@@ -23,7 +23,6 @@ class ImmutizerConstants {
     static final String NEWLINE = "\n ";
 
     static final String SIGNATURE_FIELD = "signature";
-    static final String GETTER_PREFIX = "get";
 
     /**
      * Types the immutizer recognizes by default as immutable (if flagged as final)

diff --git a/src/main/java/org/immutizer4j/ImmutizerIgnore.java b/src/main/java/org/immutizer4j/ImmutizerIgnore.java
diff --git a/src/test/java/org/immutizer4j/test/ArrayTests.java b/src/test/java/org/immutizer4j/test/ArrayTests.java
@@ -62,8 +62,11 @@ public void testImmutableArrayUtilityClass() {
         ValidationResult result = defaultImmutizer.getValidationResult(ImmutableArrayPojo.class);
 
         assertEquals(false,result.isValid());
-        assertEquals(1, result.getErrors().size());
-        assertEquals("org.immutizer4j.ImmutableArray.array : MUTABLE_ARRAY",result.toString());
+        assertEquals(2, result.getErrors().size());
+
+        assertTrue(result.toString(), result.toString().contains("org.immutizer4j.test.sample.generics.ImmutableArray.array : MUTABLE_ARRAY"));
+        assertTrue(result.toString(), result.toString().contains("org.immutizer4j.test.sample.generics.ImmutableArray.array : UNABLE_TO_DETERMINE_TYPE_DUE_TO_GENERICS_TYPE_ERASURE"));
+
     }
 
 }
diff --git a/src/test/java/org/immutizer4j/test/sample/ImmutableArrayPojo.java b/src/test/java/org/immutizer4j/test/sample/ImmutableArrayPojo.java
@@ -1,7 +1,7 @@
 package org.immutizer4j.test.sample;
 
 import lombok.Value;
-import org.immutizer4j.ImmutableArray;
+import org.immutizer4j.test.sample.generics.ImmutableArray;
 
 /**
  * A POJO that uses ImmutableArray to wrap both mutable and immutable object types

diff --git a/.../java/org/immutizer4j/ImmutableArray.java → .../test/sample/generics/ImmutableArray.java b/.../java/org/immutizer4j/ImmutableArray.java → .../test/sample/generics/ImmutableArray.java
@@ -1,7 +1,6 @@
-package org.immutizer4j;
+package org.immutizer4j.test.sample.generics;
 
 import lombok.Value;
-import org.immutizer4j.ImmutizerIgnore;
 
 import java.util.Arrays;