0.0.8 (fix annotations to support autoGenerateColumns)

Author: gustavnavar

.idea/artifacts/gridcore_jar.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>me.agno</groupId>
     <artifactId>demo</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
     <name>demo</name>
     <description>demo</description>
     <properties>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>me.agno.gridcore</groupId>
             <artifactId>gridcore</artifactId>
-            <version>0.0.5</version>
+            <version>0.0.8</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

.idea/misc.xml

@@ -16,7 +16,8 @@
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", transactionManagerRef = "transactionManager", basePackages = { "com.grupoot.repository" })
+@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", transactionManagerRef = "transactionManager",
+        basePackages = { "me.agno.demo.repositories" })
 public class HibernateConfig {
 
     @Autowired

demo/pom.xml

@@ -53,6 +53,21 @@ public ResponseEntity<ItemsDTO<Order>> getOrdersGrid(HttpServletRequest request)
 		return ResponseEntity.ok(items);
 	}
 
+	@GetMapping(value = {"getordersgridordersautogeneratecolumns", "GetOrdersGridordersAutoGenerateColumns"}, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ItemsDTO<Order>> getOrdersGridordersAutoGenerateColumns(HttpServletRequest request) {
+
+		EntityManager em = entityManagerFactory.createEntityManager();
+
+		IGridServer<Order> server = new GridServer<Order>(em, Order.class, null, null,
+				request.getParameterMap(), null)
+				.autoGenerateColumns()
+				.sortable()
+				.filterable();
+
+		var items = server.getItemsToDisplay();
+		return ResponseEntity.ok(items);
+	}
+
 	@GetMapping(value = {"getordersgridwithtotals", "GetOrdersGridWithTotals"}, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ItemsDTO<Order>> getOrdersGridWithTotals(HttpServletRequest request) {
 

demo/src/main/java/me/agno/demo/config/HibernateConfig.java

@@ -4,9 +4,12 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import me.agno.gridcore.annotations.GridColumn;
+import me.agno.gridcore.annotations.GridTable;
+import me.agno.gridcore.pagination.PagingType;
+import me.agno.gridcore.sorting.GridSortDirection;
 import org.hibernate.annotations.Nationalized;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
+
 
 import java.math.BigDecimal;
 import java.time.Instant;
@@ -17,67 +20,82 @@
 @Setter
 @Entity
 @Table(name = "orders")
+@GridTable(pagingType = PagingType.PAGINATION, pageSize = 20)
 public class Order {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "orderid", nullable = false)
+    @GridColumn(position = 0, type = Integer.class)
     private Integer orderID;
 
     @Column(name = "customerid", insertable = false, updatable = false, nullable = false)
+    @GridColumn(position = 5, type = String.class)
     private String customerID;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "customerid")
     private Customer customer;
 
     @Column(name = "employeeid", columnDefinition = "int", insertable = false, updatable = false, nullable = false)
+    @GridColumn(position = 4, type = String.class)
     private String employeeID;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "employeeid")
     private Employee employee;
 
     @Column(name = "orderdate")
+    @GridColumn(position = 1, type = Instant.class, sortEnabled = true, filterEnabled = true, sortInitialDirection = GridSortDirection.ASCENDING)
     private Instant orderDate;
 
     @Column(name = "requireddate")
+    @GridColumn(position = 2, type = Instant.class)
     private Instant requiredDate;
 
     @Column(name = "shippeddate")
+    @GridColumn(position = 3, type = Instant.class)
     private Instant shippedDate;
 
     @Column(name = "shipVia", columnDefinition = "int", insertable = false, updatable = false, nullable = false)
+    @GridColumn(position = 6, type = String.class)
     private String shipVia;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "shipVia")
     private Shipper shipper;
 
     @Column(name = "freight")
+    @GridColumn(position = 7, type = BigDecimal.class, sortEnabled = true, filterEnabled = true)
     private BigDecimal freight;
 
     @Nationalized
     @Column(name = "shipname", length = 40)
+    @GridColumn(position = 8, type = String.class)
     private String shipName;
 
     @Nationalized
     @Column(name = "shipaddress", length = 60)
+    @GridColumn(position = 9, type = String.class)
     private String shipAddress;
 
     @Nationalized
     @Column(name = "shipcity", length = 15)
+    @GridColumn(position = 10, type = String.class)
     private String shipCity;
 
     @Nationalized
     @Column(name = "shipregion", length = 15)
+    @GridColumn(position = 11, type = String.class)
     private String shipRegion;
 
     @Nationalized
     @Column(name = "shippostalcode", length = 10)
+    @GridColumn(position = 12, type = String.class)
     private String shipPostalCode;
 
     @Nationalized
     @Column(name = "shipcountry", length = 15)
+    @GridColumn(position = 13, type = String.class)
     private String shipCountry;
 
     @JsonIgnore

demo/src/main/java/me/agno/demo/controllers/SampleDataController.java

@@ -0,0 +1,13 @@
+package me.agno.demo.repositories;
+
+import me.agno.demo.model.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface OrderRepository extends JpaRepository<Order, Integer> {
+
+    Optional<Order> findByOrderID(int id);
+}

demo/src/main/java/me/agno/demo/model/Order.java

@@ -1,9 +1,14 @@
 spring.datasource.url=jdbc:sqlserver://localhost:1433;database=NorthWind;integratedSecurity=true;trustServerCertificate=true;
 spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+spring.datasource.type=com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource
+
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
+
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.show-sql=true
 spring.jpa.open-in-view=false
+
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 spring.jackson.serialization.fail-on-empty-beans=false

demo/src/main/java/me/agno/demo/repositories/OrderRepository.java

@@ -6,11 +6,11 @@
 
     <groupId>me.agno.gridcore</groupId>
     <artifactId>gridcore</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -19,7 +19,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
-            <version>1.18.28</version>
+            <version>[1.18,)</version>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
@@ -30,13 +30,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.15.3</version>
+            <version>[2.12,]</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>6.4.1.Final</version>
+            <version>[6.0,)</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

demo/src/main/resources/application.properties

@@ -194,7 +194,7 @@ public Grid(EntityManager entityManager, Class<T> targetType, Predicate predicat
                 noTotalsParameter != null && ! noTotalsParameter.isEmpty() &&
                 noTotalsParameter.get(0) != null && ! noTotalsParameter.get(0).trim().isEmpty()) {
 
-            this.pagingType = PagingType.VIRTUALIZATION;
+            setPagingType(PagingType.VIRTUALIZATION);
             try {
                 startIndex = Integer.parseInt(startIndexParameter.get(0).trim());
             }
@@ -280,9 +280,9 @@ protected void prepareItemsToDisplay() {
     void applyGridSettings() {
         GridTable opt = this.annotations.getAnnotationForTable(getTargetType());
         if (opt == null) return;
-        this.pagingType = opt.pagingType();
+        setPagingType(opt.pagingType());
 
-        if (this.pagingType == PagingType.PAGINATION)
+        if (getPagingType() == PagingType.PAGINATION)
         {
             if (opt.pageSize() > 0)
                 this.getPager().setPageSize(opt.pageSize());
@@ -294,17 +294,16 @@ void applyGridSettings() {
 
     public void autoGenerateColumns() {
 
-        var tuples = this.annotations.getAnnotationsForTableColumns(this.targetType);
+        var annotationsList = this.annotations.getAnnotationsForTableColumns(this.targetType);
 
-        for (var tuple : tuples) {
-            String name = tuple.getFirst();
-            Boolean isKey = tuple.getSecond();
-            GridColumn annotations = tuple.getThird();
+        for (var item : annotationsList) {
+            String name = item.getKey();
+            GridColumn annotation = item.getValue();
 
-            if(isKey)
-                this.columns.add(name, annotations.type()).setPrimaryKey(true);
+            if(annotation.key())
+                this.columns.add(name, annotation.type()).setPrimaryKey(true);
             else
-                this.columns.add(name, annotations.type());
+                this.columns.add(name, annotation.type());
         }
     }