Skip to content

Commit 5fb8050

Browse files
ngbsnngbsn
committed
Renaming groupId and package to io.github.ngbsn
1 parent 52d3dc1 commit 5fb8050

32 files changed

+109
-112
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<groupId>org.ngbsn</groupId>
7+
<groupId>io.github.ngbsn</groupId>
88
<artifactId>sqlscript2jpa-codegen-maven-plugin</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010
<packaging>maven-plugin</packaging>
@@ -157,7 +157,7 @@
157157
</descriptorRefs>
158158
<archive>
159159
<manifest>
160-
<mainClass>org.ngbsn.generator.JPACodeGenerator</mainClass>
160+
<mainClass>io.github.ngbsn.generator.JPACodeGenerator</mainClass>
161161
</manifest>
162162
</archive>
163163
</configuration>

src/main/java/org/ngbsn/generator/AssociationMappingsGenerator.java renamed to src/main/java/io/github/ngbsn/generator/AssociationMappingsGenerator.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
package org.ngbsn.generator;
1+
package io.github.ngbsn.generator;
22

3-
import org.ngbsn.model.Column;
4-
import org.ngbsn.model.ForeignKeyConstraint;
5-
import org.ngbsn.model.Table;
3+
import io.github.ngbsn.model.Column;
4+
import io.github.ngbsn.model.ForeignKeyConstraint;
5+
import io.github.ngbsn.model.Table;
66

77
import java.util.Iterator;
88
import java.util.List;
99
import java.util.Map;
1010
import java.util.Optional;
1111

12-
import static org.ngbsn.generator.BiDirectionalMappingsGenerator.addBiDirectionalMappings;
13-
import static org.ngbsn.generator.ModelGenerator.tablesMap;
14-
import static org.ngbsn.generator.UniDirectionalMappingsGenerator.addBothSideUniDirectionalMappings;
12+
import static io.github.ngbsn.generator.ModelGenerator.tablesMap;
13+
import static io.github.ngbsn.generator.UniDirectionalMappingsGenerator.addBothSideUniDirectionalMappings;
1514

