Merge pull request #11 from alberlau/fix/minor-fixes-1

Fix/minor fixes 1
alberlau · Jan 2, 2024 · c4566fd · c4566fd
2 parents fc07e42 + 3c8a017
commit c4566fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/java-pojo-generator-mojo-example/pom.xml b/java-pojo-generator-mojo-example/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>java-pojo-generator-mojo-example</artifactId>
 
     <properties>
-        <spring.version>2.5.14</spring.version>
+        <spring-boot.version>3.2.1</spring-boot.version>
     </properties>
     <dependencies>
         <dependency>
@@ -22,18 +22,18 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jdbc</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
-            <version>${spring.version}</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>

diff --git a/...-generator/src/main/java/org/db2code/generator/java/pojo/adapter/JavaPropertyAdapter.java b/...-generator/src/main/java/org/db2code/generator/java/pojo/adapter/JavaPropertyAdapter.java
@@ -12,7 +12,7 @@ public class JavaPropertyAdapter {
     private static final String JAVA_INTEGER = "Integer";
     private static final String JAVA_LONG = "Long";
     private static final String JAVA_BIG_DECIMAL = "java.math.BigDecimal";
-    private static final String JAVA_CHAR = "Char";
+    private static final String JAVA_CHAR = "Character";
     private static final String JAVA_STRING = "String";
     private static final String JAVA_DATE = "java.util.Date";
     private static final String JAVA_LOCAL_DATE = "java.time.LocalDate";

diff --git a/java-pojo-generator/src/main/resources/spring-data.mustache b/java-pojo-generator/src/main/resources/spring-data.mustache
@@ -9,7 +9,7 @@ import org.springframework.data.relational.core.mapping.Table;
 
     {{generationInfo}}{{/generationInfo}}
 */
-@Table("{{rawTable.tableName}}")
+@Table(schema = "{{rawTable.tableSchem}}", name = "{{rawTable.tableName}}")
 public class {{className}} {
     {{#properties}}
 

diff --git a/ruleset.xml b/ruleset.xml
@@ -58,8 +58,6 @@
     <rule ref="category/java/errorprone.xml/DontImportSun" />
     <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
 
-    <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
-
     <rule ref="category/java/errorprone.xml/JumbledIncrementer" />
     <rule ref="category/java/errorprone.xml/MisplacedNullCheck" />
     <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />