Fix issues related to Embeddable classes and add logic to set updatable,insertable = false

Author: ngbsn

src/main/java/io/github/ngbsn/generator/AssociationMappingsGenerator.java

@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static io.github.ngbsn.generator.UniDirectionalMappingsGenerator.addBothSideUniDirectionalMappings;
+import static io.github.ngbsn.generator.OneToManyMappingsGenerator.addBiDirectionalMappings;
 
 /**
  * Generate both UniDirectional and BiDirectional association mappings for all tables
@@ -33,7 +33,7 @@ static void generateMappings() {
                 //Case: There is only 1 Foreign key or 1 Composite Foreign Key
                 //Treat this as a regular table and add a new column with for parent field with @ManyToOne
                 //and add a new column in ReferencedTable for child field with @OneToMany
-                addBothSideUniDirectionalMappings(table, foreignKeyConstraintList.get(0));
+                addBiDirectionalMappings(table, foreignKeyConstraintList.get(0));
 
             } else {
                 //Case: There are multiple Foreign Keys or multiple Composite Foreign Keys
@@ -44,13 +44,13 @@ static void generateMappings() {
                     //Case: All fields are foreign keys. Also, the relation exits between 2 entities only
                     //Remove this link entity from the tablesMap as separate entity is not needed to track Link Table. Use @ManyToMany on other 2 entities
                     it.remove();
-                    BiDirectionalMappingsGenerator.addBiDirectionalMappings(table, foreignKeyConstraintList);
+                    ManyToManyMappingsGenerator.addManyToManyMappings(table, foreignKeyConstraintList);
 
                 } else {
                     //Case1: There are some fields that are not foreign keys. So separate entity is needed to track Link Table
                     //Case2: All fields are foreign keys. But, the relation exits between 2 or more entities
                     //Add @ManyToOne for each foreignKey and corresponding @OneToMany in referenced Table
-                    foreignKeyConstraintList.forEach(foreignKeyConstraint -> addBothSideUniDirectionalMappings(table, foreignKeyConstraint));
+                    foreignKeyConstraintList.forEach(foreignKeyConstraint -> addBiDirectionalMappings(table, foreignKeyConstraint));
                 }
             }
         }

src/main/java/io/github/ngbsn/generator/BiDirectionalMappingsGenerator.java renamed to src/main/java/io/github/ngbsn/generator/ManyToManyMappingsGenerator.java

@@ -14,9 +14,9 @@
 /**
  * Generate BiDirectional Mappings (many-to-many) for a specific table
  */
-class BiDirectionalMappingsGenerator {
+class ManyToManyMappingsGenerator {
 
-    private BiDirectionalMappingsGenerator() {
+    private ManyToManyMappingsGenerator() {
     }
 
     /**
@@ -25,14 +25,14 @@ private BiDirectionalMappingsGenerator() {
      * @param table                    The table to be processed
      * @param foreignKeyConstraintList List of generated foreignKeyConstraintList models
      */
-    static void addBiDirectionalMappings(final Table table, final List<ForeignKeyConstraint> foreignKeyConstraintList) {
+    static void addManyToManyMappings(final Table table, final List<ForeignKeyConstraint> foreignKeyConstraintList) {
         Table table1 = ModelGenerator.getTablesMap().get(foreignKeyConstraintList.get(0).getReferencedTableName().replaceAll("[\"']", ""));
         Table table2 = ModelGenerator.getTablesMap().get(foreignKeyConstraintList.get(1).getReferencedTableName().replaceAll("[\"']", ""));
 
         //Adding @ManyToMany and @JoinTable to table1
         Column column1 = new Column();
         column1.setFieldName(Util.convertSnakeCaseToCamelCase(table2.getTableName(), false));
-        column1.setType(table2.getClassName());
+        column1.setType("Set<" + table2.getClassName() + ">");
         column1.getAnnotations().add(ManyToManyAnnotation.builder().build().toString());
         List<JoinColumnAnnotation> joinColumnAnnotations = new ArrayList<>();
         for (String column : foreignKeyConstraintList.get(0).getColumns()) {
@@ -48,7 +48,7 @@ static void addBiDirectionalMappings(final Table table, final List<ForeignKeyCon
         //Adding @ManyToMany(mappedBy) to table2
         Column column2 = new Column();
         column2.setFieldName(Util.convertSnakeCaseToCamelCase(table1.getTableName(), false));
-        column2.setType(table1.getClassName());
+        column2.setType("Set<" + table1.getClassName() + ">");
         column2.getAnnotations().add(ManyToManyAnnotation.builder().mappedBy(column1.getFieldName()).build().toString());
         table2.getColumns().add(column2);
     }

src/main/java/io/github/ngbsn/generator/ModelGenerator.java

@@ -202,8 +202,7 @@ private static void extractPrimaryKeys(final Index primaryKeyIndex, final Table
                 EmbeddableClass embeddedId = new EmbeddableClass();
                 embeddedId.setClassName(table.getClassName() + "PK");
                 embeddedId.setFieldName(Util.convertSnakeCaseToCamelCase(table.getTableName(), false) + "PK");
-                embeddedId.setEmbeddedId(true);
-                table.getEmbeddableClasses().add(embeddedId);
+                table.setEmbeddedId(embeddedId);
 
                 //remove the primary keys columns from table and add inside EmbeddedId
                 primaryKeyColumns.forEach(column -> {
@@ -225,11 +224,11 @@ private static void extractColumns(final Table table, final CreateTable parsedTa
         parsedTable.getColumnDefinitions().forEach(columnDefinition -> {
             Column column = new Column();
             columns.add(column);
-            List<String> columnAnnotations = new ArrayList<>();
-            column.setAnnotations(columnAnnotations);
+            List<String> fieldAnnotations = new ArrayList<>();
+            column.setAnnotations(fieldAnnotations);
             column.setColumnName(columnDefinition.getColumnName().replaceAll(REGEX_ALL_QUOTES, ""));
             //Adding @Column
-            columnAnnotations.add(ColumnAnnotation.builder().columnName(column.getColumnName()).build().toString());
+            fieldAnnotations.add(ColumnAnnotation.builder().columnName(column.getColumnName()).build().toString());
             String fieldName = Util.convertSnakeCaseToCamelCase(column.getColumnName(), false);
             fieldName = SourceVersion.isKeyword(fieldName) ? fieldName + table.getClassName() : fieldName;
             column.setFieldName(fieldName);
@@ -242,7 +241,7 @@ private static void extractColumns(final Table table, final CreateTable parsedTa
                     values.add(s.replaceAll(REGEX_ALL_QUOTES, ""));
                 }
                 column.setType(tableEnum.getEnumName());
-                columnAnnotations.add(EnumeratedAnnotation.builder().value(EnumType.STRING).build().toString());
+                fieldAnnotations.add(EnumeratedAnnotation.builder().value(EnumType.STRING).build().toString());
             } else {
                 String mappedJavaType = SQLTypeToJpaTypeMapping.getTypeMapping(columnDefinition.getColDataType().getDataType());
                 column.setType(Objects.requireNonNullElse(mappedJavaType, "Object"));
@@ -252,7 +251,7 @@ private static void extractColumns(final Table table, final CreateTable parsedTa
             if (columnDefinition.getColumnSpecs() != null) {
                 String constraints = String.join(" ", columnDefinition.getColumnSpecs());
                 if (constraints.contains("NOT NULL")) {
-                    columnAnnotations.add(NotNullAnnotation.builder().build().toString());
+                    fieldAnnotations.add(NotNullAnnotation.builder().build().toString());
                 }
             }
         });