Merge pull request #482 from ctrimble/feature_dynamic-accessors-defau…

…lt-off includeDynamicAccessors default false
joelittlejohn · Jan 8, 2016 · ff0ad46 · ff0ad46
2 parents b629c61 + f0eec85
commit ff0ad46
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/Jsonschema2PojoTask.java b/jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/Jsonschema2PojoTask.java
@@ -123,7 +123,7 @@ public class Jsonschema2PojoTask extends Task implements GenerationConfig {
 
     private String targetVersion = "1.6";
 
-    private boolean includeDynamicAccessors = true;
+    private boolean includeDynamicAccessors = false;
 
     private String dateTimeType = null;
 

diff --git a/jsonschema2pojo-ant/src/site/Jsonschema2PojoTask.html b/jsonschema2pojo-ant/src/site/Jsonschema2PojoTask.html
@@ -109,7 +109,7 @@ <h3>Parameters</h3>
       <tr>
         <td valign="top">includeDynamicAccessors</td>
         <td valign="top">Whether to include dynamic getters, setters, and builders or to omit these methods.</td>
-        <td align="center" valign="top">No (default <code>true</code>)</td>
+        <td align="center" valign="top">No (default <code>false</code>)</td>
       </tr>
       <tr>
         <td valign="top">includeConstructors</td>

diff --git a/...2pojo-gradle-plugin/src/main/groovy/org/jsonschema2pojo/gradle/JsonSchemaExtension.groovy b/...2pojo-gradle-plugin/src/main/groovy/org/jsonschema2pojo/gradle/JsonSchemaExtension.groovy
@@ -100,7 +100,7 @@ public class JsonSchemaExtension implements GenerationConfig {
     includeAdditionalProperties = true
     includeAccessors = true
     targetVersion = '1.6'
-    includeDynamicAccessors = true
+    includeDynamicAccessors = false
   }
 
   @Override

diff --git a/...-integration-tests/src/test/java/org/jsonschema2pojo/integration/DynamicPropertiesIT.java b/...-integration-tests/src/test/java/org/jsonschema2pojo/integration/DynamicPropertiesIT.java
@@ -45,7 +45,7 @@ public void shouldSetStringField() throws Throwable {
     @Test
     public void shouldSetStringFieldJava7() throws Throwable {
         setDeclaredPropertyTest(
-                config("targetVersion", "1.7"),
+                config("includeDynamicAccessors", true, "targetVersion", "1.7"),
                 "/schema/dynamic/parentType.json",
                 "ParentType",
                 String.class,
@@ -172,7 +172,7 @@ public void shouldBuildStringField() throws Throwable {
 
     @Test
     public void shouldSetAdditionalProperty() throws Exception {
-        ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/dynamic/parentType.json", "com.example");
+        ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/dynamic/parentType.json", "com.example", config("includeDynamicAccessors", true));
 
         Class<?> parentType = resultsClassLoader.loadClass("com.example.ParentType");
         Object instance = parentType.newInstance();
@@ -192,7 +192,7 @@ public void shouldSetAdditionalProperty() throws Exception {
 
     @Test
     public void shouldGetAdditionalProperty() throws Exception {
-        ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/dynamic/parentType.json", "com.example");
+        ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/dynamic/parentType.json", "com.example", config("includeDynamicAccessors", true));
 
         Class<?> parentType = resultsClassLoader.loadClass("com.example.ParentType");
         Object instance = parentType.newInstance();
@@ -213,7 +213,7 @@ public void shouldGetAdditionalProperty() throws Exception {
     }
 
     public void setDeclaredPropertyTest(String schemaLocation, String typeName, Class<?> fieldType, String fieldName, String fieldGetter, Object value) throws Throwable {
-        setDeclaredPropertyTest(config(), schemaLocation, typeName, fieldType, fieldName, fieldGetter, value);
+        setDeclaredPropertyTest(config("includeDynamicAccessors", true), schemaLocation, typeName, fieldType, fieldName, fieldGetter, value);
     }
 
     public void setDeclaredPropertyTest(Map<String, Object> config, String schemaLocation, String typeName, Class<?> fieldType, String fieldName, String fieldGetter, Object value) throws Throwable {
@@ -238,7 +238,7 @@ public void setDeclaredPropertyTest(Map<String, Object> config, String schemaLoc
 
     public void withDeclaredPropertyTest(String schemaLocation, String typeName, Class<?> fieldType, String fieldName, String fieldGetter, Object value) throws Throwable {
         ClassLoader resultsClassLoader =
-                schemaRule.generateAndCompile(schemaLocation, "com.example", config("generateBuilders", true));
+                schemaRule.generateAndCompile(schemaLocation, "com.example", config("includeDynamicAccessors", true, "generateBuilders", true));
 
         Class<?> type = resultsClassLoader.loadClass("com.example." + typeName);
         Object instance = type.newInstance();
@@ -260,7 +260,7 @@ public void withDeclaredPropertyTest(String schemaLocation, String typeName, Cla
     }
 
     public void getDeclaredPropertyTest(String schemaLocation, String typeName, Class<?> fieldType, String fieldName, String fieldSetter, Object value) throws Throwable {
-        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example");
+        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example", config("includeDynamicAccessors", true));
 
         Class<?> parentType = resultsClassLoader.loadClass("com.example." + typeName);
         Object instance = parentType.newInstance();
@@ -279,7 +279,7 @@ public void getDeclaredPropertyTest(String schemaLocation, String typeName, Clas
     }
 
     public void setAdditionalPropertyTest(String schemaLocation, String typeName, Class<?> fieldType, String fieldName, Object value) throws Throwable {
-        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example");
+        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example", config("includeDynamicAccessors", true));
 
         Class<?> parentType = resultsClassLoader.loadClass("com.example." + typeName);
         Object instance = parentType.newInstance();
@@ -302,7 +302,7 @@ public void setAdditionalPropertyTest(String schemaLocation, String typeName, Cl
     }
 
     public void setPropertyTest(String schemaLocation, String typeName, String fieldName, Object value) throws Throwable {
-        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example");
+        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example", config("includeDynamicAccessors", true));
 
         Class<?> type = resultsClassLoader.loadClass("com.example." + typeName);
         Object instance = type.newInstance();
@@ -316,7 +316,7 @@ public void setPropertyTest(String schemaLocation, String typeName, String field
     }
 
     public void getPropertyTest(String schemaLocation, String typeName, String fieldName) throws Throwable {
-        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example");
+        ClassLoader resultsClassLoader = schemaRule.generateAndCompile(schemaLocation, "com.example", config("includeDynamicAccessors", true));
 
         Class<?> type = resultsClassLoader.loadClass("com.example." + typeName);
         Object instance = type.newInstance();

diff --git a/...schema2pojo-maven-plugin/src/main/java/org/jsonschema2pojo/maven/Jsonschema2PojoMojo.java b/...schema2pojo-maven-plugin/src/main/java/org/jsonschema2pojo/maven/Jsonschema2PojoMojo.java
@@ -452,10 +452,10 @@ public class Jsonschema2PojoMojo extends AbstractMojo implements GenerationConfi
      * Whether to include dynamic getters, setters, and builders or to omit these methods.
      *
      * @parameter expression="${jsonschema2pojo.includeDynamicAccessors}"
-     *            default-value="true"
+     *            default-value="false"
      * @since 0.4.17
      */
-    private boolean includeDynamicAccessors = true;
+    private boolean includeDynamicAccessors = false;
 
     /**
      * The project being built.