Merge pull request joelittlejohn#10 from flibbertigibbet/feature/no-p…

…luralization Feature/no pluralization
flibbertigibbet · Jun 14, 2016 · 668cb46 · 668cb46
2 parents f8312b2 + a318e23
commit 668cb46
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ArrayRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ArrayRule.java
@@ -78,7 +78,7 @@ public JClass apply(String nodeName, JsonNode node, JPackage jpackage, Schema sc
 
         JType itemType;
         if (node.has("items")) {
-            itemType = ruleFactory.getSchemaRule().apply(makeSingular(nodeName), node.get("items"), jpackage, schema);
+            itemType = ruleFactory.getSchemaRule().apply(nodeName, node.get("items"), jpackage, schema);
         } else {
             itemType = jpackage.owner().ref(Object.class);
         }

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java
@@ -39,6 +39,7 @@
 import org.jsonschema2pojo.SchemaMapper;
 import org.jsonschema2pojo.exception.ClassAlreadyExistsException;
 import org.jsonschema2pojo.exception.GenerationException;
+import org.jsonschema2pojo.util.NameHelper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -232,7 +233,7 @@ private void addGeneratedAnnotation(JDefinedClass jclass) {
 
     private String getEnumName(String nodeName, JsonNode node, JClassContainer container) {
         String fieldName = ruleFactory.getNameHelper().getFieldName(nodeName, node);
-        String className = ruleFactory.getNameHelper().replaceIllegalCharacters(capitalize(fieldName));
+        String className = NameHelper.replaceIllegalCharacters(capitalize(fieldName));
         String normalizedName = ruleFactory.getNameHelper().normalizeName(className);
         // suffix enum names with "Enum" to avoid name clash with capitalized field names
         return makeUnique(normalizedName + "Enum", container);
@@ -262,9 +263,9 @@ protected String getConstantName(String nodeName, String customName) {
 
         List<String> enumNameGroups = new ArrayList<String>(asList(splitByCharacterTypeCamelCase(nodeName)));
 
-        String enumName = "";
+        String enumName;
         for (Iterator<String> iter = enumNameGroups.iterator(); iter.hasNext();) {
-            if (containsOnly(ruleFactory.getNameHelper().replaceIllegalCharacters(iter.next()), "_")) {
+            if (containsOnly(NameHelper.replaceIllegalCharacters(iter.next()), "_")) {
                 iter.remove();
             }
         }

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java
@@ -542,7 +542,7 @@ private String getClassName(String nodeName, JsonNode node, JPackage _package) {
         String capitalizedFieldName = capitalize(fieldName);
         String fullFieldName = createFullFieldName(capitalizedFieldName, prefix, suffix);
 
-        String className = ruleFactory.getNameHelper().replaceIllegalCharacters(fullFieldName);
+        String className = NameHelper.replaceIllegalCharacters(fullFieldName);
         String normalizedName = ruleFactory.getNameHelper().normalizeName(className);
         return makeUnique(normalizedName, _package);
     }

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertyRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertyRule.java
@@ -29,6 +29,7 @@
 
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.Schema;
+import org.jsonschema2pojo.util.NameHelper;
 
 import static org.apache.commons.lang3.StringUtils.capitalize;
 
@@ -203,7 +204,7 @@ private JMethod addBuilder(JDefinedClass c, JFieldVar field) {
     }
 
     private String getBuilderName(String propertyName) {
-        propertyName = ruleFactory.getNameHelper().replaceIllegalCharacters(propertyName);
+        propertyName = NameHelper.replaceIllegalCharacters(propertyName);
         return "with" + capitalize(ruleFactory.getNameHelper().capitalizeTrailingWords(propertyName));
     }