1615
/**
1716
* This class contains logic for generating all the association mappings
@@ -39,7 +38,7 @@ public static void generateMappings() {
3938
//Case: All fields are foreign keys. Also, the relation exits between 2 entities only
4039
//Remove this link entity from the tablesMap as separate entity is not needed to track Link Table. Use @ManyToMany on other 2 entities
4140
it.remove();
42-
addBiDirectionalMappings(table, foreignKeyConstraintList);
41+
BiDirectionalMappingsGenerator.addBiDirectionalMappings(table, foreignKeyConstraintList);
4342

4443
} else {
4544
//Case1: There are some fields that are not foreign keys. So separate entity is needed to track Link Table

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
package org.ngbsn.generator;
1+
package io.github.ngbsn.generator;
22

3-
import org.apache.commons.text.CaseUtils;
4-
import org.ngbsn.model.Column;
5-
import org.ngbsn.model.ForeignKeyConstraint;
6-
import org.ngbsn.model.Table;
7-
import org.ngbsn.model.annotations.fieldAnnotations.JoinColumnAnnotation;
8-
import org.ngbsn.model.annotations.fieldAnnotations.JoinTableAnnotation;
9-
import org.ngbsn.model.annotations.fieldAnnotations.ManyToManyAnnotation;
10-
import org.ngbsn.util.Util;
3+
import io.github.ngbsn.model.Column;
4+
import io.github.ngbsn.model.ForeignKeyConstraint;
5+
import io.github.ngbsn.model.Table;
6+
import io.github.ngbsn.model.annotations.fieldAnnotations.JoinColumnAnnotation;
7+
import io.github.ngbsn.model.annotations.fieldAnnotations.JoinTableAnnotation;
8+
import io.github.ngbsn.model.annotations.fieldAnnotations.ManyToManyAnnotation;
9+
import io.github.ngbsn.util.Util;
1110

1211
import java.util.HashSet;
1312
import java.util.List;
1413
import java.util.Set;
1514

16-
import static org.ngbsn.generator.ModelGenerator.tablesMap;
15+
import static io.github.ngbsn.generator.ModelGenerator.tablesMap;
1716

1817
public class BiDirectionalMappingsGenerator {
1918
static void addBiDirectionalMappings(Table table, List<ForeignKeyConstraint> foreignKeyConstraintList) {

src/main/java/org/ngbsn/generator/JPACodeGenerator.java renamed to src/main/java/io/github/ngbsn/generator/JPACodeGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.ngbsn.generator;
1+
package io.github.ngbsn.generator;
22

33
import freemarker.cache.StringTemplateLoader;
44
import freemarker.template.Configuration;
55
import freemarker.template.Template;
66
import freemarker.template.TemplateException;
77
import freemarker.template.TemplateExceptionHandler;
8-
import org.ngbsn.model.Table;
8+
import io.github.ngbsn.model.Table;
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
1111

@@ -16,7 +16,7 @@
1616
import java.util.*;
1717
import java.util.stream.Collectors;
1818

19-
import static org.ngbsn.util.Util.packageNameToFolderStructure;
19+
import static io.github.ngbsn.util.Util.packageNameToFolderStructure;
2020

2121
public class JPACodeGenerator {
2222
private static final Logger logger = LoggerFactory.getLogger(JPACodeGenerator.class);

src/main/java/org/ngbsn/generator/ModelGenerator.java renamed to src/main/java/io/github/ngbsn/generator/ModelGenerator.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
1-
package org.ngbsn.generator;
2-
1+
package io.github.ngbsn.generator;
2+
3+
import io.github.ngbsn.model.Column;
4+
import io.github.ngbsn.model.EmbeddableClass;
5+
import io.github.ngbsn.model.ForeignKeyConstraint;
6+
import io.github.ngbsn.model.Table;
7+
import io.github.ngbsn.model.annotations.entityAnnotations.EntityAnnotation;
8+
import io.github.ngbsn.model.annotations.entityAnnotations.TableAnnotation;
9+
import io.github.ngbsn.model.annotations.fieldAnnotations.ColumnAnnotation;
10+
import io.github.ngbsn.model.annotations.fieldAnnotations.NotNullAnnotation;
11+
import io.github.ngbsn.util.SQLToJavaMapping;
12+
import io.github.ngbsn.util.Util;
313
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
414
import net.sf.jsqlparser.statement.Statements;
515
import net.sf.jsqlparser.statement.alter.Alter;
616
import net.sf.jsqlparser.statement.create.table.CreateTable;
717
import net.sf.jsqlparser.statement.create.table.ForeignKeyIndex;
818
import net.sf.jsqlparser.statement.create.table.Index;
9-
import org.apache.commons.text.CaseUtils;
10-
import org.ngbsn.model.Column;
11-
import org.ngbsn.model.EmbeddableClass;
12-
import org.ngbsn.model.ForeignKeyConstraint;
13-
import org.ngbsn.model.Table;
14-
import org.ngbsn.model.annotations.entityAnnotations.EntityAnnotation;
15-
import org.ngbsn.model.annotations.entityAnnotations.TableAnnotation;
16-
import org.ngbsn.model.annotations.fieldAnnotations.ColumnAnnotation;
17-
import org.ngbsn.model.annotations.fieldAnnotations.NotNullAnnotation;
18-
import org.ngbsn.util.SQLToJavaMapping;
19-
import org.ngbsn.util.Util;
2019
import org.slf4j.Logger;
2120
import org.slf4j.LoggerFactory;
2221

2322
import java.util.*;
2423
import java.util.stream.Collectors;
2524

26-
import static org.ngbsn.generator.AssociationMappingsGenerator.generateMappings;
27-
2825
/**
2926
* This class will parse the SQL script and generate the Table models for each table in the script
3027
* It will also extract all the columns from the script and add to the Table model
@@ -38,7 +35,7 @@ public static List<Table> parse(final String sqlScript) {
3835
Statements statements = CCJSqlParserUtil.parseStatements(sqlScript);
3936
processCreateTableStatements(statements);
4037
processAlterTableStatements(statements);
41-
generateMappings();
38+
AssociationMappingsGenerator.generateMappings();
4239
return tablesMap.values().stream().toList();
4340
} catch (Exception e) {
4441
logger.error("Error occurred", e);
@@ -49,11 +46,13 @@ public static List<Table> parse(final String sqlScript) {
4946
/**
5047
* Clears the tables map. This is needed to have a clean start between junits
5148
*/
52-
public static void clearTablesMap(){
49+
public static void clearTablesMap() {
5350
tablesMap.clear();
5451
}
52+
5553
/**
5654
* Iterate over all the Create Table statements and prepare the list of Table Model
55+
*
5756
* @param statements set of statements
5857
*/
5958
private static void processCreateTableStatements(Statements statements) {
@@ -91,20 +90,21 @@ private static void processCreateTableStatements(Statements statements) {
9190

9291
/**
9392
* Iterate over all the Alter Table statements and prepare the list of Table Model
93+
*
9494
* @param statements set of statements
9595
*/
9696
private static void processAlterTableStatements(Statements statements) {
9797
statements.getStatements().forEach(statement -> {
9898
//Iterating over all Tables
9999
// Look for primary and foreign keys in ALTER TABLE constraints
100-
if(statement instanceof Alter alterTable){
100+
if (statement instanceof Alter alterTable) {
101101
Table table = tablesMap.get(alterTable.getTable().getName().replaceAll("[\"']", ""));
102102
List<Index> foreignKeyIndexes = new ArrayList<>();
103103
alterTable.getAlterExpressions().forEach(alterExpression -> {
104-
if(alterExpression.getIndex() instanceof ForeignKeyIndex foreignKeyIndex){
104+
if (alterExpression.getIndex() instanceof ForeignKeyIndex foreignKeyIndex) {
105105
//case: ALTER TABLE FOREIGN KEY
106106
foreignKeyIndexes.add(alterExpression.getIndex());
107-
} else if (alterExpression.getIndex().getType().equals("PRIMARY KEY")){
107+
} else if (alterExpression.getIndex().getType().equals("PRIMARY KEY")) {
108108
//case: ALTER TABLE PRIMARY KEY
109109
extractPrimaryKeys(alterExpression.getIndex(), table);
110110
}
@@ -118,8 +118,8 @@ private static void processAlterTableStatements(Statements statements) {
118118
/**
119119
* Looking for all foreign keys in this table and adding it to our model
120120
*
121-
* @param foreignKeyIndexes List of foreign key indexes
122-
* @param table Table model
121+
* @param foreignKeyIndexes List of foreign key indexes
122+
* @param table Table model
123123
*/
124124
private static void extractForeignKeys(List<Index> foreignKeyIndexes, Table table) {
125125
if (!foreignKeyIndexes.isEmpty()) {
@@ -141,11 +141,11 @@ private static void extractForeignKeys(List<Index> foreignKeyIndexes, Table tabl
141141
/**
142142
* Extracting primary key information from the parsed data and setting them into the Table model
143143
*
144-
* @param primaryKeyIndex primaryKeyIndex
145-
* @param table Table model
144+
* @param primaryKeyIndex primaryKeyIndex
145+
* @param table Table model
146146
*/
147147
private static void extractPrimaryKeys(Index primaryKeyIndex, Table table) {
148-
List<Index.ColumnParams> columnParamsList = primaryKeyIndex != null ? primaryKeyIndex.getColumns(): null;
148+
List<Index.ColumnParams> columnParamsList = primaryKeyIndex != null ? primaryKeyIndex.getColumns() : null;
149149
if (columnParamsList != null) {
150150
Set<Column> primaryKeyColumns = table.getColumns().stream().
151151
filter(column -> columnParamsList.stream().anyMatch(columnParams -> columnParams.getColumnName().replaceAll("[\"']", "").equals(column.getColumnName()))).collect(Collectors.toSet());

src/main/java/org/ngbsn/generator/UniDirectionalMappingsGenerator.java renamed to src/main/java/io/github/ngbsn/generator/UniDirectionalMappingsGenerator.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
package org.ngbsn.generator;
2-
3-
import org.apache.commons.text.CaseUtils;
1+
package io.github.ngbsn.generator;
2+
3+
import io.github.ngbsn.model.Column;
4+
import io.github.ngbsn.model.EmbeddableClass;
5+
import io.github.ngbsn.model.ForeignKeyConstraint;
6+
import io.github.ngbsn.model.Table;
7+
import io.github.ngbsn.model.annotations.fieldAnnotations.*;
8+
import io.github.ngbsn.util.Util;
49
import org.apache.commons.text.WordUtils;
5-
import org.ngbsn.model.Column;
6-
import org.ngbsn.model.EmbeddableClass;
7-
import org.ngbsn.model.ForeignKeyConstraint;
8-
import org.ngbsn.model.Table;
9-
import org.ngbsn.model.annotations.fieldAnnotations.*;
10-
import org.ngbsn.util.Util;
1110

1211
import java.util.HashSet;
1312
import java.util.Optional;
1413
import java.util.Set;
1514
import java.util.stream.Collectors;
1615
import java.util.stream.Stream;
1716

18-
import static org.ngbsn.generator.ModelGenerator.tablesMap;
17+
import static io.github.ngbsn.generator.ModelGenerator.tablesMap;
1918

2019
public class UniDirectionalMappingsGenerator {
2120

src/main/java/org/ngbsn/maven/JPACodeGenMojo.java renamed to src/main/java/io/github/ngbsn/maven/JPACodeGenMojo.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package org.ngbsn.maven;
1+
package io.github.ngbsn.maven;
22

3+
import io.github.ngbsn.generator.JPACodeGenerator;
34
import lombok.SneakyThrows;
45
import org.apache.maven.plugin.AbstractMojo;
56
import org.apache.maven.plugin.MojoExecutionException;
@@ -15,8 +16,6 @@
1516
import java.nio.charset.StandardCharsets;
1617
import java.util.stream.Collectors;
1718

18-
import static org.ngbsn.generator.JPACodeGenerator.generateCode;
19-
2019
@Mojo(name = "parse-schema")
2120
public class JPACodeGenMojo extends AbstractMojo {
2221
private static final Logger logger = LoggerFactory.getLogger(JPACodeGenMojo.class);
@@ -42,6 +41,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
4241
new InputStreamReader(new FileInputStream(sqlFilePath), StandardCharsets.UTF_8))
4342
.lines()
4443
.collect(Collectors.joining("\n"));
45-
generateCode(sqlScript, packageName);
44+
JPACodeGenerator.generateCode(sqlScript, packageName);
4645
}
4746
}

src/main/java/org/ngbsn/model/Column.java renamed to src/main/java/io/github/ngbsn/model/Column.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.ngbsn.model;
1+
package io.github.ngbsn.model;
22

33
import lombok.Getter;
44
import lombok.Setter;

src/main/java/org/ngbsn/model/EmbeddableClass.java renamed to src/main/java/io/github/ngbsn/model/EmbeddableClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.ngbsn.model;
1+
package io.github.ngbsn.model;
22

33
import lombok.Getter;
44
import lombok.Setter;

src/main/java/org/ngbsn/model/ForeignKeyConstraint.java renamed to src/main/java/io/github/ngbsn/model/ForeignKeyConstraint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.ngbsn.model;
1+
package io.github.ngbsn.model;
22

33
import lombok.Getter;
44
import lombok.Setter;

0 commit comments

Comments
 (0)