HHH-18964 rename SunOneJtaPlatform to GlassFishJtaPlatform

hibernate · Jan 11, 2025 · 4fc57c0 · 4fc57c0
1 parent 5c553a9
commit 4fc57c0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/...c/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java b/...c/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java
@@ -10,7 +10,7 @@
 import org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform;
-import org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
@@ -38,7 +38,7 @@ public Class<? extends JtaPlatform> resolve(final String name) {
 				case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class;
 				case "Atomikos" -> AtomikosJtaPlatform.class;
 				case "Resin" -> ResinJtaPlatform.class;
-				case "SunOne" -> SunOneJtaPlatform.class;
+				case "GlassFish", "Payara", "SunOne" -> GlassFishJtaPlatform.class;
 				default -> null;
 			};
 		}

diff --git a/.../platform/internal/SunOneJtaPlatform.java → ...atform/internal/GlassFishJtaPlatform.java b/.../platform/internal/SunOneJtaPlatform.java → ...atform/internal/GlassFishJtaPlatform.java
@@ -15,7 +15,7 @@
  * @author Emmanuel Bernard
  * @author Steve Ebersole
  */
-public class SunOneJtaPlatform extends AbstractJtaPlatform {
+public class GlassFishJtaPlatform extends AbstractJtaPlatform {
 	public static final String TM_NAME = "java:appserver/TransactionManager";
 	public static final String UT_NAME = "java:comp/UserTransaction";
 

diff --git a/...-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java b/...-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java
@@ -9,7 +9,7 @@
 import org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform;
-import org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
@@ -62,11 +62,25 @@ public void verifyAllJtaPlatformResolve() {
 
 		testJtaPlatformResolves(
 				strategySelector,
-				SunOneJtaPlatform.class,
+				GlassFishJtaPlatform.class,
 				"SunOne",
 				"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
 		);
 
+		testJtaPlatformResolves(
+				strategySelector,
+				GlassFishJtaPlatform.class,
+				"GlassFish",
+				"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
+		);
+
+		testJtaPlatformResolves(
+				strategySelector,
+				GlassFishJtaPlatform.class,
+				"Payara",
+				"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
+		);
+
 		testJtaPlatformResolves(
 				strategySelector,
 				WeblogicJtaPlatform.class,