chore: rewrite java generator tests

examples/generate-java-models/__snapshots__/index.spec.ts.snap

@@ -3,10 +3,10 @@
 exports[`Should be able to render Java Models and should log expected output to console 1`] = `
 Array [
   "public class Root {
-  private Object email;
+  private String email;
 
-  public Object getEmail() { return this.email; }
-  public void setEmail(Object email) { this.email = email; }
+  public String getEmail() { return this.email; }
+  public void setEmail(String email) { this.email = email; }
 }",
 ]
 `;

examples/java-generate-equals/__snapshots__/index.spec.ts.snap

@@ -3,10 +3,10 @@
 exports[`Should be able to generate a model to overwrite the Equal methods and should log expected output to console 1`] = `
 Array [
   "public class Root {
-  private Object email;
+  private String email;
 
-  public Object getEmail() { return this.email; }
-  public void setEmail(Object email) { this.email = email; }
+  public String getEmail() { return this.email; }
+  public void setEmail(String email) { this.email = email; }
 
   @Override
   public boolean equals(Object o) {

examples/java-generate-hashcode/__snapshots__/index.spec.ts.snap

@@ -3,10 +3,10 @@
 exports[`Should be able to generate a model to overwrite the hashCode method and should log expected output to console 1`] = `
 Array [
   "public class Root {
-  private Object email;
+  private String email;
 
-  public Object getEmail() { return this.email; }
-  public void setEmail(Object email) { this.email = email; }
+  public String getEmail() { return this.email; }
+  public void setEmail(String email) { this.email = email; }
 
   @Override
   public int hashCode() {

examples/java-generate-marshalling/__snapshots__/index.spec.ts.snap

@@ -3,10 +3,10 @@
 exports[`Should be able to generate ts data model with marshal und unmarshal functions and should log expected output to console 1`] = `
 Array [
   "public class Root {
-  private Object email;
+  private String email;
 
-  public Object getEmail() { return this.email; }
-  public void setEmail(Object email) { this.email = email; }
+  public String getEmail() { return this.email; }
+  public void setEmail(String email) { this.email = email; }
 
   public String marshal() {
     List<String> propList = new ArrayList();

examples/java-generate-tostring/__snapshots__/index.spec.ts.snap

@@ -3,10 +3,10 @@
 exports[`Should be able to generate a model to overwrite the toString method and should log expected output to console 1`] = `
 Array [
   "public class Root {
-  private Object email;
+  private String email;
 
-  public Object getEmail() { return this.email; }
-  public void setEmail(Object email) { this.email = email; }
+  public String getEmail() { return this.email; }
+  public void setEmail(String email) { this.email = email; }
 
   @Override
   public String toString() {

src/generators/java/JavaConstrainer.ts

@@ -15,12 +15,11 @@ export const JavaDefaultTypeMapping: TypeMapping<JavaOptions> = {
     return 'Object';
   },
   Float ({constrainedModel}): string {
-    let type = 'float';
+    let type = 'Double';
     const format = constrainedModel.originalInput && constrainedModel.originalInput['format'];
     switch (format) {
-    case 'double':
-    case 'number':
-      type = 'double';
+    case 'float':
+      type = 'float';
       break;
     }
     return type;

src/generators/java/JavaPreset.ts

@@ -7,12 +7,12 @@ import { EnumRenderer, JAVA_DEFAULT_ENUM_PRESET } from './renderers/EnumRenderer
 export type ClassPresetType<O> = ClassPreset<ClassRenderer, O>;
 export type EnumPresetType<O> = EnumPreset<EnumRenderer, O>;
 
-export type JavaPreset<O = JavaOptions> = Preset<{
+export type JavaPreset<O = any> = Preset<{
   class: ClassPresetType<O>;
   enum: EnumPresetType<O>;
 }>;
 
-export const JAVA_DEFAULT_PRESET: JavaPreset = {
+export const JAVA_DEFAULT_PRESET: JavaPreset<JavaOptions> = {
   class: JAVA_DEFAULT_CLASS_PRESET,
   enum: JAVA_DEFAULT_ENUM_PRESET,
 };

src/generators/java/constrainer/EnumConstrainer.ts

@@ -36,8 +36,11 @@ export function defaultEnumKeyConstraints(customConstraints?: Partial<ModelEnumK
     constrainedEnumKey = constraints.NO_NUMBER_START_CHAR(constrainedEnumKey);
     constrainedEnumKey = constraints.NO_EMPTY_VALUE(constrainedEnumKey);
     constrainedEnumKey = constraints.NO_RESERVED_KEYWORDS(constrainedEnumKey);
+    //If the enum key has been manipulated, lets make sure it don't clash with existing keys
+    if (constrainedEnumKey !== enumKey) {
+      constrainedEnumKey = constraints.NO_DUPLICATE_KEYS(constrainedEnumModel, enumModel, constrainedEnumKey, constraints.NAMING_FORMATTER!);
+    }
     constrainedEnumKey = constraints.NAMING_FORMATTER(constrainedEnumKey);
-    constrainedEnumKey = constraints.NO_DUPLICATE_KEYS(constrainedEnumModel, enumModel, constrainedEnumKey, constraints.NAMING_FORMATTER!);
     return constrainedEnumKey;
   };
 }

src/generators/java/constrainer/PropertyKeyConstrainer.ts

@@ -21,7 +21,7 @@ export const DefaultPropertyKeyConstraints: PropertyKeyConstraintOptions = {
   NO_NUMBER_START_CHAR,
   NO_DUPLICATE_PROPERTIES,
   NO_EMPTY_VALUE,
-  NAMING_FORMATTER: FormatHelpers.toPascalCase,
+  NAMING_FORMATTER: FormatHelpers.toCamelCase,
   NO_RESERVED_KEYWORDS: (value: string) => {
     return NO_RESERVED_KEYWORDS(value, isReservedJavaKeyword); 
   }
@@ -37,8 +37,11 @@ export function defaultPropertyKeyConstraints(customConstraints?: Partial<Proper
     constrainedPropertyKey = constraints.NO_NUMBER_START_CHAR(constrainedPropertyKey);
     constrainedPropertyKey = constraints.NO_EMPTY_VALUE(constrainedPropertyKey);
     constrainedPropertyKey = constraints.NO_RESERVED_KEYWORDS(constrainedPropertyKey);
+    //If the property name has been manipulated, lets make sure it don't clash with existing properties
+    if (constrainedPropertyKey !== objectPropertyModel.propertyName) {
+      constrainedPropertyKey = constraints.NO_DUPLICATE_PROPERTIES(constrainedObjectModel, objectModel, constrainedPropertyKey, constraints.NAMING_FORMATTER);
+    }
     constrainedPropertyKey = constraints.NAMING_FORMATTER(constrainedPropertyKey);
-    constrainedPropertyKey = constraints.NO_DUPLICATE_PROPERTIES(constrainedObjectModel, objectModel, constrainedPropertyKey, constraints.NAMING_FORMATTER);
     return constrainedPropertyKey;
   };
 }

src/generators/java/presets/ConstraintsPreset.ts

@@ -6,7 +6,7 @@ import { JavaPreset } from '../JavaPreset';
  * 
  * @implements {JavaPreset}
  */
-export const JAVA_CONSTRAINTS_PRESET: JavaPreset<any> = {
+export const JAVA_CONSTRAINTS_PRESET: JavaPreset = {
   class: {
     self({renderer, content}) {
       renderer.addDependency('import javax.validation.constraints.*;');
@@ -19,7 +19,7 @@ export const JAVA_CONSTRAINTS_PRESET: JavaPreset<any> = {
         annotations.push(renderer.renderAnnotation('NotNull'));
       }
       const originalInput = property.property.originalInput;
-    
+
       // string
       if (property.property instanceof ConstrainedStringModel) {
         const pattern = originalInput['pattern'];
@@ -32,7 +32,7 @@ export const JAVA_CONSTRAINTS_PRESET: JavaPreset<any> = {
           annotations.push(renderer.renderAnnotation('Size', { min: minLength, max: maxLength }));
         }
       }
-
+      
       // number/integer
       if (property.property instanceof ConstrainedFloatModel ||
         property.property instanceof ConstrainedIntegerModel) {

src/generators/java/presets/JacksonPreset.ts

@@ -17,7 +17,7 @@ export const JAVA_JACKSON_PRESET: JavaPreset = {
       const isDictionary = property.property instanceof ConstrainedDictionaryModel;
       const hasUnwrappedOptions = isDictionary && (property.property as ConstrainedDictionaryModel).serializationType === 'unwrap';
       if (!hasUnwrappedOptions) {
-        const annotation = renderer.renderAnnotation('JsonProperty', `"${property.propertyName}"`);
+        const annotation = renderer.renderAnnotation('JsonProperty', `"${property.unconstrainedPropertyName}"`);
         return renderer.renderBlock([annotation, content]);
       }
       return renderer.renderBlock([content]);

src/generators/java/renderers/ClassRenderer.ts

@@ -83,14 +83,14 @@ export const JAVA_DEFAULT_CLASS_PRESET: ClassPresetType<JavaOptions> = {
     return renderer.defaultSelf();
   },
   property({ property }) {
-    return `private ${property.property.type} ${property.property.name};`;
+    return `private ${property.property.type} ${property.propertyName};`;
   },
   getter({ property }) {
     const getterName = `get${FormatHelpers.toPascalCase(property.propertyName)}`;
-    return `public ${property.property.type} ${getterName}() { return this.${property.property.name}; }`;
+    return `public ${property.property.type} ${getterName}() { return this.${property.propertyName}; }`;
   },
   setter({ property }) {
     const setterName = FormatHelpers.toPascalCase(property.propertyName);
-    return `public void set${setterName}(${property.property.type} ${property.property.name}) { this.${property.property.name} = ${property.property.name}; }`;
+    return `public void set${setterName}(${property.property.type} ${property.propertyName}) { this.${property.propertyName} = ${property.propertyName}; }`;
   }
 };