From e73b28b4aa5fe6808bf4ddda2fd9f55d081149aa Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Tue, 26 Nov 2024 10:50:37 -0500 Subject: [PATCH] switch to @EJB(name = AppManagedVehicleBean style injection of appclient vehicle bean Signed-off-by: Scott Marlow --- .../appmanaged/AppManagedVehicleRunner.java | 42 ++++++++----------- .../AppManagedNoTxVehicleRunner.java | 23 +++++----- .../stateful3/Stateful3VehicleRunner.java | 14 ++++--- .../stateless3/Stateless3VehicleRunner.java | 26 ++++-------- 4 files changed, 44 insertions(+), 61 deletions(-) diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/AppManagedVehicleRunner.java b/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/AppManagedVehicleRunner.java index 23716c987d..a9669b3c86 100644 --- a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/AppManagedVehicleRunner.java +++ b/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/AppManagedVehicleRunner.java @@ -23,39 +23,31 @@ import java.util.Properties; import com.sun.ts.lib.harness.Status; -import com.sun.ts.lib.util.TSNamingContext; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.common.vehicle.VehicleRunnable; -import javax.naming.InitialContext; -import javax.naming.NameClassPair; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; +import jakarta.ejb.EJB; public class AppManagedVehicleRunner implements VehicleRunnable { - public static final String APPMANAGED_REF_NAME = "java:comp/env/ejb/AppManagedVehicleBean"; + @EJB(name = "AppManagedVehicleBean") + static AppManagedVehicleIF bean; + static { + if (bean == null) { + throw new IllegalStateException("AppManagedVehicleRunner could not inject the @EJB AppManagedVehicleBean"); + } + } public Status run(String[] args, Properties props) { Status sTestStatus = null; try { - AppManagedVehicleIF bean=null; - try { - TSNamingContext jc = new TSNamingContext(); - bean = (AppManagedVehicleIF) jc.lookup(APPMANAGED_REF_NAME); - } catch (Exception e) { - e.printStackTrace(); - TSNamingContext.dumpJndi("", new InitialContext()); - throw e; - } - TestUtil.logTrace( - "application-managed JTA runner looked up vehicle: " + bean); - sTestStatus = (bean.runTest(args, props)).toStatus(); - } catch (Exception e) { - TestUtil.logErr("Test failed.", e); - sTestStatus = Status - .failed("Test run in application-managed JTA vehicle failed."); - } - return sTestStatus; + TestUtil.logTrace( + "application-managed JTA runner injected vehicle: " + bean); + sTestStatus = (bean.runTest(args, props)).toStatus(); + } catch (Exception e) { + TestUtil.logErr("Test failed.", e); + sTestStatus = Status + .failed("Test run in application-managed JTA vehicle failed."); } - + return sTestStatus; } +} diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/AppManagedNoTxVehicleRunner.java b/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/AppManagedNoTxVehicleRunner.java index 81c9d90153..ce6f386d59 100644 --- a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/AppManagedNoTxVehicleRunner.java +++ b/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/AppManagedNoTxVehicleRunner.java @@ -23,27 +23,24 @@ import java.util.Properties; import com.sun.ts.lib.harness.Status; -import com.sun.ts.lib.util.TSNamingContext; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.common.vehicle.VehicleRunnable; - -import javax.naming.InitialContext; +import jakarta.ejb.EJB; public class AppManagedNoTxVehicleRunner implements VehicleRunnable { - public static final String APPMANAGEDNOTX_REF_NAME = "java:comp/env/ejb/AppManagedNoTxVehicleBean"; + + @EJB(name = "AppManagedNoTxVehicleBean") + static AppManagedNoTxVehicleIF bean; + static { + if (bean == null) { + throw new IllegalStateException("AppManagedNoTxVehicleRunner could not inject the @EJB AppManagedNoTxVehicleBean"); + } + } public Status run(String[] args, Properties props) { Status sTestStatus = null; try { - TSNamingContext jc = new TSNamingContext(); - AppManagedNoTxVehicleIF bean = null; - try { - bean = (AppManagedNoTxVehicleIF) jc.lookup(APPMANAGEDNOTX_REF_NAME); - } catch (Exception e) { - e.printStackTrace(); - TSNamingContext.dumpJndi("", new InitialContext()); - throw e; - } + TestUtil.logTrace( "application-managed resource-local runner looked up vehicle: " + bean); diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/Stateful3VehicleRunner.java b/common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/Stateful3VehicleRunner.java index d5763129a1..23ecf7ddb1 100644 --- a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/Stateful3VehicleRunner.java +++ b/common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/Stateful3VehicleRunner.java @@ -23,19 +23,23 @@ import java.util.Properties; import com.sun.ts.lib.harness.Status; -import com.sun.ts.lib.util.TSNamingContext; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.common.vehicle.VehicleRunnable; +import jakarta.ejb.EJB; public class Stateful3VehicleRunner implements VehicleRunnable { - public static final String STATEFUL3_REF_NAME = "java:comp/env/ejb/Stateful3VehicleBean"; + + @EJB(name = "Stateful3VehicleBean") + static Stateful3VehicleIF bean = null; + static { + if (bean == null) { + throw new IllegalStateException("Stateful3VehicleRunner could not inject the @EJB Stateful3VehicleBean"); + } + } public Status run(String[] args, Properties props) { Status sTestStatus = null; try { - TSNamingContext jc = new TSNamingContext(); - Stateful3VehicleIF bean = (Stateful3VehicleIF) jc - .lookup(STATEFUL3_REF_NAME); TestUtil.logTrace("stateful3 runner looked up vehicle: " + bean); sTestStatus = (bean.runTest(args, props)).toStatus(); } catch (Exception e) { diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/Stateless3VehicleRunner.java b/common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/Stateless3VehicleRunner.java index 244519f3b2..f7448f891d 100644 --- a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/Stateless3VehicleRunner.java +++ b/common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/Stateless3VehicleRunner.java @@ -23,33 +23,23 @@ import java.util.Properties; import com.sun.ts.lib.harness.Status; -import com.sun.ts.lib.util.TSNamingContext; import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.common.vehicle.VehicleRunnable; - -import javax.naming.InitialContext; -import javax.naming.NamingException; +import jakarta.ejb.EJB; public class Stateless3VehicleRunner implements VehicleRunnable { - public static final String STATELESS3_REF_NAME = "java:comp/env/ejb/Stateless3VehicleBean"; + @EJB(name = "StatelessVehicleBean") + static Stateless3VehicleIF bean = null; + static { + if (bean == null) { + throw new IllegalStateException("Stateless3VehicleRunner could not inject the @EJB StatelessVehicleBean"); + } + } public Status run(String[] args, Properties props) { Status sTestStatus = null; - Class beanType = Stateless3VehicleIF.class; - String refName = beanType.getName(); try { - TSNamingContext jc = new TSNamingContext(); - Stateless3VehicleIF bean = null; - try { - bean = (Stateless3VehicleIF) jc.lookup(STATELESS3_REF_NAME); - } catch (NamingException e) { - - TestUtil.logErr("NamingException looking up vehicle: " + refName, e); - TestUtil.logErr("TSNamingContext.CS: " + TSNamingContext.class.getProtectionDomain().getCodeSource()); - TSNamingContext.dumpJndi("", new InitialContext()); - throw e; - } TestUtil.logTrace("stateless3 runner looked up vehicle: " + bean); props.put("persistence.unit.name", "CTS-EM"); sTestStatus = (bean.runTest(args, props)).toStatus();