Changing access level of tablesmap

Author: ngbsn

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

@@ -9,13 +9,12 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static io.github.ngbsn.generator.ModelGenerator.tablesMap;
 import static io.github.ngbsn.generator.UniDirectionalMappingsGenerator.addBothSideUniDirectionalMappings;
 
 /**
- * This class contains logic for generating all the association mappings
+ * Generate both UniDirectional and BiDirectional association mappings for all tables
  */
-public class AssociationMappingsGenerator {
+class AssociationMappingsGenerator {
 
 
     private AssociationMappingsGenerator() {
@@ -24,8 +23,8 @@ private AssociationMappingsGenerator() {
     /**
      * Generate both UniDirectional and BiDirectional association mappings for all tables
      */
-    public static void generateMappings() {
-        Iterator<Map.Entry<String, Table>> it = tablesMap.entrySet().iterator();
+    static void generateMappings() {
+        Iterator<Map.Entry<String, Table>> it = ModelGenerator.getTablesMap().entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry<String, Table> item = it.next();
             Table table = item.getValue();

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

@@ -12,9 +12,10 @@
 import java.util.List;
 import java.util.Set;
 
-import static io.github.ngbsn.generator.ModelGenerator.tablesMap;
-
-public class BiDirectionalMappingsGenerator {
+/**
+ * Generate BiDirectional Mappings (many-to-many) for a specific table
+ */
+class BiDirectionalMappingsGenerator {
 
     private BiDirectionalMappingsGenerator() {
     }
@@ -25,8 +26,8 @@ private BiDirectionalMappingsGenerator() {
      * @param foreignKeyConstraintList List of generated foreignKeyConstraintList models
      */
     static void addBiDirectionalMappings(Table table, List<ForeignKeyConstraint> foreignKeyConstraintList) {
-        Table table1 = tablesMap.get(foreignKeyConstraintList.get(0).getReferencedTableName().replaceAll("[\"']", ""));
-        Table table2 = tablesMap.get(foreignKeyConstraintList.get(1).getReferencedTableName().replaceAll("[\"']", ""));
+        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();

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

@@ -34,14 +34,29 @@ private ModelGenerator() {
     }
 
     private static final Logger logger = LoggerFactory.getLogger(ModelGenerator.class);
-    protected static Map<String, Table> tablesMap = new HashMap<>();
+    private static final Map<String, Table> tablesMap = new HashMap<>();
+
+    /**
+     * Clears the tables map. This is needed to have a clean start between JUnits
+     */
+    public static void clearTablesMap() {
+        tablesMap.clear();
+    }
+
+    /**
+     * Returns the tables map.
+     */
+    public static Map<String, Table> getTablesMap() {
+        return tablesMap;
+    }
+
 
     /**
      * Parse the DDL statements using JSQL parser
      * @param sqlScript The input DDL commands used for generating the models
      * @return List of Tables models
      */
-    public static List<Table> parse(final String sqlScript) {
+    static List<Table> parse(final String sqlScript) {
         try {
             Statements statements = CCJSqlParserUtil.parseStatements(sqlScript);
             processCreateTableStatements(statements);
@@ -54,13 +69,6 @@ public static List<Table> parse(final String sqlScript) {
         return new ArrayList<>();
     }
 
-    /**
-     * Clears the tables map. This is needed to have a clean start between junits
-     */
-    public static void clearTablesMap() {
-        tablesMap.clear();
-    }
-
     /**
      * Iterate over all the JSQL Create Table  statements and prepare the list of Table Model
      * @param statements Set of JSQL statements
@@ -149,7 +157,6 @@ private static void extractForeignKeys(final List<Index> foreignKeyIndexes, fina
 
     /**
      * Extracting primary key information from the JSQL parsed data and setting them into the Table model
-     *
      * @param primaryKeyIndex JSQL primaryKeyIndex
      * @param table           Table model
      */

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

@@ -14,8 +14,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static io.github.ngbsn.generator.ModelGenerator.tablesMap;
-
+/**
+ * Generate UniDirectional Mappings (one-to-many and many-to-one) for a specific table
+ */
 public class UniDirectionalMappingsGenerator {
 
     private UniDirectionalMappingsGenerator() {
@@ -27,7 +28,7 @@ private UniDirectionalMappingsGenerator() {
      * @param foreignKeyConstraint ForeignKeyConstraint model
      */
     static void addBothSideUniDirectionalMappings(Table table, ForeignKeyConstraint foreignKeyConstraint) {
-        Table referencedTable = tablesMap.get(foreignKeyConstraint.getReferencedTableName().replaceAll("[\"']", ""));
+        Table referencedTable = ModelGenerator.getTablesMap().get(foreignKeyConstraint.getReferencedTableName().replaceAll("[\"']", ""));
 
         //In the Child table, create a new column having field name as Parent(Referenced) Table.
         Column parentTableField = new Column();

src/test/java/io/github/ngbsn/maven/CodeGenTest.java

@@ -15,6 +15,7 @@
 
 import static io.github.ngbsn.generator.JPACodeGenerator.generateCode;
 
+//TODO write assertions
 public class CodeGenTest {
     private static final Logger logger = LoggerFactory.getLogger(CodeGenTest.class);