Merge pull request #4 from dynamiatools/5.2.x

upgrade to DynamiaTools v5.2.0
dynamiatools · Sep 13, 2024 · 1f2d2c3 · 1f2d2c3
2 parents 2d7f772 + 1ab3126
commit 1f2d2c3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 60 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>dynamia-tools-demos</groupId>
     <artifactId>my-book-store</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <name>MyBookStore</name>
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.5</version>
+        <version>3.3.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -47,82 +47,38 @@
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
 
-        <tools.version>5.1.1</tools.version>
+        <tools.version>5.2.0</tools.version>
+        <security.version>1.0.1</security.version>
     </properties>
 
     <dependencies>
         <!-- DynamiaTools Dependencies -->
         <dependency>
             <groupId>tools.dynamia</groupId>
-            <artifactId>tools.dynamia.app</artifactId>
+            <artifactId>dynamia-tools-starter</artifactId>
             <version>${tools.version}</version>
         </dependency>
-        <dependency>
-            <groupId>tools.dynamia</groupId>
-            <artifactId>tools.dynamia.domain.jpa</artifactId>
-            <version>${tools.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>tools.dynamia</groupId>
-            <artifactId>tools.dynamia.zk</artifactId>
-            <version>${tools.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>tools.dynamia.themes</groupId>
             <artifactId>tools.dynamia.themes.dynamical</artifactId>
-            <version>${tools.version}</version>
+            <version>5.2.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>tools.dynamia.modules</groupId>
-            <artifactId>tools.dynamia.modules.security.ui</artifactId>
-            <version>1.0.0</version>
-        </dependency>
+
         <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-rest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.ehcache</groupId>

diff --git a/src/main/java/mybookstore/InstallCustomSkinCLR.java b/src/main/java/mybookstore/InstallCustomSkinCLR.java
@@ -1,16 +1,19 @@
 package mybookstore;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
-import tools.dynamia.templates.ApplicationTemplateSkin;
 import tools.dynamia.integration.sterotypes.Provider;
+import tools.dynamia.templates.ApplicationTemplateSkin;
 import tools.dynamia.themes.dynamical.DynamicalTemplate;
 
 @Provider
 public class InstallCustomSkinCLR implements CommandLineRunner {
 
-    @Autowired
-    private DynamicalTemplate template;
+
+    private final DynamicalTemplate template;
+
+    public InstallCustomSkinCLR(DynamicalTemplate template) {
+        this.template = template;
+    }
 
     @Override
     public void run(String... args) throws Exception {

diff --git a/src/main/java/mybookstore/MyBookStoreApplication.java b/src/main/java/mybookstore/MyBookStoreApplication.java
@@ -27,10 +27,8 @@
 import tools.dynamia.app.Ehcache3CacheManager;
 import tools.dynamia.domain.DefaultEntityReferenceRepository;
 import tools.dynamia.domain.EntityReferenceRepository;
-import tools.dynamia.app.EnableDynamiaTools;
 
 @SpringBootApplication
-@EnableDynamiaTools
 @EntityScan({"mybookstore", "tools.dynamia"})
 @EnableCaching
 public class MyBookStoreApplication { //<1>

diff --git a/src/main/java/mybookstore/domain/Book.java b/src/main/java/mybookstore/domain/Book.java
@@ -36,6 +36,7 @@ public class Book extends SimpleEntity {
     private String title;
     @Column(length = 1000)
     private String sinopsys;
+    @Column(name = "publication_year")
     private int year;
     private String isbn;
     @ManyToOne

diff --git a/src/main/java/mybookstore/domain/BookReview.java b/src/main/java/mybookstore/domain/BookReview.java
@@ -1,16 +1,16 @@
 package mybookstore.domain;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import tools.dynamia.domain.jpa.BaseEntity;
 
 
 @Entity
+@Table(name = "reviews")
 public class BookReview extends BaseEntity {
 
     @ManyToOne(fetch = FetchType.LAZY)
     private Book book;
+    @Column(name = "user_name")
     private String user;
     private String comment;
     private int stars;

diff --git a/src/main/java/mybookstore/domain/CategoryTag.java b/src/main/java/mybookstore/domain/CategoryTag.java
@@ -3,11 +3,13 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import tools.dynamia.domain.Descriptor;
 import tools.dynamia.domain.contraints.NotEmpty;
 import tools.dynamia.domain.jpa.SimpleEntity;
 
 @Entity
+@Table(name = "tags")
 @Descriptor(fields = "tag")
 public class CategoryTag extends SimpleEntity {
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -12,6 +12,7 @@ spring:
 logging:
   level:
     root: info
+    org.springframework.security: DEBUG
 
 
 management: