This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch tomee-10.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f70ac1be87aa975e48c6d95ecf9dfd417e09d287 Author: Martin Wiesner <[email protected]> AuthorDate: Sun Mar 1 19:30:06 2026 +0100 Remove unnecessary boxing and unboxing (cherry picked from commit dbd45d18bb0de684a0fa8ecf6a0747d32211cd43) --- .../apache/openejb/util/proxy/ClassDefiner.java | 2 +- .../apache/openejb/test/beans/EmployeeBean.java | 10 ++++----- .../test/entity/bmp/AllowedOperationsBmpBean.java | 4 ++-- .../test/entity/bmp/BasicBmp2DataSourcesBean.java | 8 +++---- .../openejb/test/entity/bmp/BasicBmpBean.java | 6 ++--- .../test/entity/bmp/ContextLookupBmpBean.java | 18 +++++++-------- .../apache/openejb/test/entity/bmp/EncBmpBean.java | 18 +++++++-------- .../openejb/test/entity/bmp/RmiIiopBmpBean.java | 4 ++-- .../test/entity/cmp/ContextLookupCmpBean.java | 14 ++++++------ .../openejb/test/entity/cmp/EncCmp2Bean.java | 14 ++++++------ .../apache/openejb/test/entity/cmp/EncCmpBean.java | 14 ++++++------ .../AnnotatedFieldInjectionSingletonBean.java | 14 ++++++------ .../test/singleton/BeanTxSingletonBean.java | 2 +- .../test/singleton/ContextLookupSingletonBean.java | 14 ++++++------ .../singleton/ContextLookupSingletonPojoBean.java | 14 ++++++------ .../openejb/test/singleton/EncSingletonBean.java | 14 ++++++------ .../singleton/FieldInjectionSingletonBean.java | 14 ++++++------ .../singleton/SetterInjectionSingletonBean.java | 14 ++++++------ .../AnnotatedFieldInjectionStatefulBean.java | 14 ++++++------ .../openejb/test/stateful/BeanTxStatefulBean.java | 2 +- .../test/stateful/ContextLookupStatefulBean.java | 14 ++++++------ .../stateful/ContextLookupStatefulPojoBean.java | 14 ++++++------ .../openejb/test/stateful/EncStatefulBean.java | 14 ++++++------ .../test/stateful/FieldInjectionStatefulBean.java | 14 ++++++------ .../test/stateful/SetterInjectionStatefulBean.java | 14 ++++++------ .../AnnotatedFieldInjectionStatelessBean.java | 14 ++++++------ .../test/stateless/BeanTxStatelessBean.java | 2 +- .../test/stateless/ContextLookupStatelessBean.java | 14 ++++++------ .../stateless/ContextLookupStatelessPojoBean.java | 14 ++++++------ .../openejb/test/stateless/EncStatelessBean.java | 14 ++++++------ .../stateless/FieldInjectionStatelessBean.java | 14 ++++++------ .../stateless/SetterInjectionStatelessBean.java | 14 ++++++------ .../openejb/test/entity/bmp/BmpRmiIiopTests.java | 8 +++---- .../openejb/test/entity/cmp/CmpRmiIiopTests.java | 8 +++---- .../openejb/test/entity/cmp2/Cmp2RmiIiopTests.java | 8 +++---- .../openejb/test/entity/cmr/CmrMappingTests.java | 8 +++---- .../test/entity/cmr/OneToManyComplexPkTests.java | 26 +++++++++++----------- .../openejb/test/entity/cmr/OneToManyTests.java | 26 +++++++++++----------- .../test/entity/cmr/OneToOneComplexPkTests.java | 2 +- .../openejb/test/entity/cmr/OneToOneTests.java | 2 +- .../SingletonLocalBusinessIntfcTests.java | 2 +- .../SingletonRemoteBusinessIntfcTests.java | 2 +- .../test/singleton/SingletonRmiIiopTests.java | 8 +++---- .../stateful/StatefulLocalBusinessIntfcTests.java | 2 +- .../stateful/StatefulRemoteBusinessIntfcTests.java | 2 +- .../test/stateful/StatefulRmiIiopTests.java | 8 +++---- .../StatelessLocalBusinessIntfcTests.java | 2 +- .../StatelessRemoteBusinessIntfcTests.java | 2 +- .../test/stateless/StatelessRmiIiopTests.java | 8 +++---- .../jwt/principal/JWTCallerPrincipal.java | 2 +- .../java/org/apache/openejb/client/Client.java | 4 ++-- .../server/auth/StartWithIPAddressPermission.java | 4 ++-- 52 files changed, 252 insertions(+), 252 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java index 0540c98633..33531e1eca 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java @@ -93,7 +93,7 @@ public class ClassDefiner implements DefiningClassService, InstantiatingClassSer final Class<?> originalClass, final ProtectionDomain protectionDomain) { try { return (Class<?>) CLASS_LOADER_DEFINE_CLASS.invoke( - loader, className, b, Integer.valueOf(0), Integer.valueOf(b.length), protectionDomain); + loader, className, b, 0, b.length, protectionDomain); } catch (final Exception e) { throw e instanceof RuntimeException ? ((RuntimeException) e) : new RuntimeException(e); } diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java index c71271e2c4..854b5d0e59 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java @@ -48,7 +48,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean { try { final PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?"); try { - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); final ResultSet rs = stmt.executeQuery(); found = rs.next(); } finally { @@ -85,7 +85,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean { final ResultSet rs = stmt.executeQuery("select EmployeeID from Employees"); keys = new java.util.Vector(); while (rs.next()) { - keys.addElement(new Integer(rs.getInt("EmployeeID"))); + keys.addElement(rs.getInt("EmployeeID")); } } finally { stmt.close(); @@ -132,7 +132,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean { con.close(); } - return new Integer(id); + return id; } catch (final Exception e) { e.printStackTrace(); @@ -167,7 +167,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean { final PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?"); try { final Integer primaryKey = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); final ResultSet rs = stmt.executeQuery(); while (rs.next()) { lastName = rs.getString("LastName"); @@ -232,7 +232,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean { final PreparedStatement stmt = con.prepareStatement("delete from Employees where EmployeeID = ?"); try { final Integer primaryKey = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); stmt.executeUpdate(); } finally { stmt.close(); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java index 8eec80e0bb..e399491525 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java @@ -80,7 +80,7 @@ public class AllowedOperationsBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbFindByPrimaryKey(final Integer primaryKey) { testAllowedOperations("ejbFind"); - return new Integer(-1); + return -1; } /** @@ -89,7 +89,7 @@ public class AllowedOperationsBmpBean implements jakarta.ejb.EntityBean { public Integer ejbCreateObject(final String name) throws CreateException { testAllowedOperations("ejbCreate"); - return new Integer(-1); + return -1; } public void ejbPostCreateObject(final String name) throws CreateException { diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java index 79d3c4f481..34b36b4a08 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java @@ -89,7 +89,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean { try { final PreparedStatement stmt = con.prepareStatement("select * from entity where id = ?"); try { - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); found = stmt.executeQuery().next(); } finally { stmt.close(); @@ -172,7 +172,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean { } - return new Integer(primaryKey); + return primaryKey; } catch (final Exception e) { e.printStackTrace(); @@ -253,7 +253,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean { final PreparedStatement stmt = con.prepareStatement("select * from entity where id = ?"); try { final Integer primaryKey = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); final ResultSet rs = stmt.executeQuery(); while (rs.next()) { lastName = rs.getString("last_name"); @@ -334,7 +334,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean { final PreparedStatement stmt = con.prepareStatement("delete from entity where id = ?"); try { final Integer primaryKey = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); stmt.executeUpdate(); } finally { stmt.close(); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java index 4ecc743fa8..3dddde501b 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java @@ -109,7 +109,7 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean { try { final PreparedStatement stmt = con.prepareStatement("select * from entity where id = ?"); try { - stmt.setInt(1, primaryKey.intValue()); + stmt.setInt(1, primaryKey); found = stmt.executeQuery().next(); } finally { stmt.close(); @@ -146,7 +146,7 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean { try { stmt.setString(1, lastName); final ResultSet set = stmt.executeQuery(); - while (set.next()) keys.add(new Integer(set.getInt("id"))); + while (set.next()) keys.add(set.getInt("id")); } finally { stmt.close(); } @@ -211,7 +211,7 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean { con.close(); } - return new Integer(primaryKey); + return primaryKey; } catch (final Exception e) { e.printStackTrace(); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java index 0df85af336..75035955e7 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java @@ -77,7 +77,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbFindByPrimaryKey(final Integer primaryKey) throws jakarta.ejb.FinderException { - return new Integer(-1); + return -1; } /** @@ -90,7 +90,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbCreate(final String name) throws jakarta.ejb.CreateException { - return new Integer(-1); + return -1; } public void ejbPostCreate(final String name) @@ -226,7 +226,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ejbContext.lookup("entity/bmp/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -243,7 +243,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ejbContext.lookup("entity/bmp/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -260,7 +260,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ejbContext.lookup("entity/bmp/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -277,7 +277,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ejbContext.lookup("entity/bmp/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -294,7 +294,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ejbContext.lookup("entity/bmp/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -328,7 +328,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ejbContext.lookup("entity/bmp/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -346,7 +346,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ejbContext.lookup("entity/bmp/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java index 1e83eaafcc..716cc9a278 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java @@ -79,7 +79,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbFindByPrimaryKey(final Integer primaryKey) throws jakarta.ejb.FinderException { - return new Integer(-1); + return -1; } /** @@ -92,7 +92,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbCreate(final String name) throws jakarta.ejb.CreateException { - return new Integer(-1); + return -1; } public void ejbPostCreate(final String name) @@ -259,7 +259,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ctx.lookup("java:comp/env/entity/bmp/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -279,7 +279,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ctx.lookup("java:comp/env/entity/bmp/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -299,7 +299,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ctx.lookup("java:comp/env/entity/bmp/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -319,7 +319,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ctx.lookup("java:comp/env/entity/bmp/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -339,7 +339,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ctx.lookup("java:comp/env/entity/bmp/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -379,7 +379,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ctx.lookup("java:comp/env/entity/bmp/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -400,7 +400,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ctx.lookup("java:comp/env/entity/bmp/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java index 39388f6be1..4733e6dadc 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java @@ -62,7 +62,7 @@ public class RmiIiopBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbFindByPrimaryKey(final Integer primaryKey) throws jakarta.ejb.FinderException { - return new Integer(-1); + return -1; } /** @@ -75,7 +75,7 @@ public class RmiIiopBmpBean implements jakarta.ejb.EntityBean { */ public Integer ejbCreate(final String name) throws jakarta.ejb.CreateException { - return new Integer(-1); + return -1; } public void ejbPostCreate(final String name) diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java index 9387af8fd9..da0ba2a5f1 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java @@ -204,7 +204,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ejbContext.lookup("entity/cmp/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -221,7 +221,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ejbContext.lookup("entity/cmp/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -238,7 +238,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ejbContext.lookup("entity/cmp/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -255,7 +255,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ejbContext.lookup("entity/cmp/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -272,7 +272,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ejbContext.lookup("entity/cmp/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -306,7 +306,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ejbContext.lookup("entity/cmp/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -323,7 +323,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ejbContext.lookup("entity/cmp/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java index bb734fffd4..9ca12972be 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java @@ -239,7 +239,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ctx.lookup("java:comp/env/entity/cmp/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -259,7 +259,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ctx.lookup("java:comp/env/entity/cmp/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -279,7 +279,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ctx.lookup("java:comp/env/entity/cmp/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -299,7 +299,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ctx.lookup("java:comp/env/entity/cmp/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -319,7 +319,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ctx.lookup("java:comp/env/entity/cmp/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -359,7 +359,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ctx.lookup("java:comp/env/entity/cmp/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -379,7 +379,7 @@ public abstract class EncCmp2Bean implements EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ctx.lookup("java:comp/env/entity/cmp/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java index b20ece2013..0a098996cb 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java @@ -238,7 +238,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ctx.lookup("java:comp/env/entity/cmp/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -258,7 +258,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ctx.lookup("java:comp/env/entity/cmp/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -278,7 +278,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ctx.lookup("java:comp/env/entity/cmp/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -298,7 +298,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ctx.lookup("java:comp/env/entity/cmp/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -318,7 +318,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ctx.lookup("java:comp/env/entity/cmp/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -358,7 +358,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ctx.lookup("java:comp/env/entity/cmp/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -378,7 +378,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ctx.lookup("java:comp/env/entity/cmp/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java index f0fb0d9f8a..ac27171f90 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java @@ -187,7 +187,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); @@ -199,7 +199,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); @@ -210,7 +210,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); @@ -221,7 +221,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); @@ -233,7 +233,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); @@ -255,7 +255,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); @@ -266,7 +266,7 @@ public class AnnotatedFieldInjectionSingletonBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java index 114d02e229..b5200bbf0f 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java @@ -100,7 +100,7 @@ public class BeanTxSingletonBean implements jakarta.ejb.SessionBean { } /*[3] Commit or Rollback the transaction */ - if (rollback.booleanValue()) ut.setRollbackOnly(); + if (rollback) ut.setRollbackOnly(); /*[4] Commit or Rollback the transaction */ ut.commit(); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java index 3462ff8f3e..1b732d7817 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java @@ -202,7 +202,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ejbContext.lookup("singleton/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -219,7 +219,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ejbContext.lookup("singleton/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -236,7 +236,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ejbContext.lookup("singleton/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -253,7 +253,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ejbContext.lookup("singleton/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -270,7 +270,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ejbContext.lookup("singleton/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -304,7 +304,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ejbContext.lookup("singleton/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -321,7 +321,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ejbContext.lookup("singleton/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java index 11ff68ee2e..44eeb1617c 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java @@ -184,7 +184,7 @@ public class ContextLookupSingletonPojoBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) getSessionContext().lookup("singleton/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -201,7 +201,7 @@ public class ContextLookupSingletonPojoBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) getSessionContext().lookup("singleton/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -218,7 +218,7 @@ public class ContextLookupSingletonPojoBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) getSessionContext().lookup("singleton/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -235,7 +235,7 @@ public class ContextLookupSingletonPojoBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) getSessionContext().lookup("singleton/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -252,7 +252,7 @@ public class ContextLookupSingletonPojoBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) getSessionContext().lookup("singleton/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -286,7 +286,7 @@ public class ContextLookupSingletonPojoBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) getSessionContext().lookup("singleton/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -303,7 +303,7 @@ public class ContextLookupSingletonPojoBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) getSessionContext().lookup("singleton/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java index d00e810a50..d39f43d370 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java @@ -243,7 +243,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ctx.lookup("java:comp/env/singleton/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -263,7 +263,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ctx.lookup("java:comp/env/singleton/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -283,7 +283,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ctx.lookup("java:comp/env/singleton/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -303,7 +303,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ctx.lookup("java:comp/env/singleton/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -323,7 +323,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ctx.lookup("java:comp/env/singleton/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -363,7 +363,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ctx.lookup("java:comp/env/singleton/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -383,7 +383,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ctx.lookup("java:comp/env/singleton/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java index 59493a17c2..34021591e3 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java @@ -159,7 +159,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); @@ -171,7 +171,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); @@ -182,7 +182,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); @@ -193,7 +193,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); @@ -205,7 +205,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); @@ -227,7 +227,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); @@ -238,7 +238,7 @@ public class FieldInjectionSingletonBean implements SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java index c64adef9b2..53178e13fb 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java @@ -377,7 +377,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", dooubleField); Assert.assertEquals(expected, dooubleField); @@ -389,7 +389,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loongField); Assert.assertEquals(expected, loongField); @@ -400,7 +400,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooatField); Assert.assertEquals(expected, flooatField); @@ -411,7 +411,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteegerField); Assert.assertEquals(expected, inteegerField); @@ -423,7 +423,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoortField); Assert.assertEquals(expected, shoortField); @@ -445,7 +445,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyteField); Assert.assertEquals(expected, byyteField); @@ -456,7 +456,7 @@ public class SetterInjectionSingletonBean implements SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracterField); Assert.assertEquals(expected, chaaracterField); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java index ca9ec95a8a..b1085fbe3a 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java @@ -184,7 +184,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); @@ -196,7 +196,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); @@ -207,7 +207,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); @@ -218,7 +218,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); @@ -230,7 +230,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); @@ -252,7 +252,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); @@ -263,7 +263,7 @@ public class AnnotatedFieldInjectionStatefulBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java index 6a5d641588..8467d13161 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java @@ -123,7 +123,7 @@ public class BeanTxStatefulBean implements jakarta.ejb.SessionBean { } /*[3] Commit or Rollback the transaction */ - if (rollback.booleanValue()) ut.setRollbackOnly(); + if (rollback) ut.setRollbackOnly(); /*[4] Commit or Rollback the transaction */ ut.commit(); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java index c4d106fd87..f7fd6eca16 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java @@ -223,7 +223,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ejbContext.lookup("stateful/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -240,7 +240,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ejbContext.lookup("stateful/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -257,7 +257,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ejbContext.lookup("stateful/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -274,7 +274,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ejbContext.lookup("stateful/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -291,7 +291,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ejbContext.lookup("stateful/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -325,7 +325,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ejbContext.lookup("stateful/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -342,7 +342,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ejbContext.lookup("stateful/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java index dc913b9673..22c77370ac 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java @@ -206,7 +206,7 @@ public class ContextLookupStatefulPojoBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ejbContext.lookup("stateful/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -223,7 +223,7 @@ public class ContextLookupStatefulPojoBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ejbContext.lookup("stateful/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -240,7 +240,7 @@ public class ContextLookupStatefulPojoBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ejbContext.lookup("stateful/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -257,7 +257,7 @@ public class ContextLookupStatefulPojoBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ejbContext.lookup("stateful/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -274,7 +274,7 @@ public class ContextLookupStatefulPojoBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ejbContext.lookup("stateful/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -308,7 +308,7 @@ public class ContextLookupStatefulPojoBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ejbContext.lookup("stateful/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -325,7 +325,7 @@ public class ContextLookupStatefulPojoBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ejbContext.lookup("stateful/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java index 917606a9d2..0a12e5f2aa 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java @@ -258,7 +258,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ctx.lookup("java:comp/env/stateful/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -278,7 +278,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ctx.lookup("java:comp/env/stateful/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -298,7 +298,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ctx.lookup("java:comp/env/stateful/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -318,7 +318,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ctx.lookup("java:comp/env/stateful/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -338,7 +338,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ctx.lookup("java:comp/env/stateful/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -378,7 +378,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ctx.lookup("java:comp/env/stateful/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -398,7 +398,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ctx.lookup("java:comp/env/stateful/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java index 50d85e2f3f..3b31a143ed 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java @@ -180,7 +180,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); @@ -192,7 +192,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); @@ -203,7 +203,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); @@ -214,7 +214,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); @@ -226,7 +226,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); @@ -248,7 +248,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); @@ -259,7 +259,7 @@ public class FieldInjectionStatefulBean implements SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java index 4664be16c6..1fd4129029 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java @@ -405,7 +405,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", dooubleField); Assert.assertEquals(expected, dooubleField); @@ -417,7 +417,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loongField); Assert.assertEquals(expected, loongField); @@ -428,7 +428,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooatField); Assert.assertEquals(expected, flooatField); @@ -439,7 +439,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteegerField); Assert.assertEquals(expected, inteegerField); @@ -451,7 +451,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoortField); Assert.assertEquals(expected, shoortField); @@ -473,7 +473,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyteField); Assert.assertEquals(expected, byyteField); @@ -484,7 +484,7 @@ public class SetterInjectionStatefulBean implements SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracterField); Assert.assertEquals(expected, chaaracterField); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java index ef3da986db..9052134251 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java @@ -179,7 +179,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); @@ -191,7 +191,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); @@ -202,7 +202,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); @@ -213,7 +213,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); @@ -225,7 +225,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); @@ -247,7 +247,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); @@ -258,7 +258,7 @@ public class AnnotatedFieldInjectionStatelessBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java index b4f2283428..4c5013ec83 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java @@ -100,7 +100,7 @@ public class BeanTxStatelessBean implements jakarta.ejb.SessionBean { } /*[3] Commit or Rollback the transaction */ - if (rollback.booleanValue()) ut.setRollbackOnly(); + if (rollback) ut.setRollbackOnly(); /*[4] Commit or Rollback the transaction */ ut.commit(); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java index c807c35e21..63bf6f3a06 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java @@ -192,7 +192,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ejbContext.lookup("stateless/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -209,7 +209,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ejbContext.lookup("stateless/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -226,7 +226,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ejbContext.lookup("stateless/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -243,7 +243,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ejbContext.lookup("stateless/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -260,7 +260,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ejbContext.lookup("stateless/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -294,7 +294,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ejbContext.lookup("stateless/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -311,7 +311,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ejbContext.lookup("stateless/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java index 1e772808f1..05b8551ee8 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java @@ -174,7 +174,7 @@ public class ContextLookupStatelessPojoBean { public void lookupDoubleEntry() throws TestFailureException { try { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) getSessionContext().lookup("stateless/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -191,7 +191,7 @@ public class ContextLookupStatelessPojoBean { public void lookupLongEntry() throws TestFailureException { try { try { - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) getSessionContext().lookup("stateless/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -208,7 +208,7 @@ public class ContextLookupStatelessPojoBean { public void lookupFloatEntry() throws TestFailureException { try { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) getSessionContext().lookup("stateless/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -225,7 +225,7 @@ public class ContextLookupStatelessPojoBean { public void lookupIntegerEntry() throws TestFailureException { try { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) getSessionContext().lookup("stateless/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -242,7 +242,7 @@ public class ContextLookupStatelessPojoBean { public void lookupShortEntry() throws TestFailureException { try { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) getSessionContext().lookup("stateless/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -276,7 +276,7 @@ public class ContextLookupStatelessPojoBean { public void lookupByteEntry() throws TestFailureException { try { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) getSessionContext().lookup("stateless/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -293,7 +293,7 @@ public class ContextLookupStatelessPojoBean { public void lookupCharacterEntry() throws TestFailureException { try { try { - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) getSessionContext().lookup("stateless/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java index d6b135a36a..0ead9b554a 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java @@ -243,7 +243,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Double expected = new Double(1.0D); + final Double expected = 1.0D; final Double actual = (Double) ctx.lookup("java:comp/env/stateless/references/Double"); Assert.assertNotNull("The Double looked up is null", actual); @@ -263,7 +263,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Long expected = new Long(1L); + final Long expected = 1L; final Long actual = (Long) ctx.lookup("java:comp/env/stateless/references/Long"); Assert.assertNotNull("The Long looked up is null", actual); @@ -283,7 +283,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Float expected = new Float(1.0F); + final Float expected = 1.0F; final Float actual = (Float) ctx.lookup("java:comp/env/stateless/references/Float"); Assert.assertNotNull("The Float looked up is null", actual); @@ -303,7 +303,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = (Integer) ctx.lookup("java:comp/env/stateless/references/Integer"); Assert.assertNotNull("The Integer looked up is null", actual); @@ -323,7 +323,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Short expected = new Short((short) 1); + final Short expected = (short) 1; final Short actual = (Short) ctx.lookup("java:comp/env/stateless/references/Short"); Assert.assertNotNull("The Short looked up is null", actual); @@ -363,7 +363,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; final Byte actual = (Byte) ctx.lookup("java:comp/env/stateless/references/Byte"); Assert.assertNotNull("The Byte looked up is null", actual); @@ -383,7 +383,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean { final InitialContext ctx = new InitialContext(); Assert.assertNotNull("The InitialContext is null", ctx); - final Character expected = new Character('D'); + final Character expected = 'D'; final Character actual = (Character) ctx.lookup("java:comp/env/stateless/references/Character"); Assert.assertNotNull("The Character looked up is null", actual); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java index d2b070fd5d..40cd63ec4a 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java @@ -159,7 +159,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); @@ -171,7 +171,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); @@ -182,7 +182,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); @@ -193,7 +193,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); @@ -205,7 +205,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); @@ -227,7 +227,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); @@ -238,7 +238,7 @@ public class FieldInjectionStatelessBean implements SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java index ae92269057..615030edf4 100644 --- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java +++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java @@ -370,7 +370,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupDoubleEntry() throws TestFailureException { try { - final Double expected = new Double(1.0D); + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", dooubleField); Assert.assertEquals(expected, dooubleField); @@ -382,7 +382,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupLongEntry() throws TestFailureException { try { - final Long expected = new Long(1L); + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loongField); Assert.assertEquals(expected, loongField); @@ -393,7 +393,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupFloatEntry() throws TestFailureException { try { - final Float expected = new Float(1.0F); + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooatField); Assert.assertEquals(expected, flooatField); @@ -404,7 +404,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupIntegerEntry() throws TestFailureException { try { - final Integer expected = new Integer(1); + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteegerField); Assert.assertEquals(expected, inteegerField); @@ -416,7 +416,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupShortEntry() throws TestFailureException { try { - final Short expected = new Short((short) 1); + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoortField); Assert.assertEquals(expected, shoortField); @@ -438,7 +438,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupByteEntry() throws TestFailureException { try { - final Byte expected = new Byte((byte) 1); + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyteField); Assert.assertEquals(expected, byyteField); @@ -449,7 +449,7 @@ public class SetterInjectionStatelessBean implements SessionBean { public void lookupCharacterEntry() throws TestFailureException { try { - final Character expected = new Character('D'); + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracterField); Assert.assertEquals(expected, chaaracterField); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java index dfa3a1195d..6067461fc7 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java @@ -76,7 +76,7 @@ public class BmpRmiIiopTests extends BmpTestClient { public void test03_returnCharacterObject() { try { - final Character expected = new Character('1'); + final Character expected = '1'; final Character actual = ejbObject.returnCharacterObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -96,7 +96,7 @@ public class BmpRmiIiopTests extends BmpTestClient { public void test05_returnCharacterObjectArray() { try { - final Character[] expected = {new Character('1'), new Character('2'), new Character('3')}; + final Character[] expected = {'1', '2', '3'}; final Character[] actual = ejbObject.returnCharacterObjectArray(expected); assertNotNull("The array returned is null", actual); @@ -296,7 +296,7 @@ public class BmpRmiIiopTests extends BmpTestClient { public void test19_returnIntegerObject() { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = ejbObject.returnIntegerObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -316,7 +316,7 @@ public class BmpRmiIiopTests extends BmpTestClient { public void test21_returnIntegerObjectArray() { try { - final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)}; + final Integer[] expected = {1, 2, 3}; final Integer[] actual = ejbObject.returnIntegerObjectArray(expected); assertNotNull("The array returned is null", actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java index 6b5b17e8b5..ff739588c2 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java @@ -76,7 +76,7 @@ public class CmpRmiIiopTests extends CmpTestClient { public void test03_returnCharacterObject() { try { - final Character expected = new Character('1'); + final Character expected = '1'; final Character actual = ejbObject.returnCharacterObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -96,7 +96,7 @@ public class CmpRmiIiopTests extends CmpTestClient { public void test05_returnCharacterObjectArray() { try { - final Character[] expected = {new Character('1'), new Character('2'), new Character('3')}; + final Character[] expected = {'1', '2', '3'}; final Character[] actual = ejbObject.returnCharacterObjectArray(expected); assertNotNull("The array returned is null", actual); @@ -296,7 +296,7 @@ public class CmpRmiIiopTests extends CmpTestClient { public void test19_returnIntegerObject() { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = ejbObject.returnIntegerObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -316,7 +316,7 @@ public class CmpRmiIiopTests extends CmpTestClient { public void test21_returnIntegerObjectArray() { try { - final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)}; + final Integer[] expected = {1, 2, 3}; final Integer[] actual = ejbObject.returnIntegerObjectArray(expected); assertNotNull("The array returned is null", actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java index 27ba6ab0e1..2d16d7808a 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java @@ -80,7 +80,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient { public void test03_returnCharacterObject() { try { - final Character expected = new Character('1'); + final Character expected = '1'; final Character actual = ejbObject.returnCharacterObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -100,7 +100,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient { public void test05_returnCharacterObjectArray() { try { - final Character[] expected = {new Character('1'), new Character('2'), new Character('3')}; + final Character[] expected = {'1', '2', '3'}; final Character[] actual = ejbObject.returnCharacterObjectArray(expected); assertNotNull("The array returned is null", actual); @@ -300,7 +300,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient { public void test19_returnIntegerObject() { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = ejbObject.returnIntegerObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -320,7 +320,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient { public void test21_returnIntegerObjectArray() { try { - final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)}; + final Integer[] expected = {1, 2, 3}; final Integer[] actual = ejbObject.returnIntegerObjectArray(expected); assertNotNull("The array returned is null", actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java index 16dc07b597..69be07da74 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java @@ -60,10 +60,10 @@ public class CmrMappingTests extends AbstractCMRTest { protected void setUp() throws Exception { super.setUp(); - compoundPK_20_10 = new Integer(20); - compoundPK_20_10_field1 = new Integer(10); - compoundPK_20_20 = new Integer(20); - compoundPK_20_20_field1 = new Integer(20); + compoundPK_20_10 = 20; + compoundPK_20_10_field1 = 10; + compoundPK_20_20 = 20; + compoundPK_20_20_field1 = 20; oneInverseHome = (OneInverseSideLocalHome) initialContext.lookup("java:openejb/local/client/tests/entity/cmp2/OneInverseSideBean/EJBHomeLocal"); oneOwningHome = (OneOwningSideLocalHome) initialContext.lookup("java:openejb/local/client/tests/entity/cmp2/OneOwningSideBean/EJBHomeLocal"); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java index f486cc7ad0..6b0da67d1a 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java @@ -312,7 +312,7 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { resetDB(); beginTransaction(); try { - final ArtistLocal artist = findArtist(new Integer(1)); + final ArtistLocal artist = findArtist(1); final Set songs = artist.getComposed(); try { @@ -337,8 +337,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { Set songs; SongLocal newSong; try { - final ArtistLocal artist = findArtist(new Integer(1)); - newSong = createSong(new Integer(33)); + final ArtistLocal artist = findArtist(1); + newSong = createSong(33); songs = artist.getComposed(); } finally { completeTransaction(); @@ -349,9 +349,9 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { assertEquals(2, songs.size()); for (final Iterator iter = songs.iterator(); iter.hasNext(); ) { final SongLocal song = (SongLocal) iter.next(); - if (song.getId().equals(new Integer(11))) { + if (song.getId().equals(11)) { assertEquals("value11", song.getName()); - } else if (song.getId().equals(new Integer(22))) { + } else if (song.getId().equals(22)) { assertEquals("value22", song.getName()); } else { fail(); @@ -393,8 +393,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { Set songs; SongLocal newSong; try { - final ArtistLocal artist = findArtist(new Integer(1)); - newSong = createSong(new Integer(33)); + final ArtistLocal artist = findArtist(1); + newSong = createSong(33); songs = artist.getComposed(); } finally { completeTransaction(); @@ -407,9 +407,9 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { assertEquals(2, songs.size()); for (final Iterator iter = songs.iterator(); iter.hasNext(); ) { final SongLocal song = (SongLocal) iter.next(); - if (song.getId().equals(new Integer(11))) { + if (song.getId().equals(11)) { assertEquals("value11", song.getName()); - } else if (song.getId().equals(new Integer(22))) { + } else if (song.getId().equals(22)) { assertEquals("value22", song.getName()); } else { fail(); @@ -452,8 +452,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { resetDB(); beginTransaction(); try { - final ArtistLocal artist = findArtist(new Integer(1)); - final SongLocal song = findSong(new Integer(11)); + final ArtistLocal artist = findArtist(1); + final SongLocal song = findSong(11); final Set songs = artist.getComposed(); assertFalse(songs.isEmpty()); assertEquals(2, songs.size()); @@ -477,8 +477,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest { resetDB(); beginTransaction(); try { - final ArtistLocal artist = findArtist(new Integer(1)); - final SongLocal song = findSong(new Integer(11)); + final ArtistLocal artist = findArtist(1); + final SongLocal song = findSong(11); final Set games = artist.getComposed(); assertFalse(games.isEmpty()); assertEquals(2, games.size()); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java index 0a37e96db3..5a2d01fc0a 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java @@ -311,7 +311,7 @@ public class OneToManyTests extends AbstractCMRTest { resetDB(); beginTransaction(); try { - final ArtistLocal artist = findArtist(new Integer(1)); + final ArtistLocal artist = findArtist(1); final Set songs = artist.getComposed(); try { @@ -336,8 +336,8 @@ public class OneToManyTests extends AbstractCMRTest { Set songs; SongLocal newSong; try { - final ArtistLocal artist = findArtist(new Integer(1)); - newSong = createSong(new Integer(33)); + final ArtistLocal artist = findArtist(1); + newSong = createSong(33); songs = artist.getComposed(); } finally { completeTransaction(); @@ -348,9 +348,9 @@ public class OneToManyTests extends AbstractCMRTest { assertEquals(2, songs.size()); for (final Iterator iter = songs.iterator(); iter.hasNext(); ) { final SongLocal song = (SongLocal) iter.next(); - if (song.getId().equals(new Integer(11))) { + if (song.getId().equals(11)) { assertEquals("value11", song.getName()); - } else if (song.getId().equals(new Integer(22))) { + } else if (song.getId().equals(22)) { assertEquals("value22", song.getName()); } else { fail(); @@ -392,8 +392,8 @@ public class OneToManyTests extends AbstractCMRTest { Set songs; SongLocal newSong; try { - final ArtistLocal artist = findArtist(new Integer(1)); - newSong = createSong(new Integer(33)); + final ArtistLocal artist = findArtist(1); + newSong = createSong(33); songs = artist.getComposed(); } finally { completeTransaction(); @@ -406,9 +406,9 @@ public class OneToManyTests extends AbstractCMRTest { assertEquals(2, songs.size()); for (final Iterator iter = songs.iterator(); iter.hasNext(); ) { final SongLocal song = (SongLocal) iter.next(); - if (song.getId().equals(new Integer(11))) { + if (song.getId().equals(11)) { assertEquals("value11", song.getName()); - } else if (song.getId().equals(new Integer(22))) { + } else if (song.getId().equals(22)) { assertEquals("value22", song.getName()); } else { fail(); @@ -451,8 +451,8 @@ public class OneToManyTests extends AbstractCMRTest { resetDB(); beginTransaction(); try { - final ArtistLocal artist = findArtist(new Integer(1)); - final SongLocal song = findSong(new Integer(11)); + final ArtistLocal artist = findArtist(1); + final SongLocal song = findSong(11); final Set songs = artist.getComposed(); assertFalse(songs.isEmpty()); assertEquals(2, songs.size()); @@ -476,8 +476,8 @@ public class OneToManyTests extends AbstractCMRTest { resetDB(); beginTransaction(); try { - final ArtistLocal artist = findArtist(new Integer(1)); - final SongLocal song = findSong(new Integer(11)); + final ArtistLocal artist = findArtist(1); + final SongLocal song = findSong(11); final Set games = artist.getComposed(); assertFalse(games.isEmpty()); assertEquals(2, games.size()); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java index 1ca7927b5a..e6d1675627 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java @@ -237,7 +237,7 @@ public class OneToOneComplexPkTests extends AbstractCMRTest { try { final LicenseLocal license = findLicense(11); - license.setPoints(new Integer(2)); + license.setPoints(2); final PersonLocal person = license.getPerson(); assertEquals(new Integer(2), person.getId()); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java index 397388bb5c..c79fcfd16b 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java @@ -235,7 +235,7 @@ public class OneToOneTests extends AbstractCMRTest { try { final LicenseLocal license = findLicense(11); - license.setPoints(new Integer(2)); + license.setPoints(2); final PersonLocal person = license.getPerson(); assertEquals(new Integer(2), person.getId()); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java index 81ce89582b..30966dec3e 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java @@ -47,7 +47,7 @@ public class SingletonLocalBusinessIntfcTests extends SingletonTestClient { } try { - final Integer expected = new Integer(42); + final Integer expected = 42; final Object actual = businessLocal.echo(expected); assertSame("pass by reference", expected, actual); } catch (final Exception e) { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java index 9d7d221075..fdd2f85c93 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java @@ -47,7 +47,7 @@ public class SingletonRemoteBusinessIntfcTests extends SingletonTestClient { } try { - final Integer expected = new Integer(42); + final Integer expected = 42; final Object actual = businessRemote.echo(expected); assertEquals(expected, actual); assertNotSame("pass by value", expected, actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java index 5c92761f0b..a9e9fa36f9 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java @@ -75,7 +75,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient { /*-------------------------------------------------*/ public void test03_returnCharacterObject() { try { - final Character expected = new Character('1'); + final Character expected = '1'; final Character actual = ejbObject.returnCharacterObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -95,7 +95,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient { public void test05_returnCharacterObjectArray() { try { - final Character[] expected = {new Character('1'), new Character('2'), new Character('3')}; + final Character[] expected = {'1', '2', '3'}; final Character[] actual = ejbObject.returnCharacterObjectArray(expected); assertNotNull("The array returned is null", actual); @@ -295,7 +295,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient { public void test19_returnIntegerObject() { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = ejbObject.returnIntegerObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -315,7 +315,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient { public void test21_returnIntegerObjectArray() { try { - final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)}; + final Integer[] expected = {1, 2, 3}; final Integer[] actual = ejbObject.returnIntegerObjectArray(expected); assertNotNull("The array returned is null", actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java index fad89d75f1..95484aa496 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java @@ -47,7 +47,7 @@ public class StatefulLocalBusinessIntfcTests extends StatefulTestClient { } try { - final Integer expected = new Integer(42); + final Integer expected = 42; final Object actual = businessLocal.echo(expected); assertSame("pass by reference", expected, actual); } catch (final Exception e) { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java index a9752d5bce..faecd23e72 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java @@ -47,7 +47,7 @@ public class StatefulRemoteBusinessIntfcTests extends StatefulTestClient { } try { - final Integer expected = new Integer(42); + final Integer expected = 42; final Object actual = businessRemote.echo(expected); assertEquals(expected, actual); assertNotSame("pass by value", expected, actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java index cc13bb29c0..cc72aaf36c 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java @@ -76,7 +76,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test03_returnCharacterObject() { try { - final Character expected = new Character('1'); + final Character expected = '1'; final Character actual = ejbObject.returnCharacterObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -96,7 +96,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test05_returnCharacterObjectArray() { try { - final Character[] expected = {new Character('1'), new Character('2'), new Character('3')}; + final Character[] expected = {'1', '2', '3'}; final Character[] actual = ejbObject.returnCharacterObjectArray(expected); assertNotNull("The array returned is null", actual); @@ -296,7 +296,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test19_returnIntegerObject() { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = ejbObject.returnIntegerObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -316,7 +316,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test21_returnIntegerObjectArray() { try { - final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)}; + final Integer[] expected = {1, 2, 3}; final Integer[] actual = ejbObject.returnIntegerObjectArray(expected); assertNotNull("The array returned is null", actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java index 74c9dfe0d7..ce86bc67aa 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java @@ -47,7 +47,7 @@ public class StatelessLocalBusinessIntfcTests extends StatelessTestClient { } try { - final Integer expected = new Integer(42); + final Integer expected = 42; final Object actual = businessLocal.echo(expected); assertSame("pass by reference", expected, actual); } catch (final Exception e) { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java index d358764e5e..2cf8767f2d 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java @@ -47,7 +47,7 @@ public class StatelessRemoteBusinessIntfcTests extends StatelessTestClient { } try { - final Integer expected = new Integer(42); + final Integer expected = 42; final Object actual = businessRemote.echo(expected); assertEquals(expected, actual); assertNotSame("pass by value", expected, actual); diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java index 53fed5f1c8..f1954f1a9e 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java @@ -76,7 +76,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { /*-------------------------------------------------*/ public void test03_returnCharacterObject() { try { - final Character expected = new Character('1'); + final Character expected = '1'; final Character actual = ejbObject.returnCharacterObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -96,7 +96,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test05_returnCharacterObjectArray() { try { - final Character[] expected = {new Character('1'), new Character('2'), new Character('3')}; + final Character[] expected = {'1', '2', '3'}; final Character[] actual = ejbObject.returnCharacterObjectArray(expected); assertNotNull("The array returned is null", actual); @@ -296,7 +296,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test19_returnIntegerObject() { try { - final Integer expected = new Integer(1); + final Integer expected = 1; final Integer actual = ejbObject.returnIntegerObject(expected); assertEquals(expected, actual); } catch (final Exception e) { @@ -316,7 +316,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test21_returnIntegerObjectArray() { try { - final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)}; + final Integer[] expected = {1, 2, 3}; final Integer[] actual = ejbObject.returnIntegerObjectArray(expected); assertNotNull("The array returned is null", actual); diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java index 7f5df24686..a29b61e22e 100644 --- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java +++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java @@ -291,7 +291,7 @@ public class JWTCallerPrincipal implements JsonWebToken { builder.add(entry.getKey(), value); } else if (entryValue instanceof Boolean) { - final boolean flag = ((Boolean) entryValue).booleanValue(); + final boolean flag = (Boolean) entryValue; builder.add(entry.getKey(), flag); } else if (entryValue instanceof String) { diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java index 1c797ed36b..8d19769722 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java @@ -75,7 +75,7 @@ public class Client { public Client() { final String retryValue = System.getProperty("openejb.client.requestretry", getRetry() + ""); - retry = Boolean.valueOf(retryValue); + retry = Boolean.parseBoolean(retryValue); observers.addObserver(new EventLogger()); observers.fireEvent(new ClientVersion()); @@ -465,7 +465,7 @@ public class Client { //openejb.client.connection.strategy private boolean getRetry() { - return retry = Boolean.valueOf(System.getProperty("openejb.client.requestretry", retry + "")); + return retry = Boolean.parseBoolean(System.getProperty("openejb.client.requestretry", retry + "")); } private static final Map<ServerMetaData, Context> contexts = new ConcurrentHashMap<>(); diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java index 063cb0fa18..5b433d7f01 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java @@ -55,14 +55,14 @@ public class StartWithIPAddressPermission implements IPAddressPermission { if (value < 0 || 255 < value) { throw new IllegalArgumentException("byte #" + i + " is not valid."); } - tmpBytes[i] = new Byte((byte) value); + tmpBytes[i] = (byte) value; size++; } } bytes = new byte[size]; for (int i = 0; i < bytes.length; i++) { - bytes[i] = tmpBytes[i].byteValue(); + bytes[i] = tmpBytes[i]; } }
