chore: merge release-1.x into dev-1.x [skip ci]

github-actions[bot] · github-actions[bot] · commit 1b7667e344b3 · 2026-05-22T15:32:11.000Z
diff --git a/.github/workflows/maven-build-java11+.yml b/.github/workflows/maven-build-java11+.yml
@@ -0,0 +1,53 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Maven Build (Java 11+)
+
+permissions:
+  contents: read
+
+on:
+  push:
+    branches: [ 'dev-1.x' ]
+  pull_request:
+    branches: [ 'dev-1.x' , 'release-1.x' ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '11' , '17' , '21' , '25' ]
+        maven-profile-spring-cloud: [ 'spring-cloud-hoxton' , 'spring-cloud-2020' , 'spring-cloud-2021' ]
+        maven-hibernate: [ 'hibernate-5.6' , 'hibernate-5.5' , 'hibernate-5.4' , 'hibernate-5.3' ]
+
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v5
+
+      - name: Setup Java ${{ matrix.java }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn
+          --batch-mode
+          --update-snapshots
+          --file pom.xml
+          -Drevision=0.0.1-SNAPSHOT
+          test
+          --activate-profiles test,coverage,${{ matrix.maven-profile-spring-cloud }},${{ matrix.maven-hibernate }}
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: microsphere-projects/microsphere-hibernate
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' , '17' , '21' , '25' ]
+        java: [ '8' ]
         maven-profile-spring-cloud: [ 'spring-cloud-hoxton' , 'spring-cloud-2020' , 'spring-cloud-2021' ]
         maven-hibernate: [ 'hibernate-5.6' , 'hibernate-5.5' , 'hibernate-5.4' , 'hibernate-5.3' ,
                            'hibernate-5.2' , 'hibernate-5.1' , 'hibernate-5.0' ]
@@ -45,7 +45,7 @@ jobs:
           --file pom.xml
           -Drevision=0.0.1-SNAPSHOT
           test
-          --activate-profiles test,coverage,${{ matrix.maven-profile-spring-cloud }}
+          --activate-profiles test,coverage,${{ matrix.maven-profile-spring-cloud }},${{ matrix.maven-hibernate }}
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
diff --git a/README.md b/README.md
@@ -44,8 +44,8 @@ pom.xml:
 
 | **Branches** | **Purpose**                                      | **Latest Version** |
 |--------------|--------------------------------------------------|--------------------|
-| **main**     | Compatible with Spring Cloud 2022.0.x - 2025.0.x | 0.2.1              |
-| **1.x**      | Compatible with Spring Cloud Hoxton - 2021.0.x   | 0.1.1              |
+| **main**     | Compatible with Spring Cloud 2022.0.x - 2025.0.x | 0.2.2              |
+| **1.x**      | Compatible with Spring Cloud Hoxton - 2021.0.x   | 0.1.2              |
 
 ### Compatibility
 
diff --git a/microsphere-hibernate-core/pom.xml b/microsphere-hibernate-core/pom.xml
@@ -84,4 +84,20 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>java9+</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/DelegatingInterceptor.java b/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/DelegatingInterceptor.java
@@ -59,7 +59,7 @@ public class DelegatingInterceptor implements Interceptor, DelegatingWrapper {
 
     /**
      * Creates a new {@link DelegatingInterceptor} wrapping the given delegate.
-     * If {@code delegate} is {@code null}, {@link org.hibernate.internal.EmptyInterceptor#INSTANCE} is used.
+     * If {@code delegate} is {@code null}, {@link org.hibernate.EmptyInterceptor#INSTANCE} is used.
      *
      * @param delegate the {@link Interceptor} to delegate to, or {@code null} for the empty interceptor
      */
diff --git a/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/entity/CompositeEntityCallback.java b/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/entity/CompositeEntityCallback.java
@@ -61,8 +61,8 @@ public CompositeEntityCallback(List<EntityCallback> callbacks) {
     }
 
     @Override
-    public void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch, Object result, Boolean readOnly, LoadEventListener.LoadType loadType) {
-        forEach(this.callbacks, callback -> callback.onLoad(id, entityClassName, entity, lockMode, isAssociationFetch, result, readOnly, loadType));
+    public void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch, Object result, LoadEventListener.LoadType loadType) {
+        forEach(this.callbacks, callback -> callback.onLoad(id, entityClassName, entity, lockMode, isAssociationFetch, result, loadType));
     }
 
     @Override
diff --git a/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/entity/EntityCallback.java b/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/entity/EntityCallback.java
@@ -122,12 +122,11 @@ public interface EntityCallback {
      * @param lockMode           {@link LockMode}
      * @param isAssociationFetch
      * @param result
-     * @param readOnly
      * @param loadType
      * @see Session#find(Class, Object)
      * @see LoadEventListener
      */
-    default void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch, Object result, Boolean readOnly, LoadType loadType) {
+    default void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch, Object result, LoadType loadType) {
     }
 
     /**
diff --git a/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/entity/EntityCallbackListener.java b/microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/entity/EntityCallbackListener.java
@@ -159,7 +159,7 @@ class EntityCallbackListener implements LoadEventListener, PersistEventListener,
     @Override
     public void onLoad(LoadEvent event, LoadType loadType) throws HibernateException {
         this.callback.onLoad(event.getEntityId(), event.getEntityClassName(), event.getInstanceToLoad(),
-                getLockMode(event.getLockOptions()), event.isAssociationFetch(), event.getResult(), event.getReadOnly(), loadType);
+                getLockMode(event.getLockOptions()), event.isAssociationFetch(), event.getResult(), loadType);
     }
 
     @Override
@@ -360,9 +360,8 @@ public boolean requiresPostCommitHanding(EntityPersister persister) {
         return false;
     }
 
-    @Override
     public boolean requiresPostCommitHandling(EntityPersister persister) {
-        return PostDeleteEventListener.super.requiresPostCommitHandling(persister);
+        return false;
     }
 
     /**
diff --git a/microsphere-hibernate-core/src/test/java/io/microsphere/hibernate/entity/TestEntityCallback.java b/microsphere-hibernate-core/src/test/java/io/microsphere/hibernate/entity/TestEntityCallback.java
@@ -38,10 +38,10 @@ public class TestEntityCallback implements EntityCallback {
 
     @Override
     public void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch,
-                       Object result, Boolean readOnly, LoadEventListener.LoadType loadType) {
-        logger.trace("onLoad - id : {}, entityClassName : {}, entity : {}, lockMode : {}, isAssociationFetch : {}, result : {}, readOnly : {}, loadType : {}",
-                id, entityClassName, entity, lockMode, isAssociationFetch, result, readOnly, loadType);
-        EntityCallback.super.onLoad(id, entityClassName, entity, lockMode, isAssociationFetch, result, readOnly, loadType);
+                       Object result, LoadEventListener.LoadType loadType) {
+        logger.trace("onLoad - id : {}, entityClassName : {}, entity : {}, lockMode : {}, isAssociationFetch : {}, result : {}, loadType : {}",
+                id, entityClassName, entity, lockMode, isAssociationFetch, result, loadType);
+        EntityCallback.super.onLoad(id, entityClassName, entity, lockMode, isAssociationFetch, result, loadType);
     }
 
     @Override
diff --git a/microsphere-hibernate-test/pom.xml b/microsphere-hibernate-test/pom.xml
@@ -83,4 +83,20 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>java9+</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/microsphere-hibernate-test/src/main/java/io/microsphere/hibernate/test/AbstractHibernateH2Test.java b/microsphere-hibernate-test/src/main/java/io/microsphere/hibernate/test/AbstractHibernateH2Test.java
@@ -185,24 +185,22 @@ void testPersistAndMerge() {
         }
 
         @Test
-        @DisplayName("Test : persist & remove")
-        void testPersistAndRemove() {
+        @DisplayName("Test : persist & delete")
+        void testPersistAndDelete() {
             doInTransaction(() -> {
                 session.persist(user);
 
                 UserProfile profile = user.getProfile();
                 user.setProfile(null);
-                session.remove(profile);
+                session.delete(profile);
                 session.flush();
 
                 List<Order> orders = user.getOrders();
-                orders.forEach(order -> {
-                    session.remove(order);
-                });
+                orders.forEach(order -> session.delete(order));
                 orders.clear();
                 session.flush();
 
-                session.remove(user);
+                session.delete(user);
             });
         }
 
@@ -224,15 +222,6 @@ void testPersistAndFlush() {
             });
         }
 
-        @Test
-        @DisplayName("Test : persist & detach")
-        void testPersistAndDetach() {
-            doInAction(() -> {
-                session.persist(user);
-                session.detach(user);
-            });
-        }
-
         @Test
         @DisplayName("Test : persist & evict")
         void testPersistAndEvict() {
@@ -266,7 +255,7 @@ void testPersistAndRefresh() {
         void testPersistAndLoad() {
             doInTransaction(() -> {
                 session.persist(user);
-                User user1 = session.find(User.class, user.getId());
+                User user1 = session.load(User.class, user.getId());
                 assertEquals(user, user1);
             });
         }
@@ -276,7 +265,7 @@ void testPersistAndLoad() {
         void testPersistAndGetManagedEntities() {
             doInTransaction(() -> {
                 session.persist(user);
-                List<User> users = session.createQuery("FROM User", User.class).getResultList();
+                List<User> users = session.createQuery("FROM io.microsphere.hibernate.test.entity.User").list();
                 assertFalse(users.isEmpty());
             });
         }
diff --git a/microsphere-hibernate-test/src/main/java/io/microsphere/hibernate/test/HibernateExtension.java b/microsphere-hibernate-test/src/main/java/io/microsphere/hibernate/test/HibernateExtension.java
@@ -152,7 +152,7 @@ public void afterEach(ExtensionContext context) {
         StatelessSession statelessSession = store.remove(STATELESS_SESSION_KEY, StatelessSession.class);
         Session session = store.remove(SESSION_KEY, Session.class);
 
-        if (statelessSession != null && statelessSession.isOpen()) {
+        if (statelessSession != null) {
             try {
                 statelessSession.close();
             } catch (Exception e) {
@@ -322,11 +322,11 @@ private void injectInstanceFields(Object testInstance, Configuration configurati
     /**
      * Resolve the Hibernate component to inject for the given {@code type}.
      *
-     * @param type              the requested type
-     * @param configuration     the current Configuration (may be {@code null} for static context)
-     * @param sessionFactory    the current SessionFactory (may be {@code null} for static context)
-     * @param session           the current Session ({@code null} in static context)
-     * @param statelessSession  the current StatelessSession ({@code null} in static context)
+     * @param type             the requested type
+     * @param configuration    the current Configuration (may be {@code null} for static context)
+     * @param sessionFactory   the current SessionFactory (may be {@code null} for static context)
+     * @param session          the current Session ({@code null} in static context)
+     * @param statelessSession the current StatelessSession ({@code null} in static context)
      * @return the resolved component, or {@code null} if not applicable
      */
     private Object resolveValueForType(Class<?> type, Configuration configuration,
diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
     </scm>
 
     <properties>
-        <revision>0.1.2-SNAPSHOT</revision>
+        <revision>0.1.3-SNAPSHOT</revision>
     </properties>
 
     <modules>
diff --git a/release-notes.md b/release-notes.md
@@ -59,4 +59,32 @@ Thank you for using version 0.1.0! Stay tuned for future updates.
 
 ---
 
-**Full Changelog**: https://github.com/microsphere-projects/microsphere-hibernate/compare/0.1.0...0.1.1
+**Full Changelog**: https://github.com/microsphere-projects/microsphere-hibernate/compare/0.1.0...0.1.1## v0.1.2
+
+# Release Notes - Version 0.1.2
+
+## Build and Workflow Enhancements
+- Added Maven CI workflow for Java 11+. [(#27a7d54)](https://github.com/mercyblitz/dev-1.x/commit/27a7d54)
+- Restricted CI for Java 8 and activated Hibernate profile in CI. [(#b5237a0, #7cf553b)](https://github.com/mercyblitz/dev-1.x/commits/dev-1.x)
+
+## Dependency Updates
+- Added `java9+` profile with `jaxb-api` to Maven POMs. [(#80a1278)](https://github.com/mercyblitz/dev-1.x/commit/80a1278)
+- Bumped Hibernate versions in the build. [(#7cf553b)](https://github.com/mercyblitz/dev-1.x/commit/7cf553b)
+
+## Test Improvements
+- Removed redundant `persist` and `FROM User` tests. [(#6cba8b5)](https://github.com/mercyblitz/dev-1.x/commit/6cba8b5)
+- Adjusted tests; removed `readOnly` from `onLoad` callback. [(#8b6a4f7)](https://github.com/mercyblitz/dev-1.x/commit/8b6a4f7)
+- Added Hibernate H2 tests. [(#b5237a0)](https://github.com/mercyblitz/dev-1.x/commit/b5237a0)
+
+## Documentation
+- Updated Javadoc to reference public `EmptyInterceptor`. [(#f439210)](https://github.com/mercyblitz/dev-1.x/commit/f439210)
+
+## Other Changes
+- Performed routine merges to keep branches up to date with upstream. [(#0c7c434, #313453f, #1cfceda)]  
+- Version bumped to `0.1.2` for patch release. [(#6b17122)](https://github.com/mercyblitz/dev-1.x/commit/6b17122)
+
+---
+
+**Full Changelog:** [0.1.1...0.1.2](https://github.com/mercyblitz/dev-1.x/compare/0.1.1...0.1.2)
+
+**Full Changelog**: https://github.com/microsphere-projects/microsphere-hibernate/compare/0.1.1...0.1.2

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public class DelegatingInterceptor implements Interceptor, DelegatingWrapper {`
`59`	`59`
`60`	`60`	`/**`
`61`	`61`	`* Creates a new {@link DelegatingInterceptor} wrapping the given delegate.`
`62`		`- * If {@code delegate} is {@code null}, {@link org.hibernate.internal.EmptyInterceptor#INSTANCE} is used.`
	`62`	`+ * If {@code delegate} is {@code null}, {@link org.hibernate.EmptyInterceptor#INSTANCE} is used.`
`63`	`63`	`*`
`64`	`64`	`* @param delegate the {@link Interceptor} to delegate to, or {@code null} for the empty interceptor`
`65`	`65`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ public CompositeEntityCallback(List<EntityCallback> callbacks) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`64`		`- public void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch, Object result, Boolean readOnly, LoadEventListener.LoadType loadType) {`
`65`		`- forEach(this.callbacks, callback -> callback.onLoad(id, entityClassName, entity, lockMode, isAssociationFetch, result, readOnly, loadType));`
	`64`	`+ public void onLoad(Object id, String entityClassName, Object entity, LockMode lockMode, boolean isAssociationFetch, Object result, LoadEventListener.LoadType loadType) {`
	`65`	`+ forEach(this.callbacks, callback -> callback.onLoad(id, entityClassName, entity, lockMode, isAssociationFetch, result, loadType));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ class EntityCallbackListener implements LoadEventListener, PersistEventListener,`
`159`	`159`	`@Override`
`160`	`160`	`public void onLoad(LoadEvent event, LoadType loadType) throws HibernateException {`
`161`	`161`	`this.callback.onLoad(event.getEntityId(), event.getEntityClassName(), event.getInstanceToLoad(),`
`162`		`- getLockMode(event.getLockOptions()), event.isAssociationFetch(), event.getResult(), event.getReadOnly(), loadType);`
	`162`	`+ getLockMode(event.getLockOptions()), event.isAssociationFetch(), event.getResult(), loadType);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`@Override`
`@@ -360,9 +360,8 @@ public boolean requiresPostCommitHanding(EntityPersister persister) {`
`360`	`360`	`return false;`
`361`	`361`	`}`
`362`	`362`
`363`		`- @Override`
`364`	`363`	`public boolean requiresPostCommitHandling(EntityPersister persister) {`
`365`		`- return PostDeleteEventListener.super.requiresPostCommitHandling(persister);`
	`364`	`+ return false;`
`366`	`365`	`}`
`367`	`366`
`368`	`367`	`/**`