Feature/release 2

.github/workflows/codeql.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master", "1.x.x" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: "26 11 * * 3"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ java ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

CHANGELOG.md

@@ -9,17 +9,34 @@
 - Feature: startsWith, contains, endsWith, notStartsWith, notContains and notEndsWith for like and notLike
 - Feature: Group By for Simple DSL
 - Feature: Having for Simple DSL
+- Feature: Simple one type read for Simple DSL
 - Feature: SQL Ansi Aggregation Functions (COUNT, SUM, MIN, MAX, AVG)
 - Feature: Quarkus Extension module
 - Feature: FrameworkIntegrationService for Integration with external framework like Quarkus or Micronaut
 - Feature: Support for List args in @Query with named params
 - Feature: Support for Metrics using MetricsTracker
 - Feature: DB2 Sql Specifics
 - Feature: Bean Provider for Bean Validation
+- Feature: Cascade delete on not initialized lazy entities
+- Feature: UUID SqlAccessor
+- Feature: Merge for Entities
+- Feature: Simple DSL distinct select
+- Feature: Added missing methods from Optional to Result
+- Feature: Count and hasResults for DSL
+- Feature: Distinct for DSL Entity Select
+- Feature: Distinct for DSL SubQuery
 - Removal: Removed notLike and like
 - Refactor: Refactor of IT Tests
 - Bugfix: Fix missing upsert for entities with relationships
 - Bugfix: Fix dev mode reloading issues for Quarkus
+- Bugfix: Fix event dispatch on unsupported relationships
+- Bugfix: Fix missing setEntity for projections with inherited classes
+- Bugfix: Fix NPE on where checker for Simple DSL
+- Bugfix: Fix IllegalArgumentException for invalid Vendor Function params
+- Bugfix: Fix wrong exceptions on Update/Remove Event
+- Bugfix: Removed useless update on Entities with a false modified flag
+- Bugfix: Fix auto-set inverse execution
+- Bugfix: Fix match of custom functions (like ::date) for named parameters in @Query
 
 ## 1.10.0
 - Feature: BeanProvider for Dependency Injection Extensions

README.md

@@ -28,14 +28,16 @@ JAORM is divided in modules that are used from main module using **Java SPI**
   - MySql
   - MS SQL Server
   - PostgreSQL
+  - DB2
 - Validation
 - Extensions
   - ANSI SQL Build Extensions
-  - Dependency Injection Extensions
+  - Framework and Dependency Injection Extensions
     - Micronaut Extension
     - Jakarta CDI Extension
     - Javax CDI Extension
     - Spring DI Extension
+    - Quarkus Extension
 
 ## Features
 
@@ -48,7 +50,7 @@ JAORM is divided in modules that are used from main module using **Java SPI**
 - Supports for most of famous RDBMS
 - Supports for **@Getter**, **@Setter** and **@Data** Annotations of [Lombok](https://projectlombok.org/) on Entity
 - Supports for [JSR 380](https://beanvalidation.org/2.0-jsr380/) Validation on Entity during Persist/Update
-- Supports for DI with JavaEE, JakartaEE, Micronaut and Spring
+- Supports for DI with JavaEE, JakartaEE, Micronaut, Quarkus and Spring
 
 ## Use
 

jaorm-bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jaorm-pom</artifactId>
         <groupId>io.github.ulisse1996</groupId>
-        <version>2.0.0-RC2</version>
+        <version>2.0.0-RC3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

jaorm-cache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jaorm-pom</artifactId>
         <groupId>io.github.ulisse1996</groupId>
-        <version>2.0.0-RC2</version>
+        <version>2.0.0-RC3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jaorm-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jaorm-pom</artifactId>
         <groupId>io.github.ulisse1996</groupId>
-        <version>2.0.0-RC2</version>
+        <version>2.0.0-RC3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jaorm-core/src/main/java/io/github/ulisse1996/jaorm/Arguments.java

@@ -14,6 +14,10 @@ public abstract class Arguments {
     public abstract boolean equals(Object o);
     public abstract int hashCode();
 
+    public Stream<Object> stream() {
+        return Stream.of(getValues());
+    }
+
     public static Arguments of(Object... values) {
         return values(values);
     }

jaorm-core/src/main/java/io/github/ulisse1996/jaorm/BaseDao.java

@@ -4,10 +4,7 @@
 import io.github.ulisse1996.jaorm.entity.Page;
 import io.github.ulisse1996.jaorm.entity.Result;
 import io.github.ulisse1996.jaorm.entity.event.*;
-import io.github.ulisse1996.jaorm.entity.relationship.EntityEvent;
-import io.github.ulisse1996.jaorm.entity.relationship.EntityEventType;
-import io.github.ulisse1996.jaorm.entity.relationship.Relationship;
-import io.github.ulisse1996.jaorm.entity.relationship.UpdateEvent;
+import io.github.ulisse1996.jaorm.entity.relationship.*;
 import io.github.ulisse1996.jaorm.entity.sql.SqlAccessor;
 import io.github.ulisse1996.jaorm.entity.sql.SqlParameter;
 import io.github.ulisse1996.jaorm.entity.validation.ValidationResult;
@@ -74,28 +71,32 @@ default R update(R entity) {
                     .apply(entity);
             checkUpsert(entity);
         } else {
-            if (entity instanceof PreUpdate) {
-                try {
-                    ((PreUpdate<?>) entity).preUpdate();
-                } catch (Exception ex) {
-                    throw new UpdateEventException(ex);
-                }
-            }
-            ListenersService.getInstance().fireEvent(entity, GlobalEventType.PRE_UPDATE);
-            UpdateEvent.updateEntity(entity);
-            checkUpsert(entity);
-            if (entity instanceof PostUpdate) {
-                try {
-                    ((PostUpdate<?>) entity).postUpdate();
-                } catch (Exception ex) {
-                    throw new UpdateEventException(ex);
-                }
-            }
+            handleSimpleUpdate(entity);
         }
         ListenersService.getInstance().fireEvent(entity, GlobalEventType.POST_UPDATE);
         return entity;
     }
 
+    default void handleSimpleUpdate(R entity) {
+        if (entity instanceof PreUpdate) {
+            try {
+                ((PreUpdate<?>) entity).preUpdate();
+            } catch (Exception ex) {
+                throw new UpdateEventException(ex);
+            }
+        }
+        ListenersService.getInstance().fireEvent(entity, GlobalEventType.PRE_UPDATE);
+        UpdateEvent.updateEntity(entity);
+        checkUpsert(entity);
+        if (entity instanceof PostUpdate) {
+            try {
+                ((PostUpdate<?>) entity).postUpdate();
+            } catch (Exception ex) {
+                throw new UpdateEventException(ex);
+            }
+        }
+    }
+
     default void checkUpsert(R entity) {
         if (FeatureConfigurator.getInstance().isInsertAfterFailedUpdateEnabled()) {
             // We check for updated row for upsert
@@ -106,6 +107,37 @@ default void checkUpsert(R entity) {
         }
     }
 
+    default R merge(R entity) {
+        Objects.requireNonNull(entity);
+        doValidation(entity);
+        RelationshipService relationshipService = RelationshipService.getInstance();
+        if (relationshipService.isEventActive(entity.getClass(), EntityEventType.MERGE)) {
+            ListenersService.getInstance().fireEvent(entity, GlobalEventType.PRE_MERGE);
+            EntityEvent.forType(EntityEventType.MERGE)
+                    .apply(entity);
+        } else {
+            if (entity instanceof PreMerge) {
+                try {
+                    ((PreMerge<?>) entity).preMerge();
+                } catch (Exception ex) {
+                    throw new UpdateEventException(ex);
+                }
+            }
+            ListenersService.getInstance().fireEvent(entity, GlobalEventType.PRE_MERGE);
+            MergeEvent.mergeEntity(entity);
+            checkUpsert(entity);
+            if (entity instanceof PostMerge) {
+                try {
+                    ((PostMerge<?>) entity).postMerge();
+                } catch (Exception ex) {
+                    throw new UpdateEventException(ex);
+                }
+            }
+        }
+        ListenersService.getInstance().fireEvent(entity, GlobalEventType.POST_MERGE);
+        return entity;
+    }
+
     default R insert(R entity) {
         Objects.requireNonNull(entity);
         doValidation(entity);
@@ -164,6 +196,11 @@ default void delete(List<R> entities) {
         entities.forEach(this::delete);
     }
 
+    default List<R> merge(List<R> entities) {
+        Objects.requireNonNull(entities);
+        return entities.stream().map(this::merge).collect(Collectors.toList());
+    }
+
     default List<R> insert(List<R> entities) {
         Objects.requireNonNull(entities);
         return entities.stream()
@@ -223,19 +260,19 @@ default void applyRelationshipBatch(List<R> entities, Class<?> entityClass, Enti
                 if (node.isOpt()) {
                     results = entities.stream()
                             .map(EntityDelegate::unboxEntity)
-                            .map(node::getAsOpt)
+                            .map(i -> node.getAsOpt(i, eventType))
                             .filter(Result::isPresent)
                             .map(Result::get)
                             .collect(Collectors.toList());
                 } else if (node.isCollection()) {
                     results = entities.stream()
                             .map(EntityDelegate::unboxEntity)
-                            .flatMap(e -> Optional.ofNullable(node.getAsCollection(e)).orElse(Collections.emptyList()).stream())
+                            .flatMap(e -> Optional.ofNullable(node.getAsCollection(e, eventType)).orElse(Collections.emptyList()).stream())
                             .collect(Collectors.toList());
                 } else {
                     results = entities.stream()
                             .map(EntityDelegate::unboxEntity)
-                            .map(node::get)
+                            .map(i -> node.get(i, eventType))
                             .filter(Objects::nonNull)
                             .collect(Collectors.toList());
                 }

jaorm-core/src/main/java/io/github/ulisse1996/jaorm/annotation/CascadeType.java

@@ -7,5 +7,6 @@ public enum CascadeType {
     ALL,
     PERSIST,
     REMOVE,
-    UPDATE
+    UPDATE,
+    MERGE
 }

jaorm-core/src/main/java/io/github/ulisse1996/jaorm/entity/DirtinessTracker.java

@@ -0,0 +1,35 @@
+package io.github.ulisse1996.jaorm.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DirtinessTracker<T> {
+
+    private final EntityDelegate<T> delegate;
+    private final List<Object> removedElements;
+
+    public DirtinessTracker(EntityDelegate<T> delegate) {
+        this.delegate = delegate;
+        this.removedElements = new ArrayList<>();
+    }
+
+    public EntityDelegate<T> getDelegate() {
+        return delegate;
+    }
+
+    public void registerRemoved(Result<?> result) {
+        if (result != null && result.isPresent() && result.get() instanceof EntityDelegate) {
+            this.removedElements.add(result.get());
+        }
+    }
+
+    public void registerRemoved(Object element) {
+        if (element instanceof EntityDelegate) {
+            this.removedElements.add(element);
+        }
+    }
+
+    public List<Object> getRemovedElements() {
+        return removedElements;
+    }
+}

jaorm-core/src/main/java/io/github/ulisse1996/jaorm/entity/EntityDelegate.java

@@ -1,5 +1,7 @@
 package io.github.ulisse1996.jaorm.entity;
 
+import io.github.ulisse1996.jaorm.entity.relationship.LazyEntityInfo;
+import io.github.ulisse1996.jaorm.entity.relationship.RelationshipManager;
 import io.github.ulisse1996.jaorm.schema.TableInfo;
 
 import java.sql.ResultSet;
@@ -17,6 +19,15 @@ static <R> R unboxEntity(R e) {
         return e;
     }
 
+    @SuppressWarnings("unchecked")
+    static <R> EntityDelegate<R> unwrap(R e) {
+        if (e instanceof EntityDelegate<?>) {
+            return (EntityDelegate<R>) e;
+        } else {
+            throw new UnsupportedOperationException(String.format("%s is not an EntityDelegate", e != null ? e.getClass().getName() : "null"));
+        }
+    }
+
     EntityDelegate<T> generateDelegate();
     Supplier<T> getEntityInstance();
     EntityMapper<T> getEntityMapper();
@@ -33,9 +44,15 @@ static <R> R unboxEntity(R e) {
     String getUpdateSql();
     String getDeleteSql();
     boolean isModified();
+    void setModified(boolean modified);
     boolean isDefaultGeneration();
     T initDefault(T entity);
     TableInfo toTableInfo();
+    DirtinessTracker<T> getTracker();
+    boolean isLazyEntity();
+    LazyEntityInfo getLazyInfo();
+    void setLazyInfo(LazyEntityInfo info);
+    RelationshipManager<T> getRelationshipManager();
     default void setAutoGenerated(Map<String, Object> generated) {
         if (!generated.isEmpty()) {
             EntityMapper<T> mapper = getEntityMapper();