Revert "Implemented: Add the @nonnull (java 8) annotation on required…

… fields in Java POJOs #46" This reverts commit a4a2d37.
atomicbits · Feb 19, 2016 · f011553 · f011553
1 parent a4a2d37
commit f011553
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 46 deletions.
diff --git a/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/NonNull.java b/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/NonNull.java
diff --git a/...dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/client/ning/Ning19ClientFactory.java b/...dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/client/ning/Ning19ClientFactory.java
@@ -20,7 +20,6 @@
 package io.atomicbits.scraml.dsl.java.client.ning;
 
 import io.atomicbits.scraml.dsl.java.Client;
-import io.atomicbits.scraml.dsl.java.NonNull;
 import io.atomicbits.scraml.dsl.java.client.ClientConfig;
 import io.atomicbits.scraml.dsl.java.client.ClientFactory;
 

diff --git a/...craml-generator/src/main/scala/io/atomicbits/scraml/generator/codegen/PojoGenerator.scala b/...craml-generator/src/main/scala/io/atomicbits/scraml/generator/codegen/PojoGenerator.scala
@@ -87,7 +87,6 @@ object PojoGenerator {
         package ${topLevelClass.packageName};
 
         import com.fasterxml.jackson.annotation.*;
-        import io.atomicbits.scraml.dsl.java.NonNull;
 
         ${topLevelImports.mkString("", ";\n", ";")};
 
@@ -130,7 +129,6 @@ object PojoGenerator {
         package ${classRep.packageName};
 
         import com.fasterxml.jackson.annotation.*;
-        import io.atomicbits.scraml.dsl.java.NonNull;
 
         public enum ${classRep.name} {
 
@@ -179,7 +177,6 @@ object PojoGenerator {
 
         import java.util.*;
         import com.fasterxml.jackson.annotation.*;
-        import io.atomicbits.scraml.dsl.java.NonNull;
 
         ${generatePojoSource(classRep, parentClassRep, skipField)}
      """
@@ -216,7 +213,7 @@ object PojoGenerator {
              return ${fieldRep.safeFieldNameJava};
            }
 
-           public void set$fieldNameCap(${fieldRep.fieldExpressionJavaNonNulMarked}) {
+           public void set$fieldNameCap(${classPointer.classDefinitionJava} ${fieldRep.safeFieldNameJava}) {
              this.${fieldRep.safeFieldNameJava} = ${fieldRep.safeFieldNameJava};
            }
 
@@ -235,7 +232,7 @@ object PojoGenerator {
       s"this.set$fieldNameCap(${sf.safeFieldNameJava});"
     }
 
-    val fieldExpressions = fieldsWithParentFields.map(_.fieldExpressionJavaNonNulMarked)
+    val fieldExpressions = fieldsWithParentFields.map(_.fieldExpressionJava)
 
     val fieldConstructor =
       if (fieldExpressions.nonEmpty)

diff --git a/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/model/ClassRep.scala b/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/model/ClassRep.scala
@@ -171,11 +171,6 @@ case class Field(fieldName: String, classPointer: ClassPointer, required: Boolea
 
   def fieldExpressionJava: String = s"${classPointer.classDefinitionJava} $safeFieldNameJava"
 
-  def fieldExpressionJavaNonNulMarked: String = {
-    val nonNullMarker = if(required) "@NonNull " else ""
-    s"$nonNullMarker${classPointer.classDefinitionJava} $safeFieldNameJava"
-  }
-
   lazy val safeFieldNameJava: String = {
 
     val cleanName = CleanNameUtil.cleanFieldName(fieldName)