Replace deprecated constructors by valueOf
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/House.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/House.java
index fb0d33d..0e57a72 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/House.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/House.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +29,7 @@ public House() {
super();
sellingPoints = new Vector();
insuranceId = new Oid();
- insuranceId.setOid(new Integer(0));
+ insuranceId.setOid(Integer.valueOf(0));
}
public java.lang.String getDescriptions() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/SingleHouse.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/SingleHouse.java
index fb5401d..e402ddb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/SingleHouse.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/SingleHouse.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,7 @@ public static SingleHouse example1() {
SingleHouse example1 = new SingleHouse();
Oid insurancePolicyId = new Oid();
- insurancePolicyId.setOid(new Integer(15));
+ insurancePolicyId.setOid(Integer.valueOf(15));
example1.setInsuranceId(insurancePolicyId);
example1.setDescriptions("beautiful 4 bedroom single house");
example1.setLocation("435 Carling Ave.");
@@ -48,7 +48,7 @@ public static SingleHouse example2() {
SingleHouse example2 = new SingleHouse();
Oid insurancePolicyId = new Oid();
- insurancePolicyId.setOid(new Integer(27));
+ insurancePolicyId.setOid(Integer.valueOf(27));
example2.setInsuranceId(insurancePolicyId);
example2.setDescriptions("spacious 5 bedroom banglow");
example2.setLocation("33D King Edward Street");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/TownHouse.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/TownHouse.java
index c7549ee..e9f9a97 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/TownHouse.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/TownHouse.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,7 @@ public static TownHouse example3() {
TownHouse example3 = new TownHouse();
Oid insurancePolicyId = new Oid();
- insurancePolicyId.setOid(new Integer(333));
+ insurancePolicyId.setOid(Integer.valueOf(333));
example3.setInsuranceId(insurancePolicyId);
example3.setDescriptions("renovated 3-bedroom gardon house");
example3.setLocation("2236 Baseline Rd");
@@ -34,7 +34,7 @@ public static TownHouse example4() {
TownHouse example4 = new TownHouse();
Oid insurancePolicyId = new Oid();
- insurancePolicyId.setOid(new Integer(4444));
+ insurancePolicyId.setOid(Integer.valueOf(4444));
example4.setInsuranceId(insurancePolicyId);
example4.setDescriptions("two bedroom luxury townhouse");
example4.setLocation("790C Bank Street");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/MenuItem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/MenuItem.java
index f4d956b..0154089 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/MenuItem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/MenuItem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -244,7 +244,7 @@ public void setName(String newValue) {
}
public void setPrice(float newValue) {
- propertyChange("price", new Float(this.price), new Float(newValue));
+ propertyChange("price", Float.valueOf(this.price), Float.valueOf(newValue));
this.price = newValue;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/map/MapPopulator.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/map/MapPopulator.java
index db76443..9043802 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/map/MapPopulator.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/map/MapPopulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -114,9 +114,9 @@ public AggregateAggregateMapHolder getAggregateAggregateMapHolder(){
public AggregateDirectMapHolder getAggregateDirectMapHolder(){
AggregateDirectMapHolder holder = new AggregateDirectMapHolder();
AggregateMapKey mapKey = getAggregateMapKey1();
- holder.addAggregateToDirectMapItem(mapKey, new Integer(1));
+ holder.addAggregateToDirectMapItem(mapKey, Integer.valueOf(1));
AggregateMapKey mapKey2 = getAggregateMapKey2();
- holder.addAggregateToDirectMapItem(mapKey2, new Integer(2));
+ holder.addAggregateToDirectMapItem(mapKey2, Integer.valueOf(2));
return holder;
}
@@ -161,16 +161,16 @@ public AggregateEntityU1MMapHolder getAggregateEntityU1MMapHolder(){
public DirectAggregateMapHolder getDirectAggregateMapHolder(){
DirectAggregateMapHolder holder = new DirectAggregateMapHolder();
AggregateMapValue value = getAggregateMapValue1();
- holder.addDirectToAggregateMapItem(new Integer(1), value);
+ holder.addDirectToAggregateMapItem(Integer.valueOf(1), value);
value = getAggregateMapValue2();
- holder.addDirectToAggregateMapItem(new Integer(2), value);
+ holder.addDirectToAggregateMapItem(Integer.valueOf(2), value);
return holder;
}
public DirectDirectMapHolder getDirectDirectMapHolder(){
DirectDirectMapHolder holder = new DirectDirectMapHolder();
- holder.addDirectToDirectMapItem(new Integer(1), new Integer(1));
- holder.addDirectToDirectMapItem(new Integer(2), new Integer(2));
+ holder.addDirectToDirectMapItem(Integer.valueOf(1), Integer.valueOf(1));
+ holder.addDirectToDirectMapItem(Integer.valueOf(2), Integer.valueOf(2));
return holder;
}
@@ -178,31 +178,31 @@ public DirectEntity1MMapHolder getDirectEntity1MMapHolder(){
DirectEntity1MMapHolder initialHolder = new DirectEntity1MMapHolder();
DEOTMMapValue value = getDEOTMMapValue1();
value.getHolder().setValue(initialHolder);
- initialHolder.addDirectToEntityMapItem(new Integer(11), value);
+ initialHolder.addDirectToEntityMapItem(Integer.valueOf(11), value);
DEOTMMapValue value2 = getDEOTMMapValue2();
value2.getHolder().setValue(initialHolder);
- initialHolder.addDirectToEntityMapItem(new Integer(22), value2);
+ initialHolder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
return initialHolder;
}
public DirectEntityMapHolder getDirectEntityMapHolder(){
DirectEntityMapHolder holder = new DirectEntityMapHolder();
EntityMapValue value = getEntityMapValue1();
- holder.addDirectToEntityMapItem(new Integer(11), value);
+ holder.addDirectToEntityMapItem(Integer.valueOf(11), value);
EntityMapValue value2 = getEntityMapValue2();
- holder.addDirectToEntityMapItem(new Integer(22), value2);
+ holder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
return holder;
}
public DirectEntityU1MMapHolder getDirectEntityU1MMapHolder(){
DirectEntityU1MMapHolder holder = new DirectEntityU1MMapHolder();
EntityMapValue value = getEntityMapValue3();
- holder.addDirectToEntityMapItem(new Integer(11), value);
+ holder.addDirectToEntityMapItem(Integer.valueOf(11), value);
EntityMapValue value2 = getEntityMapValue4();
- holder.addDirectToEntityMapItem(new Integer(22), value2);
+ holder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
return holder;
}
@@ -220,9 +220,9 @@ public EntityAggregateMapHolder getEntityAggregateMapHolder(){
public EntityDirectMapHolder getEntityDirectMapHolder(){
EntityDirectMapHolder holder = new EntityDirectMapHolder();
EntityMapKey mapKey = getEntityMapKey3();
- holder.addEntityDirectMapItem(mapKey, new Integer(1));
+ holder.addEntityDirectMapItem(mapKey, Integer.valueOf(1));
EntityMapKey mapKey2 = getEntityMapKey4();
- holder.addEntityDirectMapItem(mapKey2, new Integer(2));
+ holder.addEntityDirectMapItem(mapKey2, Integer.valueOf(2));
return holder;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObject.java
index d1a6501..f91dcd4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -96,14 +96,14 @@ public static ConversionDataObject example1() {
example.aPByte = 1;
example.setAPByteArray(new byte[] { 1, 2, 3 });
example.aPShort = 1;
- example.aCharacter = new Character('a');
- example.anInteger = new Integer(1);
- example.aFloat = new Float(1.0);
- example.aBoolean = new Boolean(false);
- example.aLong = new Long(1L);
- example.aDouble = new Double(1.0);
- example.aByte = new Byte((byte)1);
- example.aShort = new Short((short)1);
+ example.aCharacter = Character.valueOf('a');
+ example.anInteger = Integer.valueOf(1);
+ example.aFloat = Float.valueOf(1.0f);
+ example.aBoolean = Boolean.valueOf(false);
+ example.aLong = Long.valueOf(1L);
+ example.aDouble = Double.valueOf(1.0);
+ example.aByte = Byte.valueOf((byte)1);
+ example.aShort = Short.valueOf((short)1);
example.aBigDecimal = new java.math.BigDecimal(1.0);
example.aBigInteger = new java.math.BigInteger("1");
example.aNumber = example.aBigDecimal;
@@ -155,14 +155,14 @@ public static ConversionDataObject example2() {
example.aPByte = 2;
example.setAPByteArray(new byte[] { 4, 5, 6 });
example.aPShort = 2;
- example.aCharacter = new Character('b');
- example.anInteger = new Integer(2);
- example.aFloat = new Float(2.0);
- example.aBoolean = new Boolean(true);
- example.aLong = new Long(2L);
- example.aDouble = new Double(2.0);
- example.aByte = new Byte((byte)2);
- example.aShort = new Short((short)2);
+ example.aCharacter = Character.valueOf('b');
+ example.anInteger = Integer.valueOf(2);
+ example.aFloat = Float.valueOf(2.0f);
+ example.aBoolean = Boolean.valueOf(true);
+ example.aLong = Long.valueOf(2L);
+ example.aDouble = Double.valueOf(2.0);
+ example.aByte = Byte.valueOf((byte)2);
+ example.aShort = Short.valueOf((short)2);
example.aBigDecimal = new java.math.BigDecimal(2.0);
example.aBigInteger = new java.math.BigInteger("2");
example.aNumber = example.aBigDecimal;
@@ -213,14 +213,14 @@ public static ConversionDataObject example3() {
example.aPByte = 3;
example.setAPByteArray(new byte[] { 7, 8, 9 });
example.aPShort = 3;
- example.aCharacter = new Character('c');
- example.anInteger = new Integer(3);
- example.aFloat = new Float(3.0);
- example.aBoolean = new Boolean(true);
- example.aLong = new Long(3L);
- example.aDouble = new Double(3.0);
- example.aByte = new Byte((byte)3);
- example.aShort = new Short((short)3);
+ example.aCharacter = Character.valueOf('c');
+ example.anInteger = Integer.valueOf(3);
+ example.aFloat = Float.valueOf(3.0f);
+ example.aBoolean = Boolean.valueOf(true);
+ example.aLong = Long.valueOf(3L);
+ example.aDouble = Double.valueOf(3.0);
+ example.aByte = Byte.valueOf((byte)3);
+ example.aShort = Short.valueOf((short)3);
example.aBigDecimal = new java.math.BigDecimal(3.0);
example.aBigInteger = new java.math.BigInteger("3");
example.aNumber = example.aBigDecimal;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObjectForSupportedTypes.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObjectForSupportedTypes.java
index 0e5d615..2193031 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObjectForSupportedTypes.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/conversion/ConversionDataObjectForSupportedTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,14 +28,14 @@ public static ConversionDataObjectForSupportedTypes example() {
example.setAPCharArray(new char[] { 'a', 'b', 'c' });
example.setAPByteArray(new byte[] { 1, 2, 3 });
- example.aCharacter = new Character('t');
- example.anInteger = new Integer(1);
- example.aFloat = new Float(1.0);
- example.aBoolean = new Boolean(false);
- example.aLong = new Long(1L);
- example.aDouble = new Double(1.0);
- example.aByte = new Byte((byte)1);
- example.aShort = new Short((short)1);
+ example.aCharacter = Character.valueOf('t');
+ example.anInteger = Integer.valueOf(1);
+ example.aFloat = Float.valueOf(1.0f);
+ example.aBoolean = Boolean.valueOf(false);
+ example.aLong = Long.valueOf(1L);
+ example.aDouble = Double.valueOf(1.0);
+ example.aByte = Byte.valueOf((byte)1);
+ example.aShort = Short.valueOf((short)1);
example.aBigDecimal = new java.math.BigDecimal(1.0);
example.aBigInteger = new java.math.BigInteger("1");
example.aNumber = example.aBigDecimal;
@@ -52,8 +52,8 @@ public static ConversionDataObjectForSupportedTypes example() {
example.aString = new String("Conversion Managaer Test Example 1");
example.stringToInt = new String("111");
example.stringToTimestamp = new String("2003/11/23 23:45:56");
- example.aByteArray = new Byte[] { new Byte("4"), new Byte("5"), new Byte("6") };
- example.aCharacterArray = new Character[] { new Character('C'), new Character('H'), new Character('A') };
+ example.aByteArray = new Byte[] { Byte.valueOf("4"), Byte.valueOf("5"), Byte.valueOf("6") };
+ example.aCharacterArray = new Character[] { Character.valueOf('C'), Character.valueOf('H'), Character.valueOf('A') };
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/Employee.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/Employee.java
index af97de6..e710193 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/Employee.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -468,7 +468,7 @@ public void setResponsibilitiesList(Vector responsibilitiesList) {
}
public void setSalary(int salary) {
- propertyChange("salary", new Integer(this.salary), new Integer(salary));
+ propertyChange("salary", Integer.valueOf(this.salary), Integer.valueOf(salary));
this.salary = salary;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/LargeProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/LargeProject.java
index c1696ba..36d827d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/LargeProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/employee/domain/LargeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,7 +41,7 @@ public Timestamp getMilestoneVersion() {
}
public void setBudget(double budget) {
- propertyChange("budget", new Double(this.budget), new Double(budget));
+ propertyChange("budget", Double.valueOf(this.budget), Double.valueOf(budget));
this.budget = budget;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bicycle.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bicycle.java
index e5db9bb..5f24a5b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bicycle.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bicycle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@ public class Bicycle extends NonFueledVehicle {
public String description;
public void change() {
- this.setPassengerCapacity(new Integer(100));
+ this.setPassengerCapacity(Integer.valueOf(100));
this.addPartNumber("NEWBIKEPART 1");
this.setDescription("This Bike is easy to handle");
@@ -27,7 +27,7 @@ public void change() {
public static Bicycle example1(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(1));
+ example.setPassengerCapacity(Integer.valueOf(1));
example.getOwner().setValue(company);
example.setDescription("Hercules");
example.addPartNumber("1288H8HH-f");
@@ -38,7 +38,7 @@ public static Bicycle example1(Company company) {
public static Bicycle example2(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(2));
+ example.setPassengerCapacity(Integer.valueOf(2));
example.getOwner().setValue(company);
example.setDescription("Atlas");
example.addPartNumber("176339GT-a");
@@ -50,7 +50,7 @@ public static Bicycle example2(Company company) {
public static Bicycle example3(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(3));
+ example.setPassengerCapacity(Integer.valueOf(3));
example.getOwner().setValue(company);
example.setDescription("Aone");
example.addPartNumber("188181TT-a");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Boat.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Boat.java
index e3b5be4..2eb3883 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Boat.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Boat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@ public class Boat extends NonFueledVehicle {
public static Boat example1(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(10));
+ example.setPassengerCapacity(Integer.valueOf(10));
example.getOwner().setValue(company);
return example;
}
@@ -26,7 +26,7 @@ public static Boat example1(Company company) {
public static Boat example2(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(20));
+ example.setPassengerCapacity(Integer.valueOf(20));
example.getOwner().setValue(company);
return example;
}
@@ -34,7 +34,7 @@ public static Boat example2(Company company) {
public static Boat example3(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(30));
example.getOwner().setValue(company);
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bus.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bus.java
index 00b80a5..0ec1123 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bus.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Bus.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,8 +20,8 @@ public class Bus extends FueledVehicle {
public static Bus example2(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("SCHOOL BUS");
example.setFuelType("Petrol");
example.getOwner().setValue(company);
@@ -35,8 +35,8 @@ public static Bus example2(Company company) {
public static Bus example3(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("TOUR BUS");
example.setFuelType("Petrol");
example.getOwner().setValue(company);
@@ -50,8 +50,8 @@ public static Bus example3(Company company) {
public static Bus example4(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("TRANSIT BUS");
example.setFuelType("Gas");
example.getOwner().setValue(company);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Car.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Car.java
index de1952e..3b1d1e8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Car.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Car.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,8 +22,8 @@ public Car() {
public static Car example1() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("PONTIAC");
example.setFuelType("Petrol");
example.addPartNumber("021776RM-b");
@@ -35,8 +35,8 @@ public static Car example1() {
public static Car example2() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(4));
- example.setFuelCapacity(new Integer(50));
+ example.setPassengerCapacity(Integer.valueOf(4));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TOYOTA");
example.setFuelType("Petrol");
example.addPartNumber("021776TT-a");
@@ -48,8 +48,8 @@ public static Car example2() {
public static Car example3() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(5));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(5));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("BMW");
example.setFuelType("Disel");
example.addPartNumber("021776KM-k");
@@ -61,8 +61,8 @@ public static Car example3() {
public static Car example4() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(8));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(8));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("Mazda");
example.setFuelType("Coca-Cola");
example.addPartNumber("021776KM-k");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/FueledVehicle.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/FueledVehicle.java
index 638cede..9d9d46c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/FueledVehicle.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/FueledVehicle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,7 +20,7 @@ public class FueledVehicle extends Vehicle {
public String fuelType;
public void change() {
- this.setPassengerCapacity(new Integer(100));
+ this.setPassengerCapacity(Integer.valueOf(100));
this.addPartNumber("NEWPART 1");
this.setFuelType("HOT AIR");
@@ -29,8 +29,8 @@ public void change() {
public static FueledVehicle example1(Company company) {
FueledVehicle example = new FueledVehicle();
- example.setPassengerCapacity(new Integer(1));
- example.setFuelCapacity(new Integer(10));
+ example.setPassengerCapacity(Integer.valueOf(1));
+ example.setFuelCapacity(Integer.valueOf(10));
example.setDescription("Motercycle");
example.getOwner().setValue(company);
return example;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/ImaginaryCar.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/ImaginaryCar.java
index 508651a..96a9930 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/ImaginaryCar.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/ImaginaryCar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,8 +25,8 @@ public static Car example1()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("PONTIAC");
example.setFuelType("Petrol");
example.addPartNumber("021776RM-b");
@@ -38,8 +38,8 @@ public static Car example2()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(4));
- example.setFuelCapacity(new Integer(50));
+ example.setPassengerCapacity(Integer.valueOf(4));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TOYOTA");
example.setFuelType("Petrol");
example.addPartNumber("021776TT-a");
@@ -51,8 +51,8 @@ public static Car example3()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(5));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(5));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("BMW");
example.setFuelType("Disel");
example.addPartNumber("021776KM-k");
@@ -64,8 +64,8 @@ public static Car example4()
{
Car example = new Car();
- example.setPassengerCapacity(new Integer(8));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(8));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("Mazda");
example.setFuelType("Coca-Cola");
example.addPartNumber("021776KM-k");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/NonFueledVehicle.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/NonFueledVehicle.java
index 2f55753..b03ae8d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/NonFueledVehicle.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/NonFueledVehicle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@ public class NonFueledVehicle extends Vehicle {
public static NonFueledVehicle example4(Company company) {
NonFueledVehicle example = new NonFueledVehicle();
- example.setPassengerCapacity(new Integer(1));
+ example.setPassengerCapacity(Integer.valueOf(1));
example.getOwner().setValue(company);
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/SportsCar.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/SportsCar.java
index 73db023..594a6fb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/SportsCar.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/SportsCar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,8 +18,8 @@ public class SportsCar extends Car {
public static Car example1() {
SportsCar example = new SportsCar();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("Corvet");
example.setFuelType("Disel");
return example;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/insurance/InsuranceProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/insurance/InsuranceProject.java
index e911309..fce8e4a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/insurance/InsuranceProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/insurance/InsuranceProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -281,10 +281,10 @@ public RelationalDescriptor buildPolicyDescriptor() {
// Inheritance properties.
descriptor.getDescriptorInheritancePolicy().setClassIndicatorFieldName("POLICY.POL_TYPE");
- descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.HousePolicy.class, new Long(3));
- descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.HealthPolicy.class, new Long(2));
- descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.VehiclePolicy.class, new Long(1));
- descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.BicyclePolicy.class, new Long(0));
+ descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.HousePolicy.class, Long.valueOf(3));
+ descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.HealthPolicy.class, Long.valueOf(2));
+ descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.VehiclePolicy.class, Long.valueOf(1));
+ descriptor.getDescriptorInheritancePolicy().addClassIndicator(org.eclipse.persistence.testing.models.insurance.BicyclePolicy.class, Long.valueOf(0));
// Mappings.
DirectToFieldMapping policyNumberMapping = new DirectToFieldMapping();
@@ -380,8 +380,8 @@ public RelationalDescriptor buildPolicyHolderDescriptor() {
sexMapping.setSetMethodName("setSex");
sexMapping.setFieldName("HOLDER.SEX");
ObjectTypeConverter sexConverter = new ObjectTypeConverter();
- sexConverter.addConversionValue(new Character('F'), "Female");
- sexConverter.addConversionValue(new Character('M'), "Male");
+ sexConverter.addConversionValue(Character.valueOf('F'), "Female");
+ sexConverter.addConversionValue(Character.valueOf('M'), "Male");
sexMapping.setConverter(sexConverter);
descriptor.addMapping(sexMapping);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Commercial.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Commercial.java
index a056aef..2cdd402 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Commercial.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Commercial.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,7 +39,7 @@ public void setDescription(String description) {
}
public void setDuration(float duration) {
- this.duration = new Float(duration);
+ this.duration = Float.valueOf(duration);
}
public void setDuration(Number duration) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/CourseDeveloper.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/CourseDeveloper.java
index 5e4c313..f4a7687 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/CourseDeveloper.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/CourseDeveloper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@ public static CourseDeveloper example1() {
CourseDeveloper example = new CourseDeveloper();
example.setCourse("Intro to Quake 2 Map Design using Qoole");
- example.setSalary(new Float(52000.00));
+ example.setSalary(Float.valueOf(52000.00f));
return example;
}
@@ -42,7 +42,7 @@ public static CourseDeveloper example2() {
CourseDeveloper example = new CourseDeveloper();
example.setCourse("Introduction to Synthesis");
- example.setSalary(new Float(51000.00));
+ example.setSalary(Float.valueOf(51000.00f));
return example;
}
@@ -51,7 +51,7 @@ public static CourseDeveloper example3() {
CourseDeveloper example = new CourseDeveloper();
example.setCourse("Welcome to Ada!");
- example.setSalary(new Float(56000.00));
+ example.setSalary(Float.valueOf(56000.00f));
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithTablesSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithTablesSystem.java
index 4dbc689..ff26cac 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithTablesSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithTablesSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -84,12 +84,12 @@ public void populate(DatabaseSession session) {
Commercial eatYourWeaties = new Commercial();
eatYourWeaties.setName("Eat Your Weaties");
eatYourWeaties.setDescription("Mikey says that he likes it.");
- eatYourWeaties.setDuration(new Float(0.5));
+ eatYourWeaties.setDuration(Float.valueOf(0.5f));
Show zena = new Show();
zena.setName("Zena");
zena.setDescription("Zena the worrier princess");
- zena.setDuration(new Float(20));
+ zena.setDuration(Float.valueOf(20));
schedule.segments.addElement(eatYourWeaties);
schedule.segments.addElement(zena);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesProject.java
index 4ea1bce..07bf950 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -279,7 +279,7 @@ protected void buildCompanyDescriptor() {
// SECTION: VARIABLEONETOONEMAPPING
org.eclipse.persistence.mappings.VariableOneToOneMapping variableonetoonemapping =
new org.eclipse.persistence.mappings.VariableOneToOneMapping();
- variableonetoonemapping.setWeight(new Integer(3));
+ variableonetoonemapping.setWeight(Integer.valueOf(3));
variableonetoonemapping.setAttributeName("contact");
variableonetoonemapping.setIsReadOnly(false);
variableonetoonemapping.setUsesIndirection(false);
@@ -664,8 +664,8 @@ protected void buildEmployeeDescriptor() {
//variableonetoonemapping.addClassIndicator(Email.class, "E");
//variableonetoonemapping.addClassIndicator(Phone.class, "P");
variableonetoonemapping.addClassIndicator(Email.class,
- new Float(1)); // TO TEST NUMERIC TYPE INDICATOR
- variableonetoonemapping.addClassIndicator(Phone.class, new Float(2));
+ Float.valueOf(1)); // TO TEST NUMERIC TYPE INDICATOR
+ variableonetoonemapping.addClassIndicator(Phone.class, Float.valueOf(2));
descriptor.addMapping(variableonetoonemapping);
// SECTION: VARIABLEONETOONEMAPPING
@@ -681,8 +681,8 @@ protected void buildEmployeeDescriptor() {
//variableonetoonemapping2.addClassIndicator(Email.class, "E");
//variableonetoonemapping2.addClassIndicator(Phone.class, "P");
variableonetoonemapping2.addClassIndicator(Email.class,
- new Float(1)); // TO TEST NUMERIC TYPE INDICATOR
- variableonetoonemapping2.addClassIndicator(Phone.class, new Float(2));
+ Float.valueOf(1)); // TO TEST NUMERIC TYPE INDICATOR
+ variableonetoonemapping2.addClassIndicator(Phone.class, Float.valueOf(2));
descriptor.addMapping(variableonetoonemapping2);
Employee.addToDescriptor(descriptor);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/PersonnelManager.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/PersonnelManager.java
index 322cc42..40a8bf9 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/PersonnelManager.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/PersonnelManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@ public static PersonnelManager example1() {
PersonnelManager example = new PersonnelManager();
example.setDepartment("Division A");
- example.setSalary(new Float(77235.00));
+ example.setSalary(Float.valueOf(77235.00f));
Vector employees = new Vector(5);
employees.addElement(CourseDeveloper.example1());
@@ -51,7 +51,7 @@ public static PersonnelManager example2() {
PersonnelManager example = new PersonnelManager();
example.setDepartment("Division B");
- example.setSalary(new Float(97235.00));
+ example.setSalary(Float.valueOf(97235.00f));
Vector employees = new Vector(5);
employees.addElement(CourseDeveloper.example2());
@@ -69,7 +69,7 @@ public static PersonnelManager example3() {
PersonnelManager example = new PersonnelManager();
example.setDepartment("Division C");
- example.setSalary(new Float(87265.00));
+ example.setSalary(Float.valueOf(87265.00f));
Vector employees = new Vector(5);
employees.addElement(CourseDeveloper.example3());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductDeveloper.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductDeveloper.java
index 92ee930..2c4902d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductDeveloper.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductDeveloper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,7 @@ public static ProductDeveloper example1() {
ProductDeveloper example = new ProductDeveloper();
example.setProduct("Quake 2 Maps");
- example.setSalary(new Float(145000.00));
+ example.setSalary(Float.valueOf(145000.00f));
return example;
}
@@ -32,7 +32,7 @@ public static ProductDeveloper example2() {
ProductDeveloper example = new ProductDeveloper();
example.setProduct("Trinity Operating System");
- example.setSalary(new Float(85000.00));
+ example.setSalary(Float.valueOf(85000.00f));
return example;
}
@@ -41,7 +41,7 @@ public static ProductDeveloper example3() {
ProductDeveloper example = new ProductDeveloper();
example.setProduct("Ada For Dummies");
- example.setSalary(new Float(80000.00));
+ example.setSalary(Float.valueOf(80000.00f));
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductManager.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductManager.java
index d4000ca..d0c2cec 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductManager.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/ProductManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public static ProductManager example1() {
ProductManager example = new ProductManager();
example.setProduct("Quake 2 Maps");
- example.setSalary(new Float(88000.00));
+ example.setSalary(Float.valueOf(88000.00f));
example.setGoldCardNumber(new BigInteger("482122381872"));
Vector employees = new Vector(1);
@@ -49,7 +49,7 @@ public static ProductManager example2() {
ProductManager example = new ProductManager();
example.setProduct("Trinity Operating System");
- example.setSalary(new Float(84000.00));
+ example.setSalary(Float.valueOf(84000.00f));
example.setGoldCardNumber(new BigInteger("998128762878"));
Vector employees = new Vector(1);
@@ -64,7 +64,7 @@ public static ProductManager example3() {
ProductManager example = new ProductManager();
example.setProduct("Ada For Dummies");
- example.setSalary(new Float(84000.00));
+ example.setSalary(Float.valueOf(84000.00f));
example.setGoldCardNumber(new BigInteger("144173389267"));
Vector employees = new Vector(1);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Receptionist.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Receptionist.java
index 980a703..b45a9a8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Receptionist.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Receptionist.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,9 +22,9 @@ public class Receptionist extends AdministrativeJob {
public static Receptionist example1() {
Receptionist example = new Receptionist();
- example.setWordsPerMinute(new Integer(50));
- example.setSalary(new Float(22500.00));
- example.setMinimumSalary(new Float(22000.00));
+ example.setWordsPerMinute(Integer.valueOf(50));
+ example.setSalary(Float.valueOf(22500.00f));
+ example.setMinimumSalary(Float.valueOf(22000.00f));
return example;
}
@@ -32,9 +32,9 @@ public static Receptionist example1() {
public static Receptionist example2() {
Receptionist example = new Receptionist();
- example.setWordsPerMinute(new Integer(50));
- example.setSalary(new Float(23450.00));
- example.setMinimumSalary(new Float(22000.00));
+ example.setWordsPerMinute(Integer.valueOf(50));
+ example.setSalary(Float.valueOf(23450.00f));
+ example.setMinimumSalary(Float.valueOf(22000.00f));
return example;
}
@@ -42,9 +42,9 @@ public static Receptionist example2() {
public static Receptionist example3() {
Receptionist example = new Receptionist();
- example.setWordsPerMinute(new Integer(60));
- example.setSalary(new Float(26450.00));
- example.setMinimumSalary(new Float(22000.00));
+ example.setWordsPerMinute(Integer.valueOf(60));
+ example.setSalary(Float.valueOf(26450.00f));
+ example.setMinimumSalary(Float.valueOf(22000.00f));
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Secretary.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Secretary.java
index bcd1aa1..101462c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Secretary.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Secretary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@ public static Secretary example1() {
Secretary example = new Secretary();
example.setDepartment("Finance");
- example.setSalary(new Float(33500.00));
- example.setMinimumSalary(new Float(31000.00));
+ example.setSalary(Float.valueOf(33500.00f));
+ example.setMinimumSalary(Float.valueOf(31000.00f));
return example;
}
@@ -33,8 +33,8 @@ public static Secretary example2() {
Secretary example = new Secretary();
example.setDepartment("Employment");
- example.setSalary(new Float(33500.00));
- example.setMinimumSalary(new Float(31000.00));
+ example.setSalary(Float.valueOf(33500.00f));
+ example.setMinimumSalary(Float.valueOf(31000.00f));
return example;
}
@@ -43,8 +43,8 @@ public static Secretary example3() {
Secretary example = new Secretary();
example.setDepartment("Public Relations");
- example.setSalary(new Float(35000.00));
- example.setMinimumSalary(new Float(31000.00));
+ example.setSalary(Float.valueOf(35000.00f));
+ example.setMinimumSalary(Float.valueOf(31000.00f));
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Show.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Show.java
index 20a857f..d778db5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Show.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/interfaces/Show.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,7 +20,7 @@
public class Show implements Program, java.io.Serializable {
public String name;
public String description;
- public Number duration = new Float(0);
+ public Number duration = Float.valueOf(0);
public String getDescription() {
return description;
@@ -39,11 +39,11 @@ public void setDescription(String description) {
}
public void setDuration(double duration) {
- this.duration = new Double(duration);
+ this.duration = Double.valueOf(duration);
}
public void setDuration(float duration) {
- this.duration = new Float(duration);
+ this.duration = Float.valueOf(duration);
}
public void setDuration(Number duration) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Computer.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Computer.java
index 954b018..117d88b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Computer.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Computer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -146,11 +146,11 @@ public int hashCode() {
}
public void isMacintosh() {
- isMacintosh = new Boolean(true);
+ isMacintosh = Boolean.valueOf(true);
}
public void notMacintosh() {
- isMacintosh = new Boolean(false);
+ isMacintosh = Boolean.valueOf(false);
}
public void setDescription(String aDescription) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee.java
index ffee549..5460111 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee.java
@@ -483,10 +483,10 @@ public Integer getRankFromObject() {
}
if (getDesignation().getValue().equals("Executive")) {
- rank = new Integer(1);
+ rank = Integer.valueOf(1);
}
if (getDesignation().getValue().equals("Non-Executive")) {
- rank = new Integer(2);
+ rank = Integer.valueOf(2);
}
return rank;
}
@@ -495,7 +495,7 @@ public String getRankFromRow(org.eclipse.persistence.sessions.Record row, Sessio
if (row.get("ERANK") == null) {
return null;
}
- Integer value = new Integer(((Number)row.get("ERANK")).intValue());
+ Integer value = Integer.valueOf(((Number)row.get("ERANK")).intValue());
String rank = null;
Employee employee = new Employee();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee2.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee2.java
index 7b9af80..ea5ac16 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee2.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,8 +30,8 @@ public Employee2() {
public static Employee2 example1() {
Employee2 example = new Employee2();
- example.setId(new Integer(1));
- example.setEmployeeNumber(new Integer(2));
+ example.setId(Integer.valueOf(1));
+ example.setEmployeeNumber(Integer.valueOf(2));
example.setEmployeeNumberB(example.getEmployeeNumber());
example.setExtraInfo("Extra info string");
example.setFirstName("Jan");
@@ -42,8 +42,8 @@ public static Employee2 example1() {
public static Employee2 example2() {
Employee2 example = new Employee2();
- example.setId(new Integer(4));
- example.setEmployeeNumber(new Integer(8));
+ example.setId(Integer.valueOf(4));
+ example.setEmployeeNumber(Integer.valueOf(8));
example.setEmployeeNumberB(example.getEmployeeNumber());
example.setExtraInfo("Whatever");
example.setFirstName("Ursula");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/MappingProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/MappingProject.java
index 2be0193..55e70e5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/MappingProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/MappingProject.java
@@ -205,9 +205,9 @@ protected void buildComputerDescriptor() {
objecttypemapping.setAttributeName("isMacintosh");
objecttypemapping.setIsReadOnly(false);
objecttypemapping.setFieldName("MAP_COM.IS_MAC");
- objecttypeconverter.addConversionValue("No", new Boolean(false));
- objecttypeconverter.addConversionValue("Yes", new Boolean(true));
- objecttypemapping.setNullValue(new Boolean(false));
+ objecttypeconverter.addConversionValue("No", Boolean.valueOf(false));
+ objecttypeconverter.addConversionValue("Yes", Boolean.valueOf(true));
+ objecttypemapping.setNullValue(Boolean.valueOf(false));
objecttypemapping.setConverter(objecttypeconverter);
descriptor.addMapping(objecttypemapping);
@@ -807,8 +807,8 @@ public void buildPeripheralDescriptor() {
validMapping.setAttributeName("valid");
validMapping.setFieldName("MAP_PERIPHERAL.VALID");
ObjectTypeConverter validMappingConverter = new ObjectTypeConverter();
- validMappingConverter.addConversionValue(new Character('N'), new java.lang.Boolean("false"));
- validMappingConverter.addConversionValue(new Character('Y'), new java.lang.Boolean("true"));
+ validMappingConverter.addConversionValue(Character.valueOf('N'), new java.lang.Boolean("false"));
+ validMappingConverter.addConversionValue(Character.valueOf('Y'), new java.lang.Boolean("true"));
validMapping.setConverter(validMappingConverter);
descriptor.addMapping(validMapping);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/Employee.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/Employee.java
index 239dc9e..22d15f5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/Employee.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -309,7 +309,7 @@ public void setResponsibilitiesList(Vector responsibilitiesList) {
}
public void setSalary(int salary) {
- propertyChange("salary", new Integer(this.salary), new Integer(salary));
+ propertyChange("salary", Integer.valueOf(this.salary), Integer.valueOf(salary));
this.salary = salary;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/LargeProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/LargeProject.java
index 7ff25aa..8f39a3f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/LargeProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/onetoonejointable/LargeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,7 +46,7 @@ public Timestamp getMilestoneVersion() {
}
public void setBudget(double budget) {
- propertyChange("budget", new Double(this.budget), new Double(budget));
+ propertyChange("budget", Double.valueOf(this.budget), Double.valueOf(budget));
this.budget = budget;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/optimisticlocking/GamesConsoleProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/optimisticlocking/GamesConsoleProject.java
index eee4f0f..edb63fc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/optimisticlocking/GamesConsoleProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/optimisticlocking/GamesConsoleProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -382,8 +382,8 @@ public ClassDescriptor buildPowerSupplyUnitClassDescriptor() {
onMapping.setFieldName("on->DIRECT");
ObjectTypeConverter onMappingConverter = new ObjectTypeConverter();
onMappingConverter.setDefaultAttributeValue(new java.lang.Boolean("false"));
- onMappingConverter.addConversionValue(new Character('F'), new java.lang.Boolean("false"));
- onMappingConverter.addConversionValue(new Character('T'), new java.lang.Boolean("true"));
+ onMappingConverter.addConversionValue(Character.valueOf('F'), new java.lang.Boolean("false"));
+ onMappingConverter.addConversionValue(Character.valueOf('T'), new java.lang.Boolean("true"));
onMapping.setConverter(onMappingConverter);
descriptor.addMapping(onMapping);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/orderedlist/LargeProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/orderedlist/LargeProject.java
index 8cc3851..4b3dc8e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/orderedlist/LargeProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/orderedlist/LargeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,7 +48,7 @@ public Timestamp getMilestoneVersion() {
}
public void setBudget(double budget) {
- propertyChange("budget", new Double(this.budget), new Double(budget));
+ propertyChange("budget", Double.valueOf(this.budget), Double.valueOf(budget));
this.budget = budget;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldOffice.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldOffice.java
index 8234139..b0cfda0 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldOffice.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldOffice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,7 +56,7 @@ public Collection getSalespeople() {
}
public void setId(int newId) {
- propertyChange("id", new Integer(this.id), new Integer(newId));
+ propertyChange("id", Integer.valueOf(this.id), Integer.valueOf(newId));
id = newId;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/RelationshipsSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/RelationshipsSystem.java
index 2c2b15e..7fd2f79 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/RelationshipsSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/RelationshipsSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -118,26 +118,26 @@ public void populate(DatabaseSession session) {
uow.registerObject(fieldOffice2);
Dept dept = new Dept();
- dept.setDeptno(new Double(5.0));
+ dept.setDeptno(Double.valueOf(5.0));
dept.setDname("Goofs");
Emp emp = new Emp();
- emp.setEmpno(new Double(5.0));
+ emp.setEmpno(Double.valueOf(5.0));
emp.setEname("Anthony");
emp.setDeptno(dept);
Emp emp1 = new Emp();
- emp1.setEmpno(new Double(6.0));
+ emp1.setEmpno(Double.valueOf(6.0));
emp1.setEname("Bob");
emp1.setDeptno(dept);
Emp emp2 = new Emp();
- emp2.setEmpno(new Double(7.0));
+ emp2.setEmpno(Double.valueOf(7.0));
emp2.setEname("Fargo");
emp2.setDeptno(dept);
Emp emp3 = new Emp();
- emp3.setEmpno(new Double(8.0));
+ emp3.setEmpno(Double.valueOf(8.0));
emp3.setEname("Oneder");
emp3.setDeptno(dept);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/Resource.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/Resource.java
index 8c74e61..d806073 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/Resource.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/Resource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,7 +55,7 @@ public String getName() {
* @param newId int
*/
public void setId(int newId) {
- propertyChange("id", new Integer(this.id), new Integer(newId));
+ propertyChange("id", Integer.valueOf(this.id), Integer.valueOf(newId));
id = newId;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java
index 421511c..4bf6bbe 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -187,7 +187,7 @@ public int getTotalTens2() {
protected void initialize() {
this.contacts2 = new Stack();
this.salesReps2 = new TestHashtable();
- this.total = new ValueHolder(new Integer(1));
+ this.total = new ValueHolder(Integer.valueOf(1));
this.total2 = 0;
}
@@ -214,7 +214,7 @@ public void removeSalesRep2(AbstractSalesRep salesRep) {
}
public void setTotal(int total) {
- this.total.setValue(new Integer(total));
+ this.total.setValue(Integer.valueOf(total));
}
public String toString() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Player.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Player.java
index b801c0c..43cd90f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Player.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Player.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public Player() {
}
public Integer getId() {
- return new Integer(new Long(m_id).intValue());
+ return Integer.valueOf(Long.valueOf(m_id).intValue());
}
public Team getTeam() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/EngineType.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/EngineType.java
index a5c0cf2..81d6b57 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/EngineType.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/EngineType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,14 +36,14 @@ public String getType() {
public static EngineType example1() {
EngineType example = new EngineType();
- example.setId(new Integer(1));
+ example.setId(Integer.valueOf(1));
example.setType("Steel");
return example;
}
public static EngineType example2() {
EngineType example = new EngineType();
- example.setId(new Integer(2));
+ example.setId(Integer.valueOf(2));
example.setType("AlumSteel");
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/FuelType.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/FuelType.java
index 80e6229..ff6d60c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/FuelType.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/FuelType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,14 +43,14 @@ public String toString() {
public static FuelType example1() {
FuelType example = new FuelType();
- example.setFuelId(new Integer(1));
+ example.setFuelId(Integer.valueOf(1));
example.setFuelDescription("Petrol");
return example;
}
public static FuelType example2() {
FuelType example = new FuelType();
- example.setFuelId(new Integer(2));
+ example.setFuelId(Integer.valueOf(2));
example.setFuelDescription("Diesel");
return example;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/SportsCar.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/SportsCar.java
index 339238d..00f6568 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/SportsCar.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/vehicle/SportsCar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,7 @@ public static SportsCar example1() {
SportsCar example = new SportsCar();
example.setId(10);
- example.setFuelCapacity(new Integer(30));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("TOYOTA");
example.setFuelType(FuelType.example1());
example.setEngineType(EngineType.example1());
@@ -79,7 +79,7 @@ public static SportsCar example2() {
SportsCar example = new SportsCar();
example.setId(20);
- example.setFuelCapacity(new Integer(50));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TATA INDICA");
example.setFuelType(FuelType.example2());
example.setEngineType(EngineType.example2());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateCollectionUoWTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateCollectionUoWTest.java
index 4b12f90..244a81b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateCollectionUoWTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateCollectionUoWTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,7 +51,7 @@ protected void changeUnitOfWorkWorkingCopy() {
House house2 = (House)houses.get(houses.size()-1);
house2.setDescriptions("do not buy it, it collapses -:)");
Oid newInsurancePolicyId = new Oid();
- newInsurancePolicyId.setOid(new Integer(893453));
+ newInsurancePolicyId.setOid(Integer.valueOf(893453));
house2.setInsuranceId(newInsurancePolicyId);
House newHouse = new House();
newHouse.setLocation("123 Slater Street");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/UnitOfWorkCommitResumeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/UnitOfWorkCommitResumeTest.java
index 2e7f88e..e08de08 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/UnitOfWorkCommitResumeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/UnitOfWorkCommitResumeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,7 @@ protected void changeUnitOfWorkWorkingCopy() {
Vector responsibilities;
Vector languages;
Language language;
- String suffix = (new Integer(changeVersion)).toString();
+ String suffix = (Integer.valueOf(changeVersion)).toString();
//Root object changed
employee.setFirstName("First " + suffix);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/AnotherClient.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/AnotherClient.java
index 505234c..257bd7e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/AnotherClient.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/AnotherClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void run() {
raq.setReferenceClass(org.eclipse.persistence.testing.models.employee.domain.Project.class);
Vector projects = (Vector)unitOfWork.executeQuery(raq);
org.eclipse.persistence.testing.models.employee.domain.Project project = (org.eclipse.persistence.testing.models.employee.domain.Project)projects.elementAt(this.index);
- project.setName(new Integer(this.index).toString());
+ project.setName(Integer.valueOf(this.index).toString());
this.unitOfWork.commit();
} catch (Exception exception) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/ClientServerSequenceDeadlockTest2.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/ClientServerSequenceDeadlockTest2.java
index f32f79b..a81f93c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/ClientServerSequenceDeadlockTest2.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/ClientServerSequenceDeadlockTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -100,7 +100,7 @@ public void test() {
}
if (firstHalfDoneForAll) {
for (int j = 0; j < NUM_CLIENTS; j++) {
- fifoInArray[j].insertTail(new Boolean(true));
+ fifoInArray[j].insertTail(Boolean.valueOf(true));
}
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient.java
index b0e6a80..31e65e9 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ public void run() {
uow.commit();
if (fifoOut != null) {
- fifoOut.insertTail(new Integer(i));
+ fifoOut.insertTail(Integer.valueOf(i));
}
}
} catch (Exception e) {
@@ -63,7 +63,7 @@ public void run() {
this.server = null;
if (fifoOut != null) {
- fifoOut.insertTail(new Integer(-1));
+ fifoOut.insertTail(Integer.valueOf(-1));
}
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient2.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient2.java
index c6cd83e..92ae6bc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient2.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/EmployeeSeqDeadlockClient2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,7 +42,7 @@ public void run() {
((ClientSession)clientSession).getSequencing().getNextValue(SmallProject.class);
}
if (fifoOut != null) {
- fifoOut.insertTail(new Integer(i));
+ fifoOut.insertTail(Integer.valueOf(i));
}
// System.out.println(getName() + " " + i);
@@ -80,7 +80,7 @@ public void run() {
this.server = null;
if (fifoOut != null) {
- fifoOut.insertTail(new Integer(-1));
+ fifoOut.insertTail(Integer.valueOf(-1));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadAggregateDirectMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadAggregateDirectMapMapping.java
index e48a1c5..f07d47b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadAggregateDirectMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadAggregateDirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,10 +54,10 @@ public void setup(){
AggregateDirectMapHolder holder = new AggregateDirectMapHolder();
AggregateMapKey mapKey = new AggregateMapKey();
mapKey.setKey(1);
- holder.addAggregateToDirectMapItem(mapKey, new Integer(1));
+ holder.addAggregateToDirectMapItem(mapKey, Integer.valueOf(1));
AggregateMapKey mapKey2 = new AggregateMapKey();
mapKey2.setKey(2);
- holder.addAggregateToDirectMapItem(mapKey2, new Integer(2));
+ holder.addAggregateToDirectMapItem(mapKey2, Integer.valueOf(2));
uow.registerObject(holder);
uow.commit();
holderExp = (new ExpressionBuilder()).get("id").equal(holder.getId());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectAggregateMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectAggregateMapMapping.java
index 53d84ad..41bb776 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectAggregateMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectAggregateMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,10 +54,10 @@ public void setup(){
DirectAggregateMapHolder holder = new DirectAggregateMapHolder();
AggregateMapValue value = new AggregateMapValue();
value.setValue(1);
- holder.addDirectToAggregateMapItem(new Integer(1), value);
+ holder.addDirectToAggregateMapItem(Integer.valueOf(1), value);
value = new AggregateMapValue();
value.setValue(2);
- holder.addDirectToAggregateMapItem(new Integer(2), value);
+ holder.addDirectToAggregateMapItem(Integer.valueOf(2), value);
uow.registerObject(holder);
uow.commit();
holderExp = (new ExpressionBuilder()).get("id").equal(holder.getId());
@@ -80,7 +80,7 @@ public void verify(){
if (holder.getDirectToAggregateMap().size() != 2){
throw new TestErrorException("Incorrect Number of Map values was read.");
}
- AggregateMapValue value = (AggregateMapValue)holder.getDirectToAggregateMap().get(new Integer(1));
+ AggregateMapValue value = (AggregateMapValue)holder.getDirectToAggregateMap().get(Integer.valueOf(1));
if (value.getValue() != 1){
throw new TestErrorException("Incorrect map value was read.");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectDirectMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectDirectMapMapping.java
index e52603b..c5b7733 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectDirectMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectDirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,8 +51,8 @@ public void setup(){
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectDirectMapHolder holder = new DirectDirectMapHolder();
- holder.addDirectToDirectMapItem(new Integer(1), new Integer(1));
- holder.addDirectToDirectMapItem(new Integer(2), new Integer(2));
+ holder.addDirectToDirectMapItem(Integer.valueOf(1), Integer.valueOf(1));
+ holder.addDirectToDirectMapItem(Integer.valueOf(2), Integer.valueOf(2));
uow.registerObject(holder);
uow.commit();
holderExp = (new ExpressionBuilder()).get("id").equal(holder.getId());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntity1MMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntity1MMapMapping.java
index ba69355..5357fc5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntity1MMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntity1MMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,12 +57,12 @@ public void setup(){
DEOTMMapValue value = new DEOTMMapValue();
value.setId(1);
value.getHolder().setValue(initialHolder);
- initialHolder.addDirectToEntityMapItem(new Integer(11), value);
+ initialHolder.addDirectToEntityMapItem(Integer.valueOf(11), value);
DEOTMMapValue value2 = new DEOTMMapValue();
value2.setId(2);
value2.getHolder().setValue(initialHolder);
- initialHolder.addDirectToEntityMapItem(new Integer(22), value2);
+ initialHolder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
uow.registerObject(initialHolder);
uow.registerObject(value);
uow.registerObject(value2);
@@ -87,7 +87,7 @@ public void verify(){
if (holder.getDirectToEntityMap().size() != 2){
throw new TestErrorException("Incorrect Number of MapEntityValues was read.");
}
- DEOTMMapValue value = (DEOTMMapValue)holder.getDirectToEntityMap().get(new Integer(11));
+ DEOTMMapValue value = (DEOTMMapValue)holder.getDirectToEntityMap().get(Integer.valueOf(11));
if (value.getId() != 1){
throw new TestErrorException("Incorrect MapEntityValues was read.");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityMapMapping.java
index b487a18..a0e0155 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,12 +56,12 @@ public void setup(){
DirectEntityMapHolder holder = new DirectEntityMapHolder();
EntityMapValue value = new EntityMapValue();
value.setId(1);
- holder.addDirectToEntityMapItem(new Integer(11), value);
+ holder.addDirectToEntityMapItem(Integer.valueOf(11), value);
EntityMapValue value2 = new EntityMapValue();
value2.setId(2);
- holder.addDirectToEntityMapItem(new Integer(22), value2);
+ holder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
uow.registerObject(holder);
uow.registerObject(value);
uow.registerObject(value2);
@@ -87,7 +87,7 @@ public void verify(){
if (holder.getDirectToEntityMap().size() != 2){
throw new TestErrorException("Incorrect Number of MapEntityValues was read.");
}
- EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(new Integer(11));
+ EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(Integer.valueOf(11));
if (value.getId() != 1){
throw new TestErrorException("Incorrect MapEntityValues was read.");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityU1MMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityU1MMapMapping.java
index 73428e8..9021035 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityU1MMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadDirectEntityU1MMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,12 +57,12 @@ public void setup(){
DirectEntityU1MMapHolder holder = new DirectEntityU1MMapHolder();
EntityMapValue value = new EntityMapValue();
value.setId(1);
- holder.addDirectToEntityMapItem(new Integer(11), value);
+ holder.addDirectToEntityMapItem(Integer.valueOf(11), value);
EntityMapValue value2 = new EntityMapValue();
value2.setId(2);
- holder.addDirectToEntityMapItem(new Integer(22), value2);
+ holder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
uow.registerObject(holder);
uow.registerObject(value);
uow.registerObject(value2);
@@ -88,7 +88,7 @@ public void verify(){
if (holder.getDirectToEntityMap().size() != 2){
throw new TestErrorException("Incorrect Number of MapEntityValues was read.");
}
- EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(new Integer(11));
+ EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(Integer.valueOf(11));
if (value.getId() != 1){
throw new TestErrorException("Incorrect MapEntityValues was read.");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadEntityDirectMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadEntityDirectMapMapping.java
index 154579e..01baa46 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadEntityDirectMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestReadEntityDirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,12 +57,12 @@ public void setup(){
mapKey.setId(1);
mapKey.setData("11");
uow.registerObject(mapKey);
- holder.addEntityDirectMapItem(mapKey, new Integer(1));
+ holder.addEntityDirectMapItem(mapKey, Integer.valueOf(1));
EntityMapKey mapKey2 = new EntityMapKey();
mapKey2.setId(2);
mapKey2.setData("22");
uow.registerObject(mapKey2);
- holder.addEntityDirectMapItem(mapKey2, new Integer(2));
+ holder.addEntityDirectMapItem(mapKey2, Integer.valueOf(2));
uow.registerObject(holder);
uow.commit();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateAggregateDirectMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateAggregateDirectMapMapping.java
index 56b9413..114cb15 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateAggregateDirectMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateAggregateDirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,7 @@ public void test(){
holder.removeAggregateToDirectMapItem(mapKey);
mapKey = new AggregateMapKey();
mapKey.setKey(3);
- holder.addAggregateToDirectMapItem(mapKey, new Integer(3));
+ holder.addAggregateToDirectMapItem(mapKey, Integer.valueOf(3));
uow.commit();
Object holderForComparison = uow.readObject(holder);
if (!compareObjects(holder, holderForComparison)){
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectAggregateMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectAggregateMapMapping.java
index 279404f..2e8c2b1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectAggregateMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectAggregateMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,10 +27,10 @@ public void test(){
UnitOfWork uow = getSession().acquireUnitOfWork();
holders = uow.readAllObjects(DirectAggregateMapHolder.class, holderExp);
changedHolder = (DirectAggregateMapHolder)holders.get(0);
- changedHolder.removeDirectToAggregateMapItem(new Integer(1));
+ changedHolder.removeDirectToAggregateMapItem(Integer.valueOf(1));
AggregateMapValue mapValue = new AggregateMapValue();
mapValue.setValue(3);
- changedHolder.addDirectToAggregateMapItem(new Integer(3), mapValue);
+ changedHolder.addDirectToAggregateMapItem(Integer.valueOf(3), mapValue);
uow.commit();
Object holderForComparison = uow.readObject(changedHolder);
if (!compareObjects(changedHolder, holderForComparison)){
@@ -46,10 +46,10 @@ public void verify(){
if (!compareObjects(holder, changedHolder)){
throw new TestErrorException("Objects do not match reinitialize");
}
- if (holder.getDirectToAggregateMap().containsKey(new Integer(1))){
+ if (holder.getDirectToAggregateMap().containsKey(Integer.valueOf(1))){
throw new TestErrorException("Item that was removed is still present in map.");
}
- AggregateMapValue value = (AggregateMapValue)holder.getDirectToAggregateMap().get(new Integer(3));
+ AggregateMapValue value = (AggregateMapValue)holder.getDirectToAggregateMap().get(Integer.valueOf(3));
if (value.getValue() != 3){
throw new TestErrorException("Item was not correctly added to map");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectDirectMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectDirectMapMapping.java
index 9c70dcf..809764e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectDirectMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectDirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,8 +26,8 @@ public void test(){
UnitOfWork uow = getSession().acquireUnitOfWork();
holders = uow.readAllObjects(DirectDirectMapHolder.class, holderExp);
changedHolder = (DirectDirectMapHolder)holders.get(0);
- changedHolder.removeDirectToDirectMapItem(new Integer(1));
- changedHolder.addDirectToDirectMapItem(new Integer(3), new Integer(3));
+ changedHolder.removeDirectToDirectMapItem(Integer.valueOf(1));
+ changedHolder.addDirectToDirectMapItem(Integer.valueOf(3), Integer.valueOf(3));
uow.commit();
Object holderForComparison = uow.readObject(changedHolder);
if (!compareObjects(changedHolder, holderForComparison)){
@@ -43,10 +43,10 @@ public void verify(){
if (!compareObjects(holder, changedHolder)){
throw new TestErrorException("Objects do not match reinitialize");
}
- if (holder.getDirectToDirectMap().containsKey(new Integer(1))){
+ if (holder.getDirectToDirectMap().containsKey(Integer.valueOf(1))){
throw new TestErrorException("Item that was removed is still present in map.");
}
- Integer value = (Integer)holder.getDirectToDirectMap().get(new Integer(3));
+ Integer value = (Integer)holder.getDirectToDirectMap().get(Integer.valueOf(3));
if (value.intValue() != 3){
throw new TestErrorException("Item was not correctly added to map");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntity1MMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntity1MMapMapping.java
index 54996d6..09c671a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntity1MMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntity1MMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,12 +52,12 @@ public void test(){
UnitOfWork uow = getSession().acquireUnitOfWork();
holders = uow.readAllObjects(DirectEntity1MMapHolder.class, holderExp);
changedHolder = (DirectEntity1MMapHolder)holders.get(0);
- changedHolder.removeDirectToEntityMapItem(new Integer(11));
+ changedHolder.removeDirectToEntityMapItem(Integer.valueOf(11));
DEOTMMapValue mapValue = new DEOTMMapValue();
mapValue.setId(3);
mapValue = (DEOTMMapValue)uow.registerObject(mapValue);
mapValue.getHolder().setValue(changedHolder);
- changedHolder.addDirectToEntityMapItem(new Integer(33), mapValue);
+ changedHolder.addDirectToEntityMapItem(Integer.valueOf(33), mapValue);
uow.commit();
}
@@ -68,10 +68,10 @@ public void verify(){
if (!compareObjects(holder, changedHolder)){
throw new TestErrorException("Objects do not match reinitialize");
}
- if (holder.getDirectToEntityMap().containsKey(new Integer(1))){
+ if (holder.getDirectToEntityMap().containsKey(Integer.valueOf(1))){
throw new TestErrorException("Item that was removed is still present in map.");
}
- DEOTMMapValue value = (DEOTMMapValue)holder.getDirectToEntityMap().get(new Integer(33));
+ DEOTMMapValue value = (DEOTMMapValue)holder.getDirectToEntityMap().get(Integer.valueOf(33));
if (value.getId() != 3){
throw new TestErrorException("Item was not correctly added to map");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityMapMapping.java
index 57e2e5f..fac2a79 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,12 +54,12 @@ public void setup(){
holder = new DirectEntityMapHolder();
EntityMapValue value = new EntityMapValue();
value.setId(1);
- holder.addDirectToEntityMapItem(new Integer(11), value);
+ holder.addDirectToEntityMapItem(Integer.valueOf(11), value);
EntityMapValue value2 = new EntityMapValue();
value2.setId(2);
- holder.addDirectToEntityMapItem(new Integer(22), value2);
+ holder.addDirectToEntityMapItem(Integer.valueOf(22), value2);
uow.registerObject(holder);
uow.registerObject(value);
uow.registerObject(value2);
@@ -76,9 +76,9 @@ public void test(){
changedHolder = (DirectEntityMapHolder)uow.readObject(holder);
EntityMapValue value = new EntityMapValue();
value.setId(3);
- changedHolder.addDirectToEntityMapItem(new Integer(33), value);
+ changedHolder.addDirectToEntityMapItem(Integer.valueOf(33), value);
- changedHolder.getDirectToEntityMap().remove(new Integer(11));
+ changedHolder.getDirectToEntityMap().remove(Integer.valueOf(11));
uow.commit();
Object holderForComparison = uow.readObject(holder);
if (!compareObjects(changedHolder, holderForComparison)){
@@ -95,7 +95,7 @@ public void verify(){
if (holder.getDirectToEntityMap().size() != 2){
throw new TestErrorException("Incorrect Number of MapEntityValues was read.");
}
- EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(new Integer(33));
+ EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(Integer.valueOf(33));
if (value.getId() != 3){
throw new TestErrorException("MapEntityValue was not added properly.");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityU1MMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityU1MMapMapping.java
index 62453a6..006316b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityU1MMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateDirectEntityU1MMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,11 +51,11 @@ public void test(){
UnitOfWork uow = getSession().acquireUnitOfWork();
holders = uow.readAllObjects(DirectEntityU1MMapHolder.class, holderExp);
changedHolder = (DirectEntityU1MMapHolder)holders.get(0);
- changedHolder.removeDirectToEntityMapItem(new Integer(11));
+ changedHolder.removeDirectToEntityMapItem(Integer.valueOf(11));
EntityMapValue mapValue = new EntityMapValue();
mapValue.setId(3);
mapValue = (EntityMapValue)uow.registerObject(mapValue);
- changedHolder.addDirectToEntityMapItem(new Integer(33), mapValue);
+ changedHolder.addDirectToEntityMapItem(Integer.valueOf(33), mapValue);
uow.commit();
Object holderForComparison = uow.readObject(changedHolder);
if (!compareObjects(changedHolder, holderForComparison)){
@@ -70,10 +70,10 @@ public void verify(){
if (!compareObjects(holder, changedHolder)){
throw new TestErrorException("Objects do not match reinitialize");
}
- if (holder.getDirectToEntityMap().containsKey(new Integer(1))){
+ if (holder.getDirectToEntityMap().containsKey(Integer.valueOf(1))){
throw new TestErrorException("Item that was removed is still present in map.");
}
- EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(new Integer(33));
+ EntityMapValue value = (EntityMapValue)holder.getDirectToEntityMap().get(Integer.valueOf(33));
if (value.getId() != 3){
throw new TestErrorException("Item was not correctly added to map");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateEntityDirectMapMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateEntityDirectMapMapping.java
index 10a7f6c..b448666 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateEntityDirectMapMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/collections/map/TestUpdateEntityDirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,7 +61,7 @@ public void test(){
mapKey.setId(3);
mapKey.setData("testData");
mapKey = (EntityMapKey)uow.registerObject(mapKey);
- changedHolder.addEntityDirectMapItem(mapKey, new Integer(3));
+ changedHolder.addEntityDirectMapItem(mapKey, Integer.valueOf(3));
uow.commit();
Object holderForComparison = uow.readObject(changedHolder);
if (!compareObjects(changedHolder, holderForComparison)){
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerTestModel.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerTestModel.java
index ea3ef78..d7255a6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerTestModel.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -164,51 +164,51 @@ public TestSuite getConvertObjectTestSuite() {
suite.addTest(new ConvertObjectTest(new java.math.BigInteger("100"), ClassConstants.BIGDECIMAL));
suite.addTest(new ConvertObjectTest(new java.math.BigInteger("100"), ClassConstants.BIGINTEGER));
suite.addTest(new ConvertObjectTest(new String("100"), ClassConstants.BIGINTEGER));
- suite.addTest(new ConvertObjectTest(new Integer(100), ClassConstants.BIGINTEGER));
- suite.addTest(new ConvertObjectTest(new Character('1'), ClassConstants.BOOLEAN));
- suite.addTest(new ConvertObjectTest(new Character('t'), ClassConstants.BOOLEAN));
- suite.addTest(new ConvertObjectTest(new Character('0'), ClassConstants.BOOLEAN));
- suite.addTest(new ConvertObjectTest(new Character('f'), ClassConstants.BOOLEAN));
+ suite.addTest(new ConvertObjectTest(Integer.valueOf(100), ClassConstants.BIGINTEGER));
+ suite.addTest(new ConvertObjectTest(Character.valueOf('1'), ClassConstants.BOOLEAN));
+ suite.addTest(new ConvertObjectTest(Character.valueOf('t'), ClassConstants.BOOLEAN));
+ suite.addTest(new ConvertObjectTest(Character.valueOf('0'), ClassConstants.BOOLEAN));
+ suite.addTest(new ConvertObjectTest(Character.valueOf('f'), ClassConstants.BOOLEAN));
suite.addTest(new ConvertObjectTest(Helper.buildHexStringFromBytes(new byte[] { 4 }), ClassConstants.PBYTE));
- suite.addTest(new ConvertObjectTest(new Integer(100), ClassConstants.CHAR));
+ suite.addTest(new ConvertObjectTest(Integer.valueOf(100), ClassConstants.CHAR));
//suite.addTest(new ConvertObjectTest(new org.eclipse.persistence.internal.helper.Date(1), ClassConstants.SQLDATE));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.SQLDATE));
- suite.addTest(new ConvertObjectTest(new Long(100), ClassConstants.SQLDATE));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.LONG));
- suite.addTest(new ConvertObjectTest(new Boolean("false"), ClassConstants.LONG));
+ suite.addTest(new ConvertObjectTest(Long.valueOf(100), ClassConstants.SQLDATE));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.LONG));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("false"), ClassConstants.LONG));
suite.addTest(new ConvertObjectTest(new String("1"), ClassConstants.NUMBER));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.NUMBER));
- suite.addTest(new ConvertObjectTest(new Boolean("false"), ClassConstants.NUMBER));
- suite.addTest(new ConvertObjectTest(new Integer(1), ClassConstants.SHORT));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.SHORT));
- suite.addTest(new ConvertObjectTest(new Boolean("false"), ClassConstants.SHORT));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.NUMBER));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("false"), ClassConstants.NUMBER));
+ suite.addTest(new ConvertObjectTest(Integer.valueOf(1), ClassConstants.SHORT));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.SHORT));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("false"), ClassConstants.SHORT));
//suite.addTest(new ConvertObjectTest(new org.eclipse.persistence.internal.helper.Time(100), ClassConstants.TIME));
suite.addTest(new ConvertObjectTest(new String("12:00:00"), ClassConstants.TIME));
suite.addTest(new ConvertObjectTest(new java.util.Date(100), ClassConstants.TIME));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.TIME));
- suite.addTest(new ConvertObjectTest(new Long(100), ClassConstants.TIME));
+ suite.addTest(new ConvertObjectTest(Long.valueOf(100), ClassConstants.TIME));
//suite.addTest(new ConvertObjectTest(new org.eclipse.persistence.internal.helper.Timestamp(100), ClassConstants.TIMESTAMP));
suite.addTest(new ConvertObjectTest(new String("12:00:00"), ClassConstants.TIMESTAMP));
suite.addTest(new ConvertObjectTest(new java.util.Date(100), ClassConstants.TIMESTAMP));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.TIMESTAMP));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.UTILDATE));
- suite.addTest(new ConvertObjectTest(new Long(100), ClassConstants.UTILDATE));
+ suite.addTest(new ConvertObjectTest(Long.valueOf(100), ClassConstants.UTILDATE));
// test exception handling
- suite.addTest(new ConvertObjectTest(new Character('1'), ClassConstants.BIGDECIMAL, true));
- suite.addTest(new ConvertObjectTest(new Character('1'), ClassConstants.BIGINTEGER, true));
+ suite.addTest(new ConvertObjectTest(Character.valueOf('1'), ClassConstants.BIGDECIMAL, true));
+ suite.addTest(new ConvertObjectTest(Character.valueOf('1'), ClassConstants.BIGINTEGER, true));
suite.addTest(new ConvertObjectTest(new String("a"), ClassConstants.BIGINTEGER, true));
suite.addTest(new ConvertObjectTest(new java.sql.Date(1), ClassConstants.BOOLEAN, true));
suite.addTest(new ConvertObjectTest(new java.sql.Date(1), ClassConstants.BYTE, true));
suite.addTest(new ConvertObjectTest(new String("a"), ClassConstants.BYTE, true));
suite.addTest(new ConvertObjectTest(new char[] { 'a' }, ClassConstants.APBYTE, true));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.CHAR, true));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.SQLDATE, true));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.SQLDATE, true));
suite.addTest(new ConvertObjectTest(new String("a"), ClassConstants.DOUBLE, true));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.DOUBLE, true));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.DOUBLE, true));
suite.addTest(new ConvertObjectTest(new String("a"), ClassConstants.FLOAT, true));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.FLOAT, true));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.FLOAT, true));
suite.addTest(new ConvertObjectTest(new java.sql.Date(1), ClassConstants.INTEGER, true));
suite.addTest(new ConvertObjectTest(new String("a"), ClassConstants.LONG, true));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.LONG, true));
@@ -216,10 +216,10 @@ public TestSuite getConvertObjectTestSuite() {
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.NUMBER, true));
suite.addTest(new ConvertObjectTest(new String("a"), ClassConstants.SHORT, true));
suite.addTest(new ConvertObjectTest(new java.util.GregorianCalendar(), ClassConstants.SHORT, true));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.TIME, true));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.TIMESTAMP, true));
- suite.addTest(new ConvertObjectTest(new Boolean("true"), ClassConstants.UTILDATE, true));
- suite.addTest(new ConvertObjectTest(new Integer(1), ConversionManager.class, true));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.TIME, true));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.TIMESTAMP, true));
+ suite.addTest(new ConvertObjectTest(Boolean.valueOf("true"), ClassConstants.UTILDATE, true));
+ suite.addTest(new ConvertObjectTest(Integer.valueOf(1), ConversionManager.class, true));
suite.addTest(new ConvertByteCharArrayToStringTest());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/DataReadQueryTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/DataReadQueryTest.java
index efcaece..89334ae 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/DataReadQueryTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/DataReadQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,7 +42,7 @@ public void test() {
getSession().removeQuery("dblogin");
getSession().addQuery("dblogin", readQuery);
Vector args = new Vector(1);
- args.addElement(new Integer(1));
+ args.addElement(Integer.valueOf(1));
try {
Vector vResult = (Vector)getSession().executeQuery("dblogin", args);
} catch (ClassCastException e) {
@@ -52,7 +52,7 @@ public void test() {
readQuery = new DataReadQuery();
call = new StoredProcedureCall();
call.setProcedureName("Select_Employee_using_Output");
- call.addNamedArgumentValue("ARG1", new Integer(1));
+ call.addNamedArgumentValue("ARG1", Integer.valueOf(1));
call.addNamedOutputArgument("VERSION", "VERSION", java.math.BigDecimal.class);
readQuery.setCall(call);
try {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/EmployeeCustomSQLSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/EmployeeCustomSQLSystem.java
index c4ab69e..48cdc5a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/EmployeeCustomSQLSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/EmployeeCustomSQLSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1094,7 +1094,7 @@ protected void setSybaseSQL(Session session) {
call.addNamedArgument("VERSION");
call.addNamedArgument("START_TIME");
call.addNamedArgument("END_TIME");
- call.addNamedInOutputArgumentValue("OUT_VERSION", new Long(0), "EMPLOYEE.VERSION", Long.class);
+ call.addNamedInOutputArgumentValue("OUT_VERSION", Long.valueOf(0), "EMPLOYEE.VERSION", Long.class);
insertQuery.setCall(call);
empDescriptor.getQueryManager().setInsertQuery(insertQuery);
@@ -1167,7 +1167,7 @@ private static void setSQLAnywhereSQL(final Session session) {
// After this is fixed (m.b. in SQLAnywhere 11?) the order of the attributes should be returned to original
// (where it does NOT follow the order of sp parameters).
insertEmployeeCall.addNamedArgument("_VERSION", "VERSION");
- insertEmployeeCall.addNamedInOutputArgumentValue("_OUT_VERSION", new Long(0), "EMPLOYEE.VERSION", Long.class);
+ insertEmployeeCall.addNamedInOutputArgumentValue("_OUT_VERSION", Long.valueOf(0), "EMPLOYEE.VERSION", Long.class);
employeeDescriptor.getQueryManager().setInsertQuery(new InsertObjectQuery(insertEmployeeCall));
final StoredProcedureCall updateEmployeeCall = new StoredProcedureCall();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcWithOutputParamsAndResultSetTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcWithOutputParamsAndResultSetTest.java
index a17dc45..cd14ee8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcWithOutputParamsAndResultSetTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcWithOutputParamsAndResultSetTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,7 +78,7 @@ public void test() {
spCall.setProcedureName("Select_Output_and_ResultSet");
spCall.addNamedArgument("ARG1", "argument");
if (useInOut) {
- spCall.addNamedInOutputArgumentValue("VERSION", new Long(0), "VERSION", java.math.BigDecimal.class);
+ spCall.addNamedInOutputArgumentValue("VERSION", Long.valueOf(0), "VERSION", java.math.BigDecimal.class);
} else {
spCall.addNamedOutputArgument("VERSION", "VERSION", BigDecimal.class);
}
@@ -93,9 +93,9 @@ public void test() {
getSession().removeQuery("dblogin");
getSession().addQuery("dblogin", readQuery);
Vector args = new Vector(2);
- args.addElement(new Integer(1));
+ args.addElement(Integer.valueOf(1));
if (useCustomSQL && useInOut) {
- args.addElement(new Long(0));
+ args.addElement(Long.valueOf(0));
}
try {
Vector vResult = (Vector)getSession().executeQuery("dblogin", args);
@@ -109,9 +109,9 @@ public void test() {
} else {
spCall = new StoredProcedureCall();
spCall.setProcedureName("Select_Output_and_ResultSet");
- spCall.addNamedArgumentValue("ARG1", new Integer(1));
+ spCall.addNamedArgumentValue("ARG1", Integer.valueOf(1));
if (useInOut) {
- spCall.addNamedInOutputArgumentValue("VERSION", new Long(0), "VERSION", java.math.BigDecimal.class);
+ spCall.addNamedInOutputArgumentValue("VERSION", Long.valueOf(0), "VERSION", java.math.BigDecimal.class);
} else {
spCall.addNamedOutputArgument("VERSION", "VERSION", BigDecimal.class);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureObjectRelationalParameters.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureObjectRelationalParameters.java
index 4820265..ef9686a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureObjectRelationalParameters.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureObjectRelationalParameters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ public class StoredProcedureObjectRelationalParameters extends TestCase{
Object result = null;
Vector results2, results3 = null;
Address originalAddress;
- Long policyHolderIdToUse = new Long(12345);
+ Long policyHolderIdToUse = Long.valueOf(12345);
boolean useCustomSQL;
public StoredProcedureObjectRelationalParameters() {
@@ -73,7 +73,7 @@ public void test() {
Vector args = new Vector();
args.addElement(policyHolderIdToUse);//ssn
args.addElement(null);//occupation
- args.addElement(new Character('M'));//sex
+ args.addElement(Character.valueOf('M'));//sex
args.addElement("Chris");//firstName
args.addElement(null);//birthDate
args.addElement("Random");//lastName
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest.java
index aeb0937..b916a5f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,7 +41,7 @@ public void setup() {
}
public void test() {
- Integer id = new Integer(12);
+ Integer id = Integer.valueOf(12);
String name = "James";
StoredProcedureCall call = new StoredProcedureCall();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest2.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest2.java
index a4dcfea..7ed602d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest2.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@ public void test() {
query.addArgument("P_ID");
Vector args = new Vector(1);
- args.addElement(new Integer(id));
+ args.addElement(Integer.valueOf(id));
row = (DatabaseRecord)((Vector)getSession().executeQuery(query, args)).firstElement();
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest_Inout_Out_In.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest_Inout_Out_In.java
index 17027ec..e388628 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest_Inout_Out_In.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/customsqlstoredprocedures/StoredProcedureTest_Inout_Out_In.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,8 +26,8 @@ public class StoredProcedureTest_Inout_Out_In extends TestCase {
boolean useCustomSQL;
boolean useArgumentNames;
boolean shouldBindAllParameters;
- Integer in = new Integer(1);
- Integer inout = new Integer(2);
+ Integer in = Integer.valueOf(1);
+ Integer inout = Integer.valueOf(2);
static final int PROC = 0;
static final int FUNC = 1;
@@ -144,8 +144,8 @@ public void verify() {
Number inoutExpected = in;
Number outExpected = inout;
- Integer inoutReturned = new Integer(((Number)row.get("P_INOUT")).intValue());
- Integer outReturned = new Integer(((Number)row.get("P_OUT")).intValue());
+ Integer inoutReturned = Integer.valueOf(((Number)row.get("P_INOUT")).intValue());
+ Integer outReturned = Integer.valueOf(((Number)row.get("P_OUT")).intValue());
if (!inoutExpected.equals(inoutReturned)) {
throw new TestErrorException("Invalid value P_INOUT = " + inoutReturned + "; should be " + inoutExpected);
@@ -155,7 +155,7 @@ public void verify() {
}
if (mode == FUNC) {
- Integer result = new Integer(((Number)row.get("RESULT")).intValue());
+ Integer result = Integer.valueOf(((Number)row.get("RESULT")).intValue());
if (!result.equals(outReturned)) {
throw new TestErrorException("Invalid value RESULT = " + result + "; should be " + outReturned);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingBatchReadTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingBatchReadTest.java
index acae541..841f8da 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingBatchReadTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingBatchReadTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,12 +54,12 @@ public void postExecuteQuery(SessionEvent event) {
// Create a directmapmapping with a few items in it
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectMapMappings maps1 = (DirectMapMappings)uow.registerObject(new DirectMapMappings());
- maps1.directMap.put(new Integer(1), "guy");
- maps1.directMap.put(new Integer(2), "axemen");
+ maps1.directMap.put(Integer.valueOf(1), "guy");
+ maps1.directMap.put(Integer.valueOf(2), "axemen");
DirectMapMappings maps2 = (DirectMapMappings)uow.registerObject(new DirectMapMappings());
- maps2.directMap.put(new Integer(1), "steve");
- maps2.directMap.put(new Integer(2), "superman");
+ maps2.directMap.put(Integer.valueOf(1), "steve");
+ maps2.directMap.put(Integer.valueOf(2), "superman");
uow.commit();
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java
index 0f9d304..d2f5e53 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,14 +50,14 @@ public void test() throws Exception {
// Create a directmapmapping with a few items in it
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectMapMappings maps1 = (DirectMapMappings)uow.registerObject(new DirectMapMappings());
- maps1.directMap.put(new Integer(1), "guy");
- maps1.directMap.put(new Integer(2), "axemen");
+ maps1.directMap.put(Integer.valueOf(1), "guy");
+ maps1.directMap.put(Integer.valueOf(2), "axemen");
uow.commit();
// Read the same directmapping back and delete an item from it
UnitOfWork uow2 = getSession().acquireUnitOfWork();
DirectMapMappings maps2 = (DirectMapMappings)uow2.readObject(DirectMapMappings.class);
- maps2.directMap.remove(new Integer(2));
+ maps2.directMap.remove(Integer.valueOf(2));
uow2.commit();
// Clear the cache
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java
index a935293..0bd3f7c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,9 +51,9 @@ public void test() throws Exception {
// Create a hashmap with a null in it.
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectMapMappings maps = (DirectMapMappings)uow.registerObject(new DirectMapMappings());
- maps.directHashMap.put(new Integer(1), "item1");
- maps.directHashMap.put(new Integer(2), "item2");
- maps.directHashMap.put(new Integer(3), null);
+ maps.directHashMap.put(Integer.valueOf(1), "item1");
+ maps.directHashMap.put(Integer.valueOf(2), "item2");
+ maps.directHashMap.put(Integer.valueOf(3), null);
try {
uow.commit();
@@ -77,7 +77,7 @@ public void verify() throws Exception {
throw new TestErrorException("Incorrect amount of items in the hashmap.");
}
- if (queryResult.directHashMap.get(new Integer(3)) != null) {
+ if (queryResult.directHashMap.get(Integer.valueOf(3)) != null) {
throw new TestErrorException("The null value was not read back in correctly.");
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingIndirectionTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingIndirectionTest.java
index 3631343..2d19d86 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingIndirectionTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingIndirectionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,8 +45,8 @@ public void test() throws Exception {
// Create a directmapmapping with a few items in it
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectMapMappings maps1 = (DirectMapMappings)uow.registerObject(new DirectMapMappings());
- maps1.indirectionDirectMap.put(new Integer(1), "guy");
- maps1.indirectionDirectMap.put(new Integer(2), "axemen");
+ maps1.indirectionDirectMap.put(Integer.valueOf(1), "guy");
+ maps1.indirectionDirectMap.put(Integer.valueOf(2), "axemen");
uow.commit();
getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingsSerializedConverterTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingsSerializedConverterTestCase.java
index 6e5432c..a44484e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingsSerializedConverterTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingsSerializedConverterTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,8 +36,8 @@ public void test() {
// Create a directmapmapping with a few items in it
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectMapMappings m1 = new DirectMapMappings();
- m1.blobDirectMap.put(new Integer(1), new Integer(1));
- m1.blobDirectMap.put(new Integer(2), new Integer(2));
+ m1.blobDirectMap.put(Integer.valueOf(1), Integer.valueOf(1));
+ m1.blobDirectMap.put(Integer.valueOf(2), Integer.valueOf(2));
DirectMapMappings maps1 = (DirectMapMappings)uow.registerObject(m1);
uow.commit();
@@ -47,7 +47,7 @@ public void verify() {
getSession().getIdentityMapAccessor().initializeIdentityMaps();
UnitOfWork uow = getSession().acquireUnitOfWork();
DirectMapMappings maps = (DirectMapMappings)uow.readObject(DirectMapMappings.class);
- if (!maps.blobDirectMap.get(new Integer(1)).equals(new Integer(1))) {
+ if (!maps.blobDirectMap.get(Integer.valueOf(1)).equals(Integer.valueOf(1))) {
throw new TestErrorException("The cloned direct map does not maintain the proper type when used with a SerializedObjectConverter.");
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java
index c7fb822..1608a53 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,14 +48,14 @@ public void test() throws Exception {
// put a new value in, will now be in the cache
UnitOfWork uow1 = getSession().acquireUnitOfWork();
DirectMapMappings maps = (DirectMapMappings)uow1.registerObject(new DirectMapMappings());
- maps.directMap.put(new Integer(1), "bogus");
- maps.directMap.put(new Integer(3), "third");
+ maps.directMap.put(Integer.valueOf(1), "bogus");
+ maps.directMap.put(Integer.valueOf(3), "third");
uow1.commit();
UnitOfWork uow2 = getSession().acquireUnitOfWork();
DirectMapMappings mapsClone = (DirectMapMappings)uow2.registerObject(maps);
- mapsClone.directMap.put(new Integer(2), "axemen");
- mapsClone.directMap.put(new Integer(1), "guy");
+ mapsClone.directMap.put(Integer.valueOf(2), "axemen");
+ mapsClone.directMap.put(Integer.valueOf(1), "guy");
UnitOfWorkChangeSet changes = uow2.getCurrentChanges();
uow2.commit();
@@ -66,15 +66,15 @@ public void test() throws Exception {
public void verify() throws Exception {
// Some checks to ensure it actually worked as expected
- if (!mapsQueryResult.directMap.containsKey(new Integer(1))) {
+ if (!mapsQueryResult.directMap.containsKey(Integer.valueOf(1))) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.get(new Integer(1)).equals("guy")) {
+ } else if (!mapsQueryResult.directMap.get(Integer.valueOf(1)).equals("guy")) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.containsKey(new Integer(2))) {
+ } else if (!mapsQueryResult.directMap.containsKey(Integer.valueOf(2))) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.get(new Integer(2)).equals("axemen")) {
+ } else if (!mapsQueryResult.directMap.get(Integer.valueOf(2)).equals("axemen")) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.containsKey(new Integer(3))) {
+ } else if (!mapsQueryResult.directMap.containsKey(Integer.valueOf(3))) {
throw new TestErrorException("Change set did not merge into cache properly");
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java
index 6242896..a15965e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,14 +47,14 @@ public void test() throws Exception {
// put a new value in, will now be in the cache
UnitOfWork uow1 = getSession().acquireUnitOfWork();
DirectMapMappings maps = (DirectMapMappings)uow1.registerObject(new DirectMapMappings());
- maps.directMap.put(new Integer(1), "bogus");
- maps.directMap.put(new Integer(3), "third");
+ maps.directMap.put(Integer.valueOf(1), "bogus");
+ maps.directMap.put(Integer.valueOf(3), "third");
uow1.commit();
UnitOfWork uow2 = getSession().acquireUnitOfWork();
DirectMapMappings mapsClone = (DirectMapMappings)uow2.registerObject(maps);
- mapsClone.directMap.put(new Integer(2), "axemen");
- mapsClone.directMap.put(new Integer(1), "guy");
+ mapsClone.directMap.put(Integer.valueOf(2), "axemen");
+ mapsClone.directMap.put(Integer.valueOf(1), "guy");
UnitOfWorkChangeSet changes = (UnitOfWorkChangeSet)uow2.getCurrentChanges();
uow2.release();
@@ -79,15 +79,15 @@ public void verify() throws Exception {
// Some checks to ensure it actually worked as expected
- if (!mapsQueryResult.directMap.containsKey(new Integer(1))) {
+ if (!mapsQueryResult.directMap.containsKey(Integer.valueOf(1))) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.get(new Integer(1)).equals("guy")) {
+ } else if (!mapsQueryResult.directMap.get(Integer.valueOf(1)).equals("guy")) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.containsKey(new Integer(2))) {
+ } else if (!mapsQueryResult.directMap.containsKey(Integer.valueOf(2))) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.get(new Integer(2)).equals("axemen")) {
+ } else if (!mapsQueryResult.directMap.get(Integer.valueOf(2)).equals("axemen")) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.directMap.containsKey(new Integer(3))) {
+ } else if (!mapsQueryResult.directMap.containsKey(Integer.valueOf(3))) {
throw new TestErrorException("Change set did not merge into cache properly");
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java
index 339295b..84bef47 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,14 +45,14 @@ public void test() throws Exception {
// put a new value in, will now be in the cache
UnitOfWork uow1 = getSession().acquireUnitOfWork();
DirectMapMappings maps = (DirectMapMappings)uow1.registerObject(new DirectMapMappings());
- maps.indirectionDirectMap.put(new Integer(1), "bogus");
- maps.indirectionDirectMap.put(new Integer(3), "third");
+ maps.indirectionDirectMap.put(Integer.valueOf(1), "bogus");
+ maps.indirectionDirectMap.put(Integer.valueOf(3), "third");
uow1.commit();
UnitOfWork uow2 = getSession().acquireUnitOfWork();
DirectMapMappings mapsClone = (DirectMapMappings)uow2.registerObject(maps);
- mapsClone.indirectionDirectMap.put(new Integer(2), "axemen");
- mapsClone.indirectionDirectMap.put(new Integer(1), "guy");
+ mapsClone.indirectionDirectMap.put(Integer.valueOf(2), "axemen");
+ mapsClone.indirectionDirectMap.put(Integer.valueOf(1), "guy");
UnitOfWorkChangeSet changes = (UnitOfWorkChangeSet)uow2.getCurrentChanges();
@@ -71,15 +71,15 @@ public void verify() throws Exception {
// Some checks to ensure it actually worked as expected
- if (!mapsQueryResult.indirectionDirectMap.containsKey(new Integer(1))) {
+ if (!mapsQueryResult.indirectionDirectMap.containsKey(Integer.valueOf(1))) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.indirectionDirectMap.get(new Integer(1)).equals("guy")) {
+ } else if (!mapsQueryResult.indirectionDirectMap.get(Integer.valueOf(1)).equals("guy")) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.indirectionDirectMap.containsKey(new Integer(2))) {
+ } else if (!mapsQueryResult.indirectionDirectMap.containsKey(Integer.valueOf(2))) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.indirectionDirectMap.get(new Integer(2)).equals("axemen")) {
+ } else if (!mapsQueryResult.indirectionDirectMap.get(Integer.valueOf(2)).equals("axemen")) {
throw new TestErrorException("Change set did not merge into cache properly");
- } else if (!mapsQueryResult.indirectionDirectMap.containsKey(new Integer(3))) {
+ } else if (!mapsQueryResult.indirectionDirectMap.containsKey(Integer.valueOf(3))) {
throw new TestErrorException("Change set did not merge into cache properly");
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DirectMapMergeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DirectMapMergeTest.java
index 11e4724..a9914c8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DirectMapMergeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DirectMapMergeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@ public DirectMapMergeTest() {
}
protected void modifyCollection(UnitOfWork uow, Object objectToModify) {
- ((DirectMapMappings)objectToModify).directMap.put(new Integer(11), newItemForCollection());
+ ((DirectMapMappings)objectToModify).directMap.put(Integer.valueOf(11), newItemForCollection());
}
protected int getCollectionSize(Object rootObject) {
@@ -46,7 +46,7 @@ protected Project getNewProject() {
protected Object buildOriginalObject() {
DirectMapMappings dm = new DirectMapMappings();
- dm.directMap.put(new Integer("1"), "first value");
+ dm.directMap.put(Integer.valueOf("1"), "first value");
return dm;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ChangeObjectNotSentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ChangeObjectNotSentTest.java
index e142a54..4ffc949 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ChangeObjectNotSentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ChangeObjectNotSentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@ public class ChangeObjectNotSentTest extends ConfigurableCacheSyncDistributedTes
public ChangeObjectNotSentTest() {
super();
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
}
public void setup() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableCacheSyncDistributedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableCacheSyncDistributedTest.java
index bb68b2e..fbe07f8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableCacheSyncDistributedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableCacheSyncDistributedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -125,7 +125,7 @@ public void setup() {
int cacheSyncType = descriptor.getCacheSynchronizationType();
Object newCacheSyncType = cacheSyncConfigValues.get(keyClass);
if (newCacheSyncType != null) {
- oldCacheSyncConfigValues.put(keyClass, new Integer(cacheSyncType));
+ oldCacheSyncConfigValues.put(keyClass, Integer.valueOf(cacheSyncType));
descriptor.setCacheSynchronizationType(((Integer)newCacheSyncType).intValue());
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableUpdateChangeObjectTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableUpdateChangeObjectTest.java
index 28ef572..5a8546e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableUpdateChangeObjectTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/ConfigurableUpdateChangeObjectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,7 +62,7 @@ public void setup() {
int cacheSyncType = descriptor.getCacheSynchronizationType();
Object newCacheSyncType = cacheSyncConfigValues.get(keyClass);
if (newCacheSyncType != null) {
- oldCacheSyncConfigValues.put(keyClass, new Integer(cacheSyncType));
+ oldCacheSyncConfigValues.put(keyClass, Integer.valueOf(cacheSyncType));
descriptor.setCacheSynchronizationType(((Integer)newCacheSyncType).intValue());
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/DeleteObjectNotSentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/DeleteObjectNotSentTest.java
index 5e919cf..6a6b6ea 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/DeleteObjectNotSentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/DeleteObjectNotSentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ public class DeleteObjectNotSentTest extends ConfigurableCacheSyncDistributedTes
public DeleteObjectNotSentTest() {
super();
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
}
public void setup() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidCacheSyncTypeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidCacheSyncTypeTest.java
index fc4fe47..3ab7275 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidCacheSyncTypeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidCacheSyncTypeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,7 @@ public InvalidCacheSyncTypeTest(int type) {
super();
setName("InvalidCacheSyncTypeTest(" + type + ")");
cacheSyncType = type;
- cacheSyncConfigValues.put(Employee.class, new Integer(type));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(type));
}
public void setup() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidateObjectWithMissingReferenceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidateObjectWithMissingReferenceTest.java
index e8fed9f..5b3f5b0 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidateObjectWithMissingReferenceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/InvalidateObjectWithMissingReferenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,8 +44,8 @@ public class InvalidateObjectWithMissingReferenceTest extends ConfigurableCacheS
public InvalidateObjectWithMissingReferenceTest() {
super();
setName("InvalidateObjectWithMissingReferenceTest");
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.SEND_OBJECT_CHANGES));
- cacheSyncConfigValues.put(Address.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.SEND_OBJECT_CHANGES));
+ cacheSyncConfigValues.put(Address.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
}
public void reset() {
@@ -74,7 +74,7 @@ public void setup() {
int cacheSyncType = descriptor.getCacheSynchronizationType();
Object newCacheSyncType = cacheSyncConfigValues.get(keyClass);
if (newCacheSyncType != null) {
- oldCacheSyncConfigValues.put(keyClass, new Integer(cacheSyncType));
+ oldCacheSyncConfigValues.put(keyClass, Integer.valueOf(cacheSyncType));
descriptor.setCacheSynchronizationType(((Integer)newCacheSyncType).intValue());
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/MultipleCacheSyncTypeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/MultipleCacheSyncTypeTest.java
index 83e205b..7a5722f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/MultipleCacheSyncTypeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/MultipleCacheSyncTypeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,12 +41,12 @@ public class MultipleCacheSyncTypeTest extends ConfigurableCacheSyncDistributedT
public MultipleCacheSyncTypeTest() {
super();
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
- cacheSyncConfigValues.put(Project.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
- cacheSyncConfigValues.put(SmallProject.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
- cacheSyncConfigValues.put(LargeProject.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
- cacheSyncConfigValues.put(Address.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
- cacheSyncConfigValues.put(PhoneNumber.class, new Integer(ClassDescriptor.SEND_OBJECT_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ cacheSyncConfigValues.put(Project.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ cacheSyncConfigValues.put(SmallProject.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ cacheSyncConfigValues.put(LargeProject.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ cacheSyncConfigValues.put(Address.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ cacheSyncConfigValues.put(PhoneNumber.class, Integer.valueOf(ClassDescriptor.SEND_OBJECT_CHANGES));
}
/**
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/NewObjectWithOptimisticLockingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/NewObjectWithOptimisticLockingTest.java
index 73107cc..e9b0fe7 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/NewObjectWithOptimisticLockingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/NewObjectWithOptimisticLockingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,8 +29,8 @@ public class NewObjectWithOptimisticLockingTest extends ConfigurableCacheSyncDis
public NewObjectWithOptimisticLockingTest(){
super();
- cacheSyncConfigValues.put(ListHolder.class, new Integer(ClassDescriptor.SEND_OBJECT_CHANGES));
- cacheSyncConfigValues.put(ListItem.class, new Integer(ClassDescriptor.SEND_OBJECT_CHANGES));
+ cacheSyncConfigValues.put(ListHolder.class, Integer.valueOf(ClassDescriptor.SEND_OBJECT_CHANGES));
+ cacheSyncConfigValues.put(ListItem.class, Integer.valueOf(ClassDescriptor.SEND_OBJECT_CHANGES));
}
public void setup(){
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/OrderedListNewObjectTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/OrderedListNewObjectTest.java
index 642bf27..dec633e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/OrderedListNewObjectTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/OrderedListNewObjectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,8 +27,8 @@ public class OrderedListNewObjectTest extends ConfigurableCacheSyncDistributedTe
public OrderedListNewObjectTest(){
super();
- cacheSyncConfigValues.put(ListHolder.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
- cacheSyncConfigValues.put(ListItem.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ cacheSyncConfigValues.put(ListHolder.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ cacheSyncConfigValues.put(ListItem.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
}
public void setup(){
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java
index 07ad766..3b61dbd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,15 +56,15 @@ public void addTests() {
Employee employee = (Employee)manager.getObject(Employee.class, "0001");
Hashtable configurationHashtable = new Hashtable();
- configurationHashtable.put(Employee.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ configurationHashtable.put(Employee.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
ConfigurableUpdateChangeObjectTest test = new ConfigurableUpdateChangeObjectTest(employee, configurationHashtable);
test.setName("Update Change Employee - Invalidate Employee");
test.setDescription("Test the invalidation setting on cache synchronization for Employee");
addTest(test);
configurationHashtable = new Hashtable();
- configurationHashtable.put(PhoneNumber.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
- configurationHashtable.put(Employee.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ configurationHashtable.put(PhoneNumber.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ configurationHashtable.put(Employee.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
test = new ConfigurableUpdateChangeObjectTest(employee, configurationHashtable);
test.setName("Update Change Employee - Invalidate Employee, Phone Number");
test.setDescription("Test the invalidation setting on cache synchronization for Phone Number");
@@ -83,25 +83,25 @@ public void addTests() {
addTest(new IsolatedObjectNotSentTest());
configurationHashtable = new Hashtable();
- configurationHashtable.put(IsolatedEmployee.class, new Integer(ClassDescriptor.SEND_OBJECT_CHANGES));
+ configurationHashtable.put(IsolatedEmployee.class, Integer.valueOf(ClassDescriptor.SEND_OBJECT_CHANGES));
IsolatedObjectNotSentTest atest = new IsolatedObjectNotSentTest(configurationHashtable);
atest.setName("IsolatedObjectNotSentTest - SEND_OBJECT_CHANGES");
addTest(atest);
configurationHashtable = new Hashtable();
- configurationHashtable.put(IsolatedEmployee.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ configurationHashtable.put(IsolatedEmployee.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
atest = new IsolatedObjectNotSentTest(configurationHashtable);
atest.setName("IsolatedObjectNotSentTest - INVALIDATE_CHANGED_OBJECTS");
addTest(atest);
configurationHashtable = new Hashtable();
- configurationHashtable.put(IsolatedEmployee.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ configurationHashtable.put(IsolatedEmployee.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
atest = new IsolatedObjectNotSentTest(configurationHashtable);
atest.setName("IsolatedObjectNotSentTest - SEND_NEW_OBJECTS_WITH_CHANGES");
addTest(atest);
configurationHashtable = new Hashtable();
- configurationHashtable.put(IsolatedEmployee.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ configurationHashtable.put(IsolatedEmployee.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
atest = new IsolatedObjectNotSentTest(configurationHashtable);
atest.setName("IsolatedObjectNotSentTest - DO_NOT_SEND_CHANGES");
addTest(atest);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectCacheSyncTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectCacheSyncTest.java
index 396e290..57b8503 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectCacheSyncTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectCacheSyncTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,7 +32,7 @@ public class RelatedNewObjectCacheSyncTest extends ConfigurableCacheSyncDistribu
protected Expression expression = null;
public RelatedNewObjectCacheSyncTest() {
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
}
public void setup() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectNotSentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectNotSentTest.java
index 05913dc..9b0cc32 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectNotSentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RelatedNewObjectNotSentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,9 @@ public class RelatedNewObjectNotSentTest extends ConfigurableCacheSyncDistribute
protected Expression expression = null;
public RelatedNewObjectNotSentTest() {
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
- cacheSyncConfigValues.put(Address.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
- cacheSyncConfigValues.put(SmallProject.class, new Integer(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ cacheSyncConfigValues.put(Address.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
+ cacheSyncConfigValues.put(SmallProject.class, Integer.valueOf(ClassDescriptor.DO_NOT_SEND_CHANGES));
}
public void setup() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/SendNewObjectCacheSyncTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/SendNewObjectCacheSyncTest.java
index 15b2d37..161d990 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/SendNewObjectCacheSyncTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/SendNewObjectCacheSyncTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,10 +39,10 @@ public SendNewObjectCacheSyncTest(boolean shouldSendObject) {
this.shouldSendObject = shouldSendObject;
if (shouldSendObject) {
setName("SendNewObjectCacheSyncTest - SEND_NEW_OBJECTS_WITH_CHANGES");
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.SEND_NEW_OBJECTS_WITH_CHANGES));
} else {
setName("SendNewObjectCacheSyncTest - SEND_OBJECT_CHANGES");
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.SEND_OBJECT_CHANGES));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.SEND_OBJECT_CHANGES));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java
index 8adb2e7..3644d47 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@ public class UpdateObjectInvalidationTest extends ConfigurableCacheSyncDistribut
public UpdateObjectInvalidationTest() {
super();
setDescription("Ensure a remote object is invalidated when its descriptor is set to INVALIDATE_CHANGED_OBJECTS");
- cacheSyncConfigValues.put(Employee.class, new Integer(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
+ cacheSyncConfigValues.put(Employee.class, Integer.valueOf(ClassDescriptor.INVALIDATE_CHANGED_OBJECTS));
}
public void setup() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/broadcast/BroadcastSetupHelper.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/broadcast/BroadcastSetupHelper.java
index 8251d5f..fe2d123 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/broadcast/BroadcastSetupHelper.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/broadcast/BroadcastSetupHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -235,7 +235,7 @@ public void destroyFactory() throws Exception {
public void startCacheSynchronization(AbstractSession session, boolean isSource) {
try {
- sessions.put(session, new Boolean(isSource));
+ sessions.put(session, Boolean.valueOf(isSource));
if (sessions.size() == 1) {
createFactory();
startFactory();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
index b47fda6..2a1f41f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -112,7 +112,7 @@ public void find() {
DynamicEntity simpleInstance = find(dynamicHelper, session, 1);
assertNotNull("Could not find simple instance with id = 1", simpleInstance);
- simpleInstance = find(dynamicHelper, session, new Integer(1));
+ simpleInstance = find(dynamicHelper, session, Integer.valueOf(1));
assertNotNull("Could not find simple instance with id = Integer(1)", simpleInstance);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
index 88888d6..4358478 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -122,7 +122,7 @@ public void find() {
DynamicEntity simpleInstance = find(dynamicHelper, session, 1);
assertNotNull("Could not find simple instance with id = 1", simpleInstance);
- simpleInstance = find(dynamicHelper, session, new Integer(1));
+ simpleInstance = find(dynamicHelper, session, Integer.valueOf(1));
assertNotNull("Could not find simple instance with id = Integer(1)", simpleInstance);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/events/PreInsertModifyChangeSetTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/events/PreInsertModifyChangeSetTest.java
index af6c0cc..1b4e903 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/events/PreInsertModifyChangeSetTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/events/PreInsertModifyChangeSetTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@ public class PreInsertModifyChangeSetTest extends AutoVerifyTestCase {
protected DescriptorEventAdapter eventAdapter = new DescriptorEventAdapter() {
public void preInsert(DescriptorEvent event) {
if (event.getQuery().getDescriptor() != null) {
- event.updateAttributeWithObject("salary", new Integer(callCount));
+ event.updateAttributeWithObject("salary", Integer.valueOf(callCount));
++callCount;
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionInMemoryTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionInMemoryTestSuite.java
index 3d19abb..1299d14 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionInMemoryTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionInMemoryTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,15 +42,15 @@ private void _addAdvancedInMemoryExpressionMathTest() {
Expression expression = builder.get("salary").greaterThanEqual(1000);
//expression = expression.and((ExpressionMath.ln(builder.get("salary"))).lessThan(10));
- //expression = expression.and((ExpressionMath.mod(builder.get("salary"), new Integer(107)).lessThan(10)));
+ //expression = expression.and((ExpressionMath.mod(builder.get("salary"), Integer.valueOf(107)).lessThan(10)));
expression = expression.and((ExpressionMath.floor(builder.get("salary"))).lessThan(45000));
expression = expression.and((ExpressionMath.ceil(builder.get("salary"))).lessThan(10000));
expression = expression.and(ExpressionMath.round(builder.get("salary"), 2).equal(40000));
- expression = expression.and(ExpressionMath.min(builder.get("salary"), new Integer(30000)).greaterThan(30000));
- expression = expression.and(ExpressionMath.max(builder.get("salary"), new Integer(30000)).lessThan(50000));
- //expression = expression.and((ExpressionMath.sinh(ExpressionMath.divide(builder.get("salary"),new Integer(10000000))).lessThanEqual(100)));
- //expression = expression.and((ExpressionMath.cosh(ExpressionMath.divide(builder.get("salary"),new Integer(10000000))).lessThanEqual(100)));
- //expression = expression.and((ExpressionMath.tanh(ExpressionMath.divide(builder.get("salary"),new Integer(10000000))).lessThanEqual(1)));
+ expression = expression.and(ExpressionMath.min(builder.get("salary"), Integer.valueOf(30000)).greaterThan(30000));
+ expression = expression.and(ExpressionMath.max(builder.get("salary"), Integer.valueOf(30000)).lessThan(50000));
+ //expression = expression.and((ExpressionMath.sinh(ExpressionMath.divide(builder.get("salary"),Integer.valueOf(10000000))).lessThanEqual(100)));
+ //expression = expression.and((ExpressionMath.cosh(ExpressionMath.divide(builder.get("salary"),Integer.valueOf(10000000))).lessThanEqual(100)));
+ //expression = expression.and((ExpressionMath.tanh(ExpressionMath.divide(builder.get("salary"),Integer.valueOf(10000000))).lessThanEqual(1)));
expression = expression.and((ExpressionMath.acos(ExpressionMath.power(builder.get("salary"), 0)).lessThanEqual(100)));
expression = expression.and((ExpressionMath.asin(ExpressionMath.power(builder.get("salary"), 0)).lessThanEqual(100)));
expression = expression.and((ExpressionMath.atan(ExpressionMath.power(builder.get("salary"), 0)).lessThanEqual(100)));
@@ -62,7 +62,7 @@ private void _addAdvancedInMemoryExpressionMathTest() {
//expression = expression.and((ExpressionMath.sign(builder.get("salary"))).greaterThan(0));
expression = expression.and((ExpressionMath.exp(ExpressionMath.min(builder.get("salary"), 5))).lessThan(1000000));
// Test sqrt.
- expression = expression.and(ExpressionMath.power(builder.get("salary"), new Double(0.5)).greaterThan(0));
+ expression = expression.and(ExpressionMath.power(builder.get("salary"), Double.valueOf(0.5)).greaterThan(0));
ReadAllExpressionTest test = new ReadAllExpressionTest(Employee.class, 0);
test.setExpression(expression);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionOperatorUnitTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionOperatorUnitTestSuite.java
index 541713d..cde2b36 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionOperatorUnitTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionOperatorUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public ExpressionOperatorUnitTestSuite() {
}
public void _testEquals$nullTest() {
- ExpressionOperator operator = ExpressionOperator.getOperator(new Integer(ExpressionOperator.Between));
+ ExpressionOperator operator = ExpressionOperator.getOperator(Integer.valueOf(ExpressionOperator.Between));
ExpressionOperator operator2 = null;
if (operator.equals(operator2)) {
throw new TestErrorException("Equals() must handle null case.");
@@ -35,15 +35,15 @@ public ExpressionOperatorUnitTestSuite() {
}
public void _testEquals$ObjectTest() {
- ExpressionOperator operator = ExpressionOperator.getOperator(new Integer(ExpressionOperator.Between));
- Object operator2 = new Integer(5);
+ ExpressionOperator operator = ExpressionOperator.getOperator(Integer.valueOf(ExpressionOperator.Between));
+ Object operator2 = Integer.valueOf(5);
if (operator.equals(operator2)) {
throw new TestErrorException("Equals() must handle other class case.");
}
}
public void _testEqualsTest() {
- ExpressionOperator operator = ExpressionOperator.getOperator(new Integer(ExpressionOperator.Between));
+ ExpressionOperator operator = ExpressionOperator.getOperator(Integer.valueOf(ExpressionOperator.Between));
ExpressionOperator operator2 = new ExpressionOperator(ExpressionOperator.Between, new Vector());
if (!operator.equals(operator2)) {
throw new TestErrorException("Equals() must do comparison by selector only.");
@@ -64,21 +64,21 @@ public void _testEqualsArrayTest() {
}
public void _testIsComparisonOperatorTest() {
- ExpressionOperator operator = ExpressionOperator.getOperator(new Integer(ExpressionOperator.Between));
+ ExpressionOperator operator = ExpressionOperator.getOperator(Integer.valueOf(ExpressionOperator.Between));
if (!operator.isComparisonOperator()) {
throw new TestErrorException("IsComparisonOperator() invalid.");
}
}
public void _testIsFunctionOperatorTest() {
- ExpressionOperator operator = ExpressionOperator.getOperator(new Integer(ExpressionOperator.Not));
+ ExpressionOperator operator = ExpressionOperator.getOperator(Integer.valueOf(ExpressionOperator.Not));
if (!operator.isFunctionOperator()) {
throw new TestErrorException("IsFunctionOperator() invalid.");
}
}
public void _testIsLogicalOperatorTest() {
- ExpressionOperator operator = ExpressionOperator.getOperator(new Integer(ExpressionOperator.And));
+ ExpressionOperator operator = ExpressionOperator.getOperator(Integer.valueOf(ExpressionOperator.And));
if (!operator.isLogicalOperator()) {
throw new TestErrorException("IsLogicalOperator() invalid.");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionTestSuite.java
index 1308827..c6e48c1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -134,15 +134,15 @@ private void addAdvancedExpressionMathTest() {
ExpressionBuilder builder = new ExpressionBuilder();
Expression expression = builder.get("salary").greaterThanEqual(1000);
expression = expression.and((ExpressionMath.ln(builder.get("salary"))).lessThan(10));
- expression = expression.and((ExpressionMath.mod(builder.get("salary"), new Integer(107)).lessThan(10)));
+ expression = expression.and((ExpressionMath.mod(builder.get("salary"), Integer.valueOf(107)).lessThan(10)));
expression = expression.and((ExpressionMath.floor(builder.get("salary"))).lessThan(45000));
expression = expression.and((ExpressionMath.ceil(builder.get("salary"))).lessThan(10000));
expression = expression.and(ExpressionMath.round(builder.get("salary"), 2).equal(40000));
- expression = expression.and(ExpressionMath.min(builder.get("salary"), new Integer(30000)).greaterThan(30000));
- expression = expression.and(ExpressionMath.max(builder.get("salary"), new Integer(30000)).lessThan(50000));
- expression = expression.and((ExpressionMath.sinh(ExpressionMath.divide(builder.get("salary"), new Integer(10000000))).lessThanEqual(100)));
- expression = expression.and((ExpressionMath.cosh(ExpressionMath.divide(builder.get("salary"), new Integer(10000000))).lessThanEqual(100)));
- expression = expression.and((ExpressionMath.tanh(ExpressionMath.divide(builder.get("salary"), new Integer(10000000))).lessThanEqual(1)));
+ expression = expression.and(ExpressionMath.min(builder.get("salary"), Integer.valueOf(30000)).greaterThan(30000));
+ expression = expression.and(ExpressionMath.max(builder.get("salary"), Integer.valueOf(30000)).lessThan(50000));
+ expression = expression.and((ExpressionMath.sinh(ExpressionMath.divide(builder.get("salary"), Integer.valueOf(10000000))).lessThanEqual(100)));
+ expression = expression.and((ExpressionMath.cosh(ExpressionMath.divide(builder.get("salary"), Integer.valueOf(10000000))).lessThanEqual(100)));
+ expression = expression.and((ExpressionMath.tanh(ExpressionMath.divide(builder.get("salary"), Integer.valueOf(10000000))).lessThanEqual(1)));
expression = expression.and((ExpressionMath.acos(ExpressionMath.power(builder.get("salary"), 0)).lessThanEqual(100)));
expression = expression.and((ExpressionMath.asin(ExpressionMath.power(builder.get("salary"), 0)).lessThanEqual(100)));
expression = expression.and((ExpressionMath.atan(ExpressionMath.power(builder.get("salary"), 0)).lessThanEqual(100)));
@@ -321,7 +321,7 @@ private void addBetweenTest() {
private void addBetweenTest2() {
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("salary").between(builder.get("manager").get("salary"), new Integer(500000));
+ Expression expression = builder.get("salary").between(builder.get("manager").get("salary"), Integer.valueOf(500000));
ReadAllExpressionTest test = new ReadAllExpressionTest(Employee.class, 5);
test.setExpression(expression);
@@ -417,7 +417,7 @@ private void addConstantEqualConstantTest() {
ReadAllExpressionTest test = new ReadAllExpressionTest(Employee.class, 12);
test.setExpression(expression);
test.setQuery(query);
- test.getArguments().add(new Integer(1));
+ test.getArguments().add(Integer.valueOf(1));
test.setName("ConstantEqualConstantTest");
test.setDescription("Test meaningless selection criteria like 1 == 1.");
@@ -548,10 +548,10 @@ private void addExpressionFunctionTest() {
private void addExpressionMathTest() {
ExpressionBuilder builder = new ExpressionBuilder();
Expression expression = builder.get("salary").greaterThanEqual(1000);
- expression = expression.and((ExpressionMath.add(builder.get("salary"), new Integer(3000))).lessThan(90000));
- expression = expression.and((ExpressionMath.subtract(builder.get("salary"), new Integer(1000))).greaterThan(1000));
- expression = expression.and((ExpressionMath.multiply(builder.get("salary"), new Integer(3))).greaterThan(50000));
- expression = expression.and((ExpressionMath.divide(builder.get("salary"), new Integer(3))).lessThan(100000));
+ expression = expression.and((ExpressionMath.add(builder.get("salary"), Integer.valueOf(3000))).lessThan(90000));
+ expression = expression.and((ExpressionMath.subtract(builder.get("salary"), Integer.valueOf(1000))).greaterThan(1000));
+ expression = expression.and((ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(3))).greaterThan(50000));
+ expression = expression.and((ExpressionMath.divide(builder.get("salary"), Integer.valueOf(3))).lessThan(100000));
expression = expression.and((ExpressionMath.abs(builder.get("salary"))).lessThan(100000));
expression = expression.and((ExpressionMath.cos(builder.get("salary")).lessThanEqual(1)));
expression = expression.and((ExpressionMath.sin(builder.get("salary")).lessThanEqual(1)));
@@ -1036,7 +1036,7 @@ private void addMultiPlatformTest() {
caseTable.put("Eldrick", "Tiger");
Expression expression = builder.get("firstName").ifNull("Bob").caseStatement(caseTable, "No-Nickname").equal("Bobby");
- expression = expression.and((ExpressionMath.mod(builder.get("salary"), new Integer(10)).equal(0)));
+ expression = expression.and((ExpressionMath.mod(builder.get("salary"), Integer.valueOf(10)).equal(0)));
expression = expression.and((ExpressionMath.ceil(builder.get("salary")).equal(35000)));
expression = expression.and(builder.get("firstName").length().equal(3));
@@ -1088,7 +1088,7 @@ private void addMultiPlatformTest3() {
caseTable.put(builder.get("firstName").equal("Eldrick"), "Tiger");
Expression expression = builder.caseConditionStatement(caseTable, "No-Nickname").equal("Bobby");
- expression = expression.and((ExpressionMath.mod(builder.get("salary"), new Integer(10)).equal(0)));
+ expression = expression.and((ExpressionMath.mod(builder.get("salary"), Integer.valueOf(10)).equal(0)));
expression = expression.and((ExpressionMath.ceil(builder.get("salary")).equal(35000)));
expression = expression.and(builder.get("firstName").length().equal(3));
@@ -1636,7 +1636,7 @@ private void addParameterIsNullTest() {
test.setExpression(expression);
test.setQuery(query);
test.getArguments().add(null);
- test.getArguments().add(new Integer(1));
+ test.getArguments().add(Integer.valueOf(1));
test.getArguments().add(new String("String"));
test.setName("ParameterIsNullTest");
test.setDescription("For bug 3107049 tests parameterExp.isNull.");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionUnitTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionUnitTestSuite.java
index 559a265..e3cc91e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionUnitTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/ExpressionUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -317,7 +317,7 @@ protected void _addDifferenceTest() {
// The following query will select all employees who will still have a salary under
// $50,000 after a 15% raise.
Vector arguments = new Vector();
- arguments.addElement(new Integer(15));
+ arguments.addElement(Integer.valueOf(15));
ExpressionBuilder builder = new ExpressionBuilder();
Expression expression = builder.get("salary").getFunction(applyRaiseSelector, arguments).lessThan(50000);
@@ -912,7 +912,7 @@ protected void _addNoneOfTest() {
protected void _addNotBetween$ObjectTest() {
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("salary").notBetween(builder.get("manager").get("salary"), new Integer(500000));
+ Expression expression = builder.get("salary").notBetween(builder.get("manager").get("salary"), Integer.valueOf(500000));
ReadAllExpressionTest test = new ReadAllExpressionTest(Employee.class, 3);
test.setExpression(expression);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/FeatureTestModelWithoutBinding.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/FeatureTestModelWithoutBinding.java
index 2bf67d1..4cde69a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/FeatureTestModelWithoutBinding.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/FeatureTestModelWithoutBinding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,8 +42,8 @@ public void reset() {
}
public void setup() {
- this.origionalBindingState = new Boolean(this.getSession().getPlatform().shouldBindAllParameters());
- this.origionalStatementCachingState = new Boolean(this.getSession().getPlatform().shouldCacheAllStatements());
+ this.origionalBindingState = Boolean.valueOf(this.getSession().getPlatform().shouldBindAllParameters());
+ this.origionalStatementCachingState = Boolean.valueOf(this.getSession().getPlatform().shouldCacheAllStatements());
this.getSession().getPlatform().setShouldBindAllParameters(false);
this.getSession().getPlatform().setShouldCacheAllStatements(false);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullValueTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullValueTest.java
index 47e0f48..44c5ed4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullValueTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullValueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,7 +40,7 @@ protected void setup() {
saveDefaultNullValues = getSession().getLogin().getPlatform().getConversionManager().getDefaultNullValues();
getSession().getLogin().getPlatform().getConversionManager().setDefaultNullValues(new Hashtable());
getSession().getLogin().setDefaultNullValue(String.class, "null");
- getSession().getLogin().setDefaultNullValue(int.class, new Integer(-1));
+ getSession().getLogin().setDefaultNullValue(int.class, Integer.valueOf(-1));
// Reinit mappings.
for (DatabaseMapping mapping : getSession().getDescriptor(Address.class).getMappings()) {
if (mapping.isDirectToFieldMapping()) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/flashback/FlashbackUnitTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/flashback/FlashbackUnitTestSuite.java
index d47e3ce..a45ccbd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/flashback/FlashbackUnitTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/flashback/FlashbackUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -129,7 +129,7 @@ public void _testAsOfCurrentTimeMillisParameterTest() {
query.setAsOfClause(clause);
query.addArgument("TIME");
Vector arguments = new Vector();
- arguments.add(new Long(value));
+ arguments.add(Long.valueOf(value));
Vector employees = (Vector)getSession().executeQuery(query, arguments);
if (employees.size() != 0) {
@@ -491,7 +491,7 @@ void internalOuterJoinTest(boolean withAsOf) {
public void _testHistoricalQueriesMustPreserveGlobalCacheExceptionTest() {
ReadAllQuery query = new ReadAllQuery(Employee.class);
query.setSelectionCriteria(query.getExpressionBuilder().get("firstName").equal("Bob"));
- query.setAsOfClause(new AsOfSCNClause(new Long(0)));
+ query.setAsOfClause(new AsOfSCNClause(Long.valueOf(0)));
try {
getSession().executeQuery(query);
getSession().getIdentityMapAccessor().initializeIdentityMaps();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/ConcurrentReadBigBadObjectTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/ConcurrentReadBigBadObjectTest.java
index 6c4b76e..05eb8f3 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/ConcurrentReadBigBadObjectTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/ConcurrentReadBigBadObjectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,12 +60,12 @@ public void setup() throws Exception {
int i = 0;
while (i < mappings) {
m = (DatabaseMapping)v.get(i);
- m.setWeight(new Integer(Integer.MAX_VALUE - 1));
+ m.setWeight(Integer.valueOf(Integer.MAX_VALUE - 1));
i++;
}
m = d.getMappingForAttributeName("number02");
- m.setWeight(new Integer(Integer.MAX_VALUE));
+ m.setWeight(Integer.valueOf(Integer.MAX_VALUE));
server.login();
server.serverSession.setLogLevel(getSession().getLogLevel());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/IdentityMapTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/IdentityMapTestSuite.java
index d0b4217..c6a3b38 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/IdentityMapTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/IdentityMapTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,9 @@ protected void addMultipleIdentityTests(TestSuite suite, IdentityMap identityMap
employees.addElement(employee1);
employees.addElement(employee2);
primaryKey1 = new Vector();
- primaryKey1.addElement(new Integer(99));
+ primaryKey1.addElement(Integer.valueOf(99));
primaryKey2 = new Vector();
- primaryKey2.addElement(new Integer(88));
+ primaryKey2.addElement(Integer.valueOf(88));
primaryKeys.addElement(primaryKey1);
primaryKeys.addElement(primaryKey2);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cache/ConcurrentReadBigBadObjectTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cache/ConcurrentReadBigBadObjectTest.java
index 70baca1..6f73e3a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cache/ConcurrentReadBigBadObjectTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cache/ConcurrentReadBigBadObjectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,12 +60,12 @@ public void setup() throws Exception{
int i =0;
while (i<mappings){
m = (DatabaseMapping)v.get(i);
- m.setWeight(new Integer(Integer.MAX_VALUE-1));
+ m.setWeight(Integer.valueOf(Integer.MAX_VALUE-1));
i++;
}
m = d.getMappingForAttributeName("number02");
- m.setWeight(new Integer(Integer.MAX_VALUE));
+ m.setWeight(Integer.valueOf(Integer.MAX_VALUE));
server.login();
server.serverSession.setLogLevel(getSession().getLogLevel());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/BindingWithShallowInsertTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/BindingWithShallowInsertTest.java
index e5a5458..29ab700 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/BindingWithShallowInsertTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/BindingWithShallowInsertTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@ public void test() {
// "NA" is the null value, so this will cause a null to be written
headProject.setName("NA");
headProject.setTitle("");
- headProject.setBudget(new Integer(-1));
+ headProject.setBudget(Integer.valueOf(-1));
// adding the project to both mappings will cause a shallow insert because
// foreign keys will have to be updated on both tables
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/OverrideInheritedMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/OverrideInheritedMappingTest.java
index 8feeaf8..4af2776 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/OverrideInheritedMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/OverrideInheritedMappingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,7 +67,7 @@ public void verify() {
//Update fuel capacity of the previously inserted car
getSession().executeNonSelectingCall(new org.eclipse.persistence.queries.SQLCall("UPDATE CAR SET FUEL_CAP = 200 WHERE (ID = " + this.carID + ")"));
- //this.theCar.fuelCapacity = new Integer(200);
+ //this.theCar.fuelCapacity = Integer.valueOf(200);
//getAbstractSession().updateObject(this.theCar);
//Read the car and check that the field was set (override of inherited mapping worked)
Car carRead = (Car)getSession().readObject(Car.class, new ExpressionBuilder().get("id").equal(this.carID));
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/TranslatedKeyInheritanceTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/TranslatedKeyInheritanceTestCase.java
index 62f55aa..1344865 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/TranslatedKeyInheritanceTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/TranslatedKeyInheritanceTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,8 +34,8 @@ protected void setup() {
// CREATE A GRASSHOPPER
GrassHopper grassHopper = new GrassHopper();
- grassHopper.setIn_numberOfLegs(new Integer(6));
- grassHopper.setGh_maximumJump(new Integer(100));
+ grassHopper.setIn_numberOfLegs(Integer.valueOf(6));
+ grassHopper.setGh_maximumJump(Integer.valueOf(100));
// ADD THE GRASSHOPPER TO THE DATABASE
UnitOfWork uow = getSession().acquireUnitOfWork();
@@ -53,7 +53,7 @@ public void test() {
// MODIFY THE GRASSHOPPER
UnitOfWork uow = getSession().acquireUnitOfWork();
GrassHopper tempGrassHopper = (GrassHopper)uow.registerObject(grassHopper);
- tempGrassHopper.setGh_maximumJump(new Integer(150));
+ tempGrassHopper.setGh_maximumJump(Integer.valueOf(150));
uow.commit();
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java
index 73cea7d..9340a6e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -87,7 +87,7 @@ protected void changeUnitOfWorkWorkingCopy() {
// Change a vehicle
Vehicle aVehicle = (Vehicle)vehicles.lastElement();
- aVehicle.setPassengerCapacity(new Integer(15));
+ aVehicle.setPassengerCapacity(Integer.valueOf(15));
// Add some vehicles
Car car = Car.example2();
@@ -113,7 +113,7 @@ protected void changeUnitOfWorkWorkingCopyAgain() {
// Change a vehicle
Vehicle aVehicle = (Vehicle)vehicles.firstElement();
- aVehicle.setPassengerCapacity(new Integer(15));
+ aVehicle.setPassengerCapacity(Integer.valueOf(15));
// Add some vehicles
Car car = Car.example2();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/DescriptorInitTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/DescriptorInitTest.java
index 3b7feef..c549e9c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/DescriptorInitTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/DescriptorInitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,8 +51,8 @@ public void test() {
String part1;
String part2;
- Character ch = new Character(className.charAt(className.length() - 2));
- if (ch.equals(new Character('0'))) { //Class100
+ Character ch = Character.valueOf(className.charAt(className.length() - 2));
+ if (ch.equals(Character.valueOf('0'))) { //Class100
part1 = className.substring(6, className.length() - 3);
part2 = className.substring(className.length() - 3);
} else if (Character.isDigit(ch.charValue())) { //Class##
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/VariableOneToOneInsertTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/VariableOneToOneInsertTest.java
index daea3ba..cd2c9dd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/VariableOneToOneInsertTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/interfaces/VariableOneToOneInsertTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,11 +29,11 @@ public void test() {
this.company = new Company();
Company c = (Company)uow.registerObject(this.company);
c.setName("Company One");
- c.setId(new Integer(54));
+ c.setId(Integer.valueOf(54));
Email email = new Email();
email.setAddress("@Blather.ca");
email.setHolder(c);
- email.setId(new Integer(45));
+ email.setId(Integer.valueOf(45));
c.setContact(email);
c.email = email;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorTest.java
index b5c3a21..1fa22eb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,7 @@ public static BinaryOperatorTest getSimplePlusTest() {
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.add(builder.get("salary"), new Integer(1000)).lessThanEqual(50000);
+ Expression whereClause = ExpressionMath.add(builder.get("salary"), Integer.valueOf(1000)).lessThanEqual(50000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -104,7 +104,7 @@ public static BinaryOperatorTest getSimplePlusTestWithBracketsBeforeComparison()
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.add(builder.get("salary"), new Integer(1000)).lessThanEqual(50000);
+ Expression whereClause = ExpressionMath.add(builder.get("salary"), Integer.valueOf(1000)).lessThanEqual(50000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -118,7 +118,7 @@ public static BinaryOperatorTest getSimplePlusTestWithBracketsAfterComparison()
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(50000), builder).greaterThan(ExpressionMath.add(builder.get("salary"), new Integer(1000)));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(50000), builder).greaterThan(ExpressionMath.add(builder.get("salary"), Integer.valueOf(1000)));
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -132,7 +132,7 @@ public static BinaryOperatorTest getSimpleMinusTest() {
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.subtract(builder.get("salary"), new Integer(1000)).lessThanEqual(50000);
+ Expression whereClause = ExpressionMath.subtract(builder.get("salary"), Integer.valueOf(1000)).lessThanEqual(50000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -146,7 +146,7 @@ public static BinaryOperatorTest getSimpleMinusTestWithBracketsBeforeComparison(
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.subtract(builder.get("salary"), new Integer(1000)).lessThanEqual(50000);
+ Expression whereClause = ExpressionMath.subtract(builder.get("salary"), Integer.valueOf(1000)).lessThanEqual(50000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -160,7 +160,7 @@ public static BinaryOperatorTest getSimpleMinusTestWithBracketsAfterComparison()
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(50000), builder).greaterThan(ExpressionMath.subtract(builder.get("salary"), new Integer(1000)));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(50000), builder).greaterThan(ExpressionMath.subtract(builder.get("salary"), Integer.valueOf(1000)));
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -174,7 +174,7 @@ public static BinaryOperatorTest getSimpleMultiplyTest() {
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.multiply(builder.get("salary"), new Integer(2)).lessThanEqual(100000);
+ Expression whereClause = ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)).lessThanEqual(100000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -188,7 +188,7 @@ public static BinaryOperatorTest getSimpleMultiplyTestWithBracketsBeforeComparis
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.multiply(builder.get("salary"), new Integer(2)).lessThanEqual(100000);
+ Expression whereClause = ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)).lessThanEqual(100000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -202,7 +202,7 @@ public static BinaryOperatorTest getSimpleMultiplyTestWithBracketsAfterCompariso
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(100000), builder).greaterThan(ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(100000), builder).greaterThan(ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -216,7 +216,7 @@ public static BinaryOperatorTest getSimpleDivideTest() {
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.divide(builder.get("salary"), new Integer(2)).lessThanEqual(20000);
+ Expression whereClause = ExpressionMath.divide(builder.get("salary"), Integer.valueOf(2)).lessThanEqual(20000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -230,7 +230,7 @@ public static BinaryOperatorTest getSimpleDivideTestWithBracketsBeforeComparison
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.divide(builder.get("salary"), new Integer(2)).lessThanEqual(20000);
+ Expression whereClause = ExpressionMath.divide(builder.get("salary"), Integer.valueOf(2)).lessThanEqual(20000);
theTest.setOriginalObjectExpression(whereClause);
return theTest;
@@ -244,7 +244,7 @@ public static BinaryOperatorTest getSimpleDivideTestWithBracketsAfterComparison(
theTest.setReferenceClass(Employee.class);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(20000), builder).greaterThan(ExpressionMath.divide(builder.get("salary"), new Integer(2)));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(20000), builder).greaterThan(ExpressionMath.divide(builder.get("salary"), Integer.valueOf(2)));
theTest.setOriginalObjectExpression(whereClause);
return theTest;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorWithParameterTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorWithParameterTest.java
index 7c9e9e7..6d6957c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorWithParameterTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorWithParameterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -142,7 +142,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterPlusTest() {
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(1000));
+ theTest.getArguments().addElement(Integer.valueOf(1000));
return theTest;
}
@@ -167,7 +167,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterPlusTestWithBra
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(1000));
+ theTest.getArguments().addElement(Integer.valueOf(1000));
return theTest;
}
@@ -181,7 +181,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterPlusTestWithBra
theTest.getExpressionParameters().add(parameterName);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(50000), builder).greaterThan(ExpressionMath.add(builder.get("salary"), (builder.getParameter(parameterName))));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(50000), builder).greaterThan(ExpressionMath.add(builder.get("salary"), (builder.getParameter(parameterName))));
theTest.setOriginalObjectExpression(whereClause);
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE 50000 > (emp.salary + ?1)";
@@ -192,7 +192,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterPlusTestWithBra
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(1000));
+ theTest.getArguments().addElement(Integer.valueOf(1000));
return theTest;
}
@@ -217,7 +217,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMinusTest() {
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(1000));
+ theTest.getArguments().addElement(Integer.valueOf(1000));
return theTest;
}
@@ -242,7 +242,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMinusTestWithBr
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(1000));
+ theTest.getArguments().addElement(Integer.valueOf(1000));
return theTest;
}
@@ -256,7 +256,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMinusTestWithBr
theTest.getExpressionParameters().add(parameterName);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(50000), builder).greaterThan(ExpressionMath.subtract(builder.get("salary"), (builder.getParameter(parameterName))));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(50000), builder).greaterThan(ExpressionMath.subtract(builder.get("salary"), (builder.getParameter(parameterName))));
theTest.setOriginalObjectExpression(whereClause);
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE 50000 > (emp.salary - ?1)";
@@ -267,7 +267,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMinusTestWithBr
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(1000));
+ theTest.getArguments().addElement(Integer.valueOf(1000));
return theTest;
}
@@ -292,7 +292,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMultiplyTest()
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
+ theTest.getArguments().addElement(Integer.valueOf(2));
return theTest;
}
@@ -317,7 +317,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMultiplyTestWit
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
+ theTest.getArguments().addElement(Integer.valueOf(2));
return theTest;
}
@@ -331,7 +331,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMultiplyTestWit
theTest.getExpressionParameters().add(parameterName);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(100000), builder).greaterThan(ExpressionMath.multiply(builder.get("salary"), (builder.getParameter(parameterName))));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(100000), builder).greaterThan(ExpressionMath.multiply(builder.get("salary"), (builder.getParameter(parameterName))));
theTest.setOriginalObjectExpression(whereClause);
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE 100000 > (emp.salary * ?1)";
@@ -342,7 +342,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterMultiplyTestWit
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
+ theTest.getArguments().addElement(Integer.valueOf(2));
return theTest;
}
@@ -367,7 +367,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterDivideTest() {
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
+ theTest.getArguments().addElement(Integer.valueOf(2));
return theTest;
}
@@ -392,7 +392,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterDivideTestWithB
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
+ theTest.getArguments().addElement(Integer.valueOf(2));
return theTest;
}
@@ -406,7 +406,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterDivideTestWithB
theTest.getExpressionParameters().add(parameterName);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionBuilder.fromConstant(new Integer(20000), builder).greaterThan(ExpressionMath.divide(builder.get("salary"), (builder.getParameter(parameterName))));
+ Expression whereClause = ExpressionBuilder.fromConstant(Integer.valueOf(20000), builder).greaterThan(ExpressionMath.divide(builder.get("salary"), (builder.getParameter(parameterName))));
theTest.setOriginalObjectExpression(whereClause);
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE 20000 > (emp.salary / ?1)";
@@ -417,7 +417,7 @@ public static BinaryOperatorWithParameterTest getNumericParameterDivideTestWithB
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
+ theTest.getArguments().addElement(Integer.valueOf(2));
return theTest;
}
@@ -433,7 +433,7 @@ public static BinaryOperatorWithParameterTest getNumericTwoParameterMultipleOper
theTest.getExpressionParameters().add(parameterNameForMultiply);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = ExpressionMath.subtract(ExpressionMath.add(builder.get("salary"), 10000), ExpressionMath.multiply(ExpressionMath.divide(ExpressionBuilder.fromConstant(new Integer(10000), builder), builder.getParameter(parameterNameForDivide)), builder.getParameter(parameterNameForMultiply))).greaterThanEqual(50000);
+ Expression whereClause = ExpressionMath.subtract(ExpressionMath.add(builder.get("salary"), 10000), ExpressionMath.multiply(ExpressionMath.divide(ExpressionBuilder.fromConstant(Integer.valueOf(10000), builder), builder.getParameter(parameterNameForDivide)), builder.getParameter(parameterNameForMultiply))).greaterThanEqual(50000);
theTest.setOriginalObjectExpression(whereClause);
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE emp.salary + 10000 - 10000 / ?1 * ?2 >= 50000";
@@ -445,8 +445,8 @@ public static BinaryOperatorWithParameterTest getNumericTwoParameterMultipleOper
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
- theTest.getArguments().addElement(new Integer(3));
+ theTest.getArguments().addElement(Integer.valueOf(2));
+ theTest.getArguments().addElement(Integer.valueOf(3));
return theTest;
}
@@ -474,8 +474,8 @@ public static BinaryOperatorWithParameterTest getNumericTwoParameterMultipleOper
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
- theTest.getArguments().addElement(new Integer(3));
+ theTest.getArguments().addElement(Integer.valueOf(2));
+ theTest.getArguments().addElement(Integer.valueOf(3));
return theTest;
}
@@ -491,7 +491,7 @@ public static BinaryOperatorWithParameterTest getNumericTwoParameterMultipleOper
theTest.getExpressionParameters().add(parameterNameForMultiply);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = builder.get("salary").greaterThan(ExpressionMath.subtract(ExpressionMath.add(ExpressionBuilder.fromConstant(new Integer(50000), builder), 10000), ExpressionMath.divide(ExpressionBuilder.fromConstant(new Integer(10000), builder), ExpressionMath.multiply(builder.getParameter(parameterNameForMultiply), builder.getParameter(parameterNameForDivide)))));
+ Expression whereClause = builder.get("salary").greaterThan(ExpressionMath.subtract(ExpressionMath.add(ExpressionBuilder.fromConstant(Integer.valueOf(50000), builder), 10000), ExpressionMath.divide(ExpressionBuilder.fromConstant(Integer.valueOf(10000), builder), ExpressionMath.multiply(builder.getParameter(parameterNameForMultiply), builder.getParameter(parameterNameForDivide)))));
theTest.setOriginalObjectExpression(whereClause);
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE emp.salary > (50000 + 10000 - 10000 / (?1 * ?2))";
@@ -503,8 +503,8 @@ public static BinaryOperatorWithParameterTest getNumericTwoParameterMultipleOper
theTest.setArgumentNames(myArgumentNames);
theTest.setArguments(new Vector());
- theTest.getArguments().addElement(new Integer(2));
- theTest.getArguments().addElement(new Integer(5));
+ theTest.getArguments().addElement(Integer.valueOf(2));
+ theTest.getArguments().addElement(Integer.valueOf(5));
return theTest;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexReverseSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexReverseSqrtTest.java
index 1f95af4..c051bb0 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexReverseSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexReverseSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@ public void setup() {
Employee emp2 = (Employee)getTestEmployees().lastElement();
String ejbqlString;
- double salarySquareRoot1 = Math.sqrt((new Double(emp1.getSalary()).doubleValue()));
- double salarySquareRoot2 = Math.sqrt((new Double(emp2.getSalary()).doubleValue()));
+ double salarySquareRoot1 = Math.sqrt((Double.valueOf(emp1.getSalary()).doubleValue()));
+ double salarySquareRoot2 = Math.sqrt((Double.valueOf(emp2.getSalary()).doubleValue()));
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
ejbqlString = ejbqlString + salarySquareRoot1;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexSqrtTest.java
index c816831..ad74f88 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/ComplexSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@ public void setup() {
Employee emp2 = (Employee)getTestEmployees().lastElement();
String ejbqlString;
- double salarySquareRoot1 = Math.sqrt((new Double(emp1.getSalary()).doubleValue()));
- double salarySquareRoot2 = Math.sqrt((new Double(emp2.getSalary()).doubleValue()));
+ double salarySquareRoot1 = Math.sqrt((Double.valueOf(emp1.getSalary()).doubleValue()));
+ double salarySquareRoot2 = Math.sqrt((Double.valueOf(emp2.getSalary()).doubleValue()));
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
ejbqlString = ejbqlString + "(SQRT(emp.salary) = ";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexReverseSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexReverseSqrtTest.java
index a44316f..b9b72a7 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexReverseSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexReverseSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@ public void setup() {
Employee emp2 = (Employee)getTestEmployees().lastElement();
String ejbqlString;
- double salarySquareRoot1 = Math.sqrt((new Double(emp1.getSalary()).doubleValue()));
- double salarySquareRoot2 = Math.sqrt((new Double(emp2.getSalary()).doubleValue()));
+ double salarySquareRoot1 = Math.sqrt((Double.valueOf(emp1.getSalary()).doubleValue()));
+ double salarySquareRoot2 = Math.sqrt((Double.valueOf(emp2.getSalary()).doubleValue()));
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
ejbqlString = ejbqlString + salarySquareRoot1;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexSqrtTest.java
index 77f5cb9..91ebc45 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectComplexSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@ public void setup() {
Employee emp2 = (Employee)getTestEmployees().lastElement();
String ejbqlString;
- double salarySquareRoot1 = Math.sqrt((new Double(emp1.getSalary()).doubleValue()));
- double salarySquareRoot2 = Math.sqrt((new Double(emp2.getSalary()).doubleValue()));
+ double salarySquareRoot1 = Math.sqrt((Double.valueOf(emp1.getSalary()).doubleValue()));
+ double salarySquareRoot2 = Math.sqrt((Double.valueOf(emp2.getSalary()).doubleValue()));
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
ejbqlString = ejbqlString + "(SQRT(emp.salary) = ";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleBooleanTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleBooleanTest.java
index 8b4f52b..59812cb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleBooleanTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleBooleanTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,7 @@ public static SelectSimpleBooleanTest getSimpleTrueTest() {
theTest.setEjbqlString(ejbqlString);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = builder.get("isClone").equal(new Boolean(true));
+ Expression whereClause = builder.get("isClone").equal(Boolean.valueOf(true));
theTest.setOriginalObjectExpression(whereClause);
@@ -48,7 +48,7 @@ public static SelectSimpleBooleanTest getSimpleFalseTest() {
theTest.setEjbqlString(ejbqlString);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = builder.get("isClone").equal(new Boolean(false));
+ Expression whereClause = builder.get("isClone").equal(Boolean.valueOf(false));
theTest.setOriginalObjectExpression(whereClause);
@@ -65,7 +65,7 @@ public static SelectSimpleBooleanTest getSimpleNotEqualsTrueTest() {
theTest.setEjbqlString(ejbqlString);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = builder.get("isClone").notEqual(new Boolean(true));
+ Expression whereClause = builder.get("isClone").notEqual(Boolean.valueOf(true));
theTest.setOriginalObjectExpression(whereClause);
@@ -82,7 +82,7 @@ public static SelectSimpleBooleanTest getSimpleNotEqualsFalseTest() {
theTest.setEjbqlString(ejbqlString);
ExpressionBuilder builder = new ExpressionBuilder();
- Expression whereClause = builder.get("isClone").notEqual(new Boolean(false));
+ Expression whereClause = builder.get("isClone").notEqual(Boolean.valueOf(false));
theTest.setOriginalObjectExpression(whereClause);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleReverseSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleReverseSqrtTest.java
index fc24530..d458fcf 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleReverseSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleReverseSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,7 @@ public void setup() {
setTestEmployees(getExtraEmployees());
Employee emp = (Employee)getTestEmployees().firstElement();
- double salarySquareRoot = Math.sqrt((new Double(emp.getSalary()).doubleValue()));
+ double salarySquareRoot = Math.sqrt((Double.valueOf(emp.getSalary()).doubleValue()));
String ejbqlString;
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleSqrtTest.java
index f673c81..a547f49 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SelectSimpleSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,7 @@ public void setup() {
setTestEmployees(getExtraEmployees());
Employee emp = (Employee)getTestEmployees().firstElement();
- double salarySquareRoot = Math.sqrt((new Double(emp.getSalary()).doubleValue()));
+ double salarySquareRoot = Math.sqrt((Double.valueOf(emp.getSalary()).doubleValue()));
String ejbqlString;
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleReverseSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleReverseSqrtTest.java
index 8a4d4f9..ebf5971 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleReverseSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleReverseSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,7 @@ public void setup() {
setTestEmployees(getExtraEmployees());
Employee emp = (Employee)getTestEmployees().firstElement();
- double salarySquareRoot = Math.sqrt((new Double(emp.getSalary()).doubleValue()));
+ double salarySquareRoot = Math.sqrt((Double.valueOf(emp.getSalary()).doubleValue()));
String ejbqlString;
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleSqrtTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleSqrtTest.java
index 1bf6c9e..e281c29 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleSqrtTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/SimpleSqrtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,7 @@ public void setup() {
setTestEmployees(getExtraEmployees());
Employee emp = (Employee)getTestEmployees().firstElement();
- double salarySquareRoot = Math.sqrt((new Double(emp.getSalary()).doubleValue()));
+ double salarySquareRoot = Math.sqrt((Double.valueOf(emp.getSalary()).doubleValue()));
String ejbqlString;
ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/mapping/SameNamePKTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/mapping/SameNamePKTest.java
index 0229e0e..83b4158 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/mapping/SameNamePKTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/mapping/SameNamePKTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void setup() {
SecureSystem system = new SecureSystem();
system.setManufacturer("Secure Systems Inc.");
Identification identification = new Identification();
- identification.setId(new Long(1));
+ identification.setId(Long.valueOf(1));
system.setId(identification);
UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(system);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/PerformanceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/PerformanceTest.java
index 13ca03e..043661a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/PerformanceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/PerformanceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -158,7 +158,7 @@ public void setupEmulatedDB() {
// Load sequence query.
rows = new Vector();
record = new DatabaseRecord();
- record.put("NEXTVAL", new Long(12345));
+ record.put("NEXTVAL", Long.valueOf(12345));
rows.add(record);
connection.putRows("SELECT EMP_SEQ.NEXTVAL FROM DUAL", rows);
connection.putRows("SELECT ADDRESS_SEQ.NEXTVAL FROM DUAL", rows);*/
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapGetConcurrentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapGetConcurrentTest.java
index edb041e..91e3545 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapGetConcurrentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapGetConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class ConcurrentHashMapGetConcurrentTest extends ConcurrentPerformanceCom
public ConcurrentHashMapGetConcurrentTest() {
setDescription("Measure the concurrency of ConcurrentHashMap.");
for (int index = 0; index < 100; index ++) {
- this.keys[index] = new Integer(index);
+ this.keys[index] = Integer.valueOf(index);
}
}
@@ -35,7 +35,7 @@ public void setup() {
super.setup();
map = new ConcurrentHashMap(100);
for (int index = 0; index < 100; index++) {
- map.put(new Integer(index), new Integer(index));
+ map.put(Integer.valueOf(index), Integer.valueOf(index));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapPutConcurrentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapPutConcurrentTest.java
index e99f04c..5f98ace 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapPutConcurrentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ConcurrentHashMapPutConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class ConcurrentHashMapPutConcurrentTest extends ConcurrentPerformanceCom
public ConcurrentHashMapPutConcurrentTest() {
setDescription("Measure the concurrency of ConcurrentHashMap.");
for (int index = 0; index < 100; index ++) {
- this.keys[index] = new Integer(index);
+ this.keys[index] = Integer.valueOf(index);
}
}
@@ -35,7 +35,7 @@ public void setup() {
super.setup();
map = new ConcurrentHashMap(100);
for (int index = 0; index < 100; index++) {
- map.put(new Integer(index), new Integer(index));
+ map.put(Integer.valueOf(index), Integer.valueOf(index));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapGetConcurrentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapGetConcurrentTest.java
index 2a002b0..ef99425 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapGetConcurrentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapGetConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class HashMapGetConcurrentTest extends ConcurrentPerformanceComparisonTes
public HashMapGetConcurrentTest() {
setDescription("Measure the concurrency of HashMap.");
for (int index = 0; index < 100; index ++) {
- this.keys[index] = new Integer(index);
+ this.keys[index] = Integer.valueOf(index);
}
}
@@ -35,7 +35,7 @@ public void setup() {
super.setup();
map = new HashMap(100);
for (int index = 0; index < 100; index++) {
- map.put(new Integer(index), new Integer(index));
+ map.put(Integer.valueOf(index), Integer.valueOf(index));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapPutConcurrentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapPutConcurrentTest.java
index dddb725..52cda20 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapPutConcurrentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashMapPutConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class HashMapPutConcurrentTest extends ConcurrentPerformanceComparisonTes
public HashMapPutConcurrentTest() {
setDescription("Measure the concurrency of HashMap.");
for (int index = 0; index < 100; index ++) {
- this.keys[index] = new Integer(index);
+ this.keys[index] = Integer.valueOf(index);
}
}
@@ -35,7 +35,7 @@ public void setup() {
super.setup();
map = new HashMap(100);
for (int index = 0; index < 100; index++) {
- map.put(new Integer(index), new Integer(index));
+ map.put(Integer.valueOf(index), Integer.valueOf(index));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtableGetConcurrentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtableGetConcurrentTest.java
index a288f5a..100a5b0 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtableGetConcurrentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtableGetConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class HashtableGetConcurrentTest extends ConcurrentPerformanceComparisonT
public HashtableGetConcurrentTest() {
setDescription("Measure the concurrency of Hashtable.");
for (int index = 0; index < 100; index ++) {
- this.keys[index] = new Integer(index);
+ this.keys[index] = Integer.valueOf(index);
}
}
@@ -35,7 +35,7 @@ public void setup() {
super.setup();
map = new Hashtable(100);
for (int index = 0; index < 100; index++) {
- map.put(new Integer(index), new Integer(index));
+ map.put(Integer.valueOf(index), Integer.valueOf(index));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtablePutConcurrentTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtablePutConcurrentTest.java
index 3ecc94d..09532c1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtablePutConcurrentTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/HashtablePutConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class HashtablePutConcurrentTest extends ConcurrentPerformanceComparisonT
public HashtablePutConcurrentTest() {
setDescription("Measure the concurrency of Hashtable.");
for (int index = 0; index < 100; index ++) {
- this.keys[index] = new Integer(index);
+ this.keys[index] = Integer.valueOf(index);
}
}
@@ -35,7 +35,7 @@ public void setup() {
super.setup();
map = new Hashtable(100);
for (int index = 0; index < 100; index++) {
- map.put(new Integer(index), new Integer(index));
+ map.put(Integer.valueOf(index), Integer.valueOf(index));
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ListTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ListTest.java
index 53cc646..6342f32 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ListTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/ListTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ public ListTest(int size) {
public void test() throws Exception {
Vector vector = new Vector(10);
for (int index = 0; index < size; index++) {
- vector.add(new Integer(index));
+ vector.add(Integer.valueOf(index));
}
for (int index = 0; index < size; index++) {
Object result = vector.get(index);
@@ -52,7 +52,7 @@ public void addArrayListTest() {
public void test() {
List list = new ArrayList(10);
for (int index = 0; index < size; index++) {
- list.add(new Integer(index));
+ list.add(Integer.valueOf(index));
}
for (int index = 0; index < size; index++) {
Object result = list.get(index);
@@ -72,7 +72,7 @@ public void addLinkedListTest() {
public void test() {
List list = new LinkedList();
for (int index = 0; index < size; index++) {
- list.add(new Integer(index));
+ list.add(Integer.valueOf(index));
}
for (int index = 0; index < size; index++) {
Object result = list.get(index);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTestModel.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTestModel.java
index a868921..19a3a4c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTestModel.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,32 +92,32 @@ public static TestSuite getSimpleTestSuite() {
List args = new ArrayList();
args.add("varchar");
- args.add(new Integer(1));
- args.add(new Integer(123));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(123));
args.add(new BigDecimal("123.6"));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
args.add(new BigDecimal("123.5"));
PLSQLTest test = new PLSQLTest("SimpleIn", Address.class, args);
test.setName("SimpleInTest");
suite.addTest(test);
args = new ArrayList();
- args.add(new Integer(1));
- args.add(new Integer(123));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(123));
args.add(new BigDecimal("123.6"));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
args.add(new BigDecimal("123.5"));
test = new PLSQLTest("SimpleInDefaults", Address.class, args);
test.setName("SimpleInDefaults");
@@ -147,16 +147,16 @@ public static TestSuite getSimpleTestSuite() {
args = new ArrayList();
args.add("varchar");
- args.add(new Integer(1));
- args.add(new Integer(123));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(123));
args.add(new BigDecimal("123.6"));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
args.add(new BigDecimal("123.5"));
test = new PLSQLTest("SimpleInOut", Address.class, args);
test.setName("SimpleInOutTest");
@@ -172,16 +172,16 @@ public static TestSuite getFunctionTestSuite() {
List args = new ArrayList();
args.add("varchar");
- args.add(new Integer(1));
- args.add(new Integer(123));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(123));
args.add(new BigDecimal("123.6"));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
- args.add(new Integer(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
+ args.add(Integer.valueOf(1));
args.add(new BigDecimal("123.5"));
PLSQLTest test = new PLSQLTest("SimpleInFunc", Address.class, args);
test.setName("SimpleInFuncTest");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/PredefinedInQueryReadAllTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/PredefinedInQueryReadAllTest.java
index 4969ed5..22d16d5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/PredefinedInQueryReadAllTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/PredefinedInQueryReadAllTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,9 +44,9 @@ protected void setup() {
protected void test() {
Vector sals = new Vector();
- sals.addElement(new Integer(100));
- sals.addElement(new Integer(56232));
- sals.addElement(new Integer(10000));
+ sals.addElement(Integer.valueOf(100));
+ sals.addElement(Integer.valueOf(56232));
+ sals.addElement(Integer.valueOf(10000));
Vector args = new Vector();
args.addElement(sals);
@@ -56,9 +56,9 @@ protected void test() {
// Also execute the query using a collection type other than vector.
Collection collection = new HashSet();
- collection.add(new Integer(100));
- collection.add(new Integer(56232));
- collection.add(new Integer(10000));
+ collection.add(Integer.valueOf(100));
+ collection.add(Integer.valueOf(56232));
+ collection.add(Integer.valueOf(10000));
args = new Vector();
args.addElement(collection);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QBEExcludedValues.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QBEExcludedValues.java
index fcd0591..5b50618 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QBEExcludedValues.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QBEExcludedValues.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,7 @@ public void setup() {
//This method tests the excluded values list
employee = new Employee();
policy = new QueryByExamplePolicy();
- policy.excludeValue(new Integer(-1));
+ policy.excludeValue(Integer.valueOf(-1));
employee.setFirstName("John");
employee.setLastName("");
employee.setSalary(-1);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryExpressionMathTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryExpressionMathTest.java
index 0d205df..02f2678 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryExpressionMathTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryExpressionMathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,7 +52,7 @@ public void test() {
ExpressionBuilder eb = new ExpressionBuilder();
UpdateAllQuery updateQuery = new UpdateAllQuery(org.eclipse.persistence.testing.models.insurance.Claim.class);
updateQuery.setSelectionCriteria(eb.get("amount").greaterThan(1000));
- updateQuery.addUpdate(eb.get("amount"), ExpressionMath.multiply(eb.get("amount"), new Double(1.10)));
+ updateQuery.addUpdate(eb.get("amount"), ExpressionMath.multiply(eb.get("amount"), Double.valueOf(1.10)));
m_session.executeQuery(updateQuery);
}
@@ -67,12 +67,12 @@ protected void verify() {
Float original = (Float)m_originalClaims.get(id);
Float updated = (Float)m_updatedClaims.get(id);
- if (original.compareTo(new Float(1001)) < 0) {// Ensure it was not updated
+ if (original.compareTo(Float.valueOf(1001)) < 0) {// Ensure it was not updated
if (updated.compareTo(original) != 0) {
throw new TestErrorException("Claim amount was updated when it shouldn't have been");
}
} else {// Ensure it was properly updated
- if (updated.compareTo(new Float(original.floatValue() * 1.10)) != 0) {
+ if (updated.compareTo(Float.valueOf(original.floatValue() * 1.10f)) != 0) {
throw new TestErrorException("Claim amount (" + original + ") was NOT properly updated. Value = " + updated);
}
}
@@ -86,7 +86,7 @@ private Hashtable getClaims() {
while (e.hasMoreElements()) {
Claim claim = (Claim)e.nextElement();
- claimsToReturn.put(new Long(claim.getId()), new Float(claim.getAmount()));
+ claimsToReturn.put(Long.valueOf(claim.getId()), Float.valueOf(claim.getAmount()));
}
return claimsToReturn;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryRollbackTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryRollbackTest.java
index 64391c7..8e2c7b1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryRollbackTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/UpdateAllQueryRollbackTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,7 +55,7 @@ public void test() {
m_uow.executeQuery(uaq1);
UpdateAllQuery uaq2 = new UpdateAllQuery(Employee.class);
- uaq2.addUpdate(eb.getField("BAD"), new Integer(10000));
+ uaq2.addUpdate(eb.getField("BAD"), Integer.valueOf(10000));
m_uow.executeQuery(uaq2);
try {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/inmemory/CacheHitAndInMemoryTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/inmemory/CacheHitAndInMemoryTestSuite.java
index 4612c24..f8d5957 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/inmemory/CacheHitAndInMemoryTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/inmemory/CacheHitAndInMemoryTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,7 +42,7 @@ public void addCacheTests() {
addTest(new CacheHitTest(manager.getObject(Shipment.class, "example1")));
Order order = (Order)((Shipment)org.eclipse.persistence.testing.models.legacy.Employee.example1().shipments.elementAt(0)).orders.elementAt(0);
- order.shipment.shipmentNumber = new Integer(order.shipment.shipmentNumber.intValue());
+ order.shipment.shipmentNumber = Integer.valueOf(order.shipment.shipmentNumber.intValue());
addTest(new CacheHitTest(order));
org.eclipse.persistence.testing.models.legacy.Employee employee = (org.eclipse.persistence.testing.models.legacy.Employee)manager.getObject(org.eclipse.persistence.testing.models.legacy.Employee.class, "example1");
@@ -139,7 +139,7 @@ public void addInMemoryHitTests() {
builder = new ExpressionBuilder();
Vector ids = new Vector();
- ids.addElement(new Long(123456789));
+ ids.addElement(Long.valueOf(123456789));
ids.addElement(example.getId());
query = new ReadObjectQuery(Employee.class, builder.get("id").in(ids));
test = new InMemoryCacheHitTest(query);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/ParallelBuilderReportItemTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/ParallelBuilderReportItemTest.java
index 0962eb9..b29a669 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/ParallelBuilderReportItemTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/ParallelBuilderReportItemTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,8 +56,8 @@ protected void buildExpectedResults() throws Exception {
result[3] = wife.getLastName();
result[4] = husband.getGender();
result[5] = wife.getGender();
- result[6] = new Integer(husband.getSalary());
- result[7] = new Integer(wife.getSalary());
+ result[6] = Integer.valueOf(husband.getSalary());
+ result[7] = Integer.valueOf(wife.getSalary());
addResult(result, null);
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_2.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_2.java
index 4b5fecd..3f43326 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_2.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ protected void buildExpectedResults() {
Object[] result = new Object[3];
result[0] = emp.getFirstName();
result[1] = emp.getLastName();
- result[2] = new Integer(emp.getSalary());
+ result[2] = Integer.valueOf(emp.getSalary());
addResult(result, null);
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5a.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5a.java
index a649623..bfc293d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5a.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5a.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@ protected void buildExpectedResults() {
LargeProject project = (LargeProject)e.nextElement();
Object[] result = new Object[2];
result[0] = project.getName();
- result[1] = new Double(project.getBudget());
+ result[1] = Double.valueOf(project.getBudget());
addResult(result, null);
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5b.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5b.java
index 11ac35c..e34d522 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5b.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Scenario1_5b.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ protected void buildExpectedResults() {
if (project.getBudget() > 4000) {
Object[] result = new Object[2];
result[0] = project.getName();
- result[1] = new Double(project.getBudget());
+ result[1] = Double.valueOf(project.getBudget());
addResult(result, null);
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassOneToManyTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassOneToManyTestCase.java
index 0bcaf6b..b2335d2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassOneToManyTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassOneToManyTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -74,7 +74,7 @@ protected void setup() {
Company cloneCompany = (Company)uow.registerObject(originalCompany);
// Change the one of the Company's Vehicles
- ((Vehicle)((Vector)cloneCompany.getVehicles().getValue()).firstElement()).setPassengerCapacity(new Integer(origCapacity.intValue() + 1));
+ ((Vehicle)((Vector)cloneCompany.getVehicles().getValue()).firstElement()).setPassengerCapacity(Integer.valueOf(origCapacity.intValue() + 1));
}
protected void test() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java
index 360e673..ec519d0 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -222,23 +222,23 @@ public void verify() {
public static Object getWrapperClassInstance(Class cls) {
if (Integer.TYPE.equals(cls)) {
- return new Integer(0);
+ return Integer.valueOf(0);
} else if (Boolean.TYPE.equals(cls)) {
- return new Boolean(false);
+ return Boolean.valueOf(false);
} else if (Character.TYPE.equals(cls)) {
- return new Character(' ');
+ return Character.valueOf(' ');
} else if (Byte.TYPE.equals(cls)) {
byte b = 0;
- return new Byte(b);
+ return Byte.valueOf(b);
} else if (Short.TYPE.equals(cls)) {
short s = 0;
- return new Short(s);
+ return Short.valueOf(s);
} else if (Long.TYPE.equals(cls)) {
- return new Long(0);
+ return Long.valueOf(0);
} else if (Float.TYPE.equals(cls)) {
- return new Float(0);
+ return Float.valueOf(0);
} else if (Double.TYPE.equals(cls)) {
- return new Double(0);
+ return Double.valueOf(0);
} else {
return null;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/BaseClass.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/BaseClass.java
index 81d8925..984f258 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/BaseClass.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/BaseClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,12 +56,12 @@ protected void setAB(BigDecimal a, BigDecimal b) {
a_plus_minus_b_BigDecimal[1] = null;
}
if (a != null) {
- a_Integer = new Integer(a.intValue());
+ a_Integer = Integer.valueOf(a.intValue());
} else {
a_Integer = null;
}
if (b != null) {
- b_Integer = new Integer(b.intValue());
+ b_Integer = Integer.valueOf(b.intValue());
} else {
b_Integer = null;
}
@@ -70,7 +70,7 @@ protected void setAB(BigDecimal a, BigDecimal b) {
protected void setC(BigDecimal c) {
if (c != null) {
c_BigDecimal = c;
- c_Integer = new Integer(c_BigDecimal.intValue());
+ c_Integer = Integer.valueOf(c_BigDecimal.intValue());
} else {
c_BigDecimal = null;
c_Integer = null;
@@ -102,8 +102,8 @@ protected void setC(BigDecimal c) {
} else {
BigDecimal a_plus_b = a.add(b);
BigDecimal a_minus_b = a.subtract(b);
- a_plus_minus_b_Integer[0] = new Integer(a_plus_b.intValue());
- a_plus_minus_b_Integer[1] = new Integer(a_minus_b.intValue());
+ a_plus_minus_b_Integer[0] = Integer.valueOf(a_plus_b.intValue());
+ a_plus_minus_b_Integer[1] = Integer.valueOf(a_minus_b.intValue());
}
return a_plus_minus_b_Integer;
}*/
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/schemaframework/SPGExecuteStoredProcedureTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/schemaframework/SPGExecuteStoredProcedureTest.java
index 7963571..5694fa8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/schemaframework/SPGExecuteStoredProcedureTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/schemaframework/SPGExecuteStoredProcedureTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,13 +29,13 @@ public class SPGExecuteStoredProcedureTest extends TestCase {
int deleteSuccess = 1;
String parameterNamePrefix;
boolean shouldUseNamedArguments;
- static final Integer menuID = new Integer(99);
- static final Integer restaurantID = new Integer(100);
- static final Integer dinerID = new Integer(101);
- static final Integer personID = new Integer(102);
- static final Integer locationID = new Integer(103);
- static final Integer waiterID = new Integer(104);
- static final Integer menuItemID = new Integer(105);
+ static final Integer menuID = Integer.valueOf(99);
+ static final Integer restaurantID = Integer.valueOf(100);
+ static final Integer dinerID = Integer.valueOf(101);
+ static final Integer personID = Integer.valueOf(102);
+ static final Integer locationID = Integer.valueOf(103);
+ static final Integer waiterID = Integer.valueOf(104);
+ static final Integer menuItemID = Integer.valueOf(105);
static final String menuType = "Lunch";
static final String menuTypeUpdate = "Dinner";
static final String dinerFirstName = "Steve";
@@ -55,8 +55,8 @@ public class SPGExecuteStoredProcedureTest extends TestCase {
static final String waiterSpecialityUpdate = "Speaking Spanish and Italian";
static final String waiterClass = "A";
static final String menuItemName = "Roasted beef and potato";
- static final Float menuItemPrice = new Float(20.99f);
- static final Float menuItemPriceUpdate = new Float(22.99f);
+ static final Float menuItemPrice = Float.valueOf(20.99f);
+ static final Float menuItemPriceUpdate = Float.valueOf(22.99f);
static final String restaurantName = "May Flower";
static final String restaurantNameUpdate = "Great Wall Restaurant";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java
index 5a07ba4..80b1186 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@ protected void setup() throws Exception {
loginConfig.setExternalTransactionController(false);
loginConfig.setForceFieldNamesToUppercase(false);
loginConfig.setJdbcBatchWriting(false);
- loginConfig.setMaxBatchWritingSize(new Integer(5));
+ loginConfig.setMaxBatchWritingSize(Integer.valueOf(5));
loginConfig.setNativeSequencing(false);
loginConfig.setNativeSQL(false);
loginConfig.setOptimizeDataConversion(true);
@@ -99,7 +99,7 @@ protected void setup() throws Exception {
loginConfig.setPlatformClass("platform");
loginConfig.setSequenceCounterField("SEQ_COUNT");
loginConfig.setSequenceNameField("SEQ_NAME");
- loginConfig.setSequencePreallocationSize(new Integer(99));
+ loginConfig.setSequencePreallocationSize(Integer.valueOf(99));
loginConfig.setSequenceTable("\"SEQUENCE\"");
loginConfig.setStreamsForBinding(false);
loginConfig.setStringBinding(false);
@@ -161,16 +161,16 @@ protected void setup() throws Exception {
ServerSessionConfig serverSessionConfig = new ServerSessionConfig();
serverSessionConfig.setPoolsConfig(new PoolsConfig());
ReadConnectionPoolConfig readPool = new ReadConnectionPoolConfig();
- readPool.setMaxConnections(new Integer(2));
- readPool.setMinConnections(new Integer(2));
+ readPool.setMaxConnections(Integer.valueOf(2));
+ readPool.setMinConnections(Integer.valueOf(2));
serverSessionConfig.getPoolsConfig().setReadConnectionPoolConfig(readPool);
WriteConnectionPoolConfig writePool = new WriteConnectionPoolConfig();
- writePool.setMaxConnections(new Integer(10));
- writePool.setMinConnections(new Integer(5));
+ writePool.setMaxConnections(Integer.valueOf(10));
+ writePool.setMinConnections(Integer.valueOf(5));
serverSessionConfig.getPoolsConfig().setWriteConnectionPoolConfig(writePool);
WriteConnectionPoolConfig userPool = new WriteConnectionPoolConfig();
- userPool.setMaxConnections(new Integer(5));
- userPool.setMinConnections(new Integer(0));
+ userPool.setMaxConnections(Integer.valueOf(5));
+ userPool.setMinConnections(Integer.valueOf(0));
serverSessionConfig.getPoolsConfig().addConnectionPoolConfig(userPool);
sessions.addSessionConfig(serverSessionConfig);
FileWriter writer = new FileWriter(m_resource);
@@ -253,7 +253,7 @@ protected void verify() {
checkBoolean("ExternalTransactionController", loginConfig.getExternalTransactionController(), false);
checkBoolean("ForceFieldNamesToUppercase", loginConfig.getForceFieldNamesToUppercase(), false);
checkBoolean("JdbcBatchWriting", loginConfig.getJdbcBatchWriting(), false);
- check("MaxBatchWritingSize", loginConfig.getMaxBatchWritingSize(), new Integer(5));
+ check("MaxBatchWritingSize", loginConfig.getMaxBatchWritingSize(), Integer.valueOf(5));
checkBoolean("NativeSequencing", loginConfig.getNativeSequencing(), false);
checkBoolean("NativeSQL", loginConfig.getNativeSQL(), false);
checkBoolean("OptimizeDataConversion", loginConfig.getOptimizeDataConversion(), true);
@@ -261,7 +261,7 @@ protected void verify() {
check("PlatformClass", loginConfig.getPlatformClass(), "platform");
check("SequenceCounterField", loginConfig.getSequenceCounterField(), "SEQ_COUNT");
check("SequenceNameField", loginConfig.getSequenceNameField(), "SEQ_NAME");
- check("SequencePreallocationSize", loginConfig.getSequencePreallocationSize(), new Integer(99));
+ check("SequencePreallocationSize", loginConfig.getSequencePreallocationSize(), Integer.valueOf(99));
check("SequenceTable", loginConfig.getSequenceTable(), "\"SEQUENCE\"");
checkBoolean("StreamsForBinding", loginConfig.getStreamsForBinding(), false);
checkBoolean("StringBinding", loginConfig.getStringBinding(), false);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simplepojoclient/PojoEmployeeProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simplepojoclient/PojoEmployeeProject.java
index 4caaa8d..3ac7f3b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simplepojoclient/PojoEmployeeProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simplepojoclient/PojoEmployeeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,8 +91,8 @@ public ClassDescriptor buildPojoEmployeeDescriptor() {
genderMapping.setSetMethodName("setGender");
genderMapping.setFieldName("POJO_EMPLOYEE.GENDER");
ObjectTypeConverter genderMappingConverter = new ObjectTypeConverter();
- genderMappingConverter.addConversionValue(new Character('F'), "Female");
- genderMappingConverter.addConversionValue(new Character('M'), "Male");
+ genderMappingConverter.addConversionValue(Character.valueOf('F'), "Female");
+ genderMappingConverter.addConversionValue(Character.valueOf('M'), "Male");
genderMapping.setConverter(genderMappingConverter);
descriptor.addMapping(genderMapping);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/AddDescriptorsMultithreadedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/AddDescriptorsMultithreadedTest.java
index 0c33e3f..40e1e8b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/AddDescriptorsMultithreadedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/AddDescriptorsMultithreadedTest.java
@@ -147,7 +147,7 @@ public AddDescriptorsTest(int testNumber, int numberOfTests, long timeToSleepBet
long timeToSleepBetweenAddingDescriptors;
InterfaceHashtableProject project;
static int numberOfCompletedTests = 0;
- static Object lock = new Boolean(true);
+ static Object lock = Boolean.valueOf(true);
public void test() {
DatabaseSession dbSession;
if (getSession().isDatabaseSession()) {
@@ -320,7 +320,7 @@ public InsertTest(int testNumber, int numberOfTests) {
int testNumber;
int numberOfTests;
static int numberOfCompletedTests = 0;
- static Object lock = new Boolean(true);
+ static Object lock = Boolean.valueOf(true);
public void test() {
// Test execution causes deadlock on SQL Server
if (getAbstractSession().getParent().getPlatform().isSQLServer()) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrencyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrencyTest.java
index c6bc5ff..12ba97a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrencyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrencyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,7 +46,7 @@ protected void setup() throws Throwable {
protected void test() throws Throwable {
// TODO Auto-generated method stub
super.test();
- Integer i = new Integer(5);
+ Integer i = Integer.valueOf(5);
Thread thread1 = new Thread(new Runner1(i, emp.getId(),project.getId(),getSession()));
thread1.setName("Runner1");
Thread thread2 = new Thread(new Runner2(i, emp.getId(),project.getId(),getSession()));
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/stress/ClientThread.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/stress/ClientThread.java
index a8b5bd4..d716e9c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/stress/ClientThread.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/stress/ClientThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ public void run() {
UnitOfWork uow = client.acquireUnitOfWork();
uow.readAllObjects(SmallProject.class);
edit = (org.eclipse.persistence.testing.models.employee.domain.Project)uow.registerObject(edit);
- edit.setName((new Long(System.currentTimeMillis())).toString());
+ edit.setName((Long.valueOf(System.currentTimeMillis())).toString());
try {
uow.commit();
} catch (OptimisticLockException exception) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/BooleanTester.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/BooleanTester.java
index ca67fab..6ea36cb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/BooleanTester.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/BooleanTester.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,9 @@ public BooleanTester() {
}
public BooleanTester(boolean testValue) {
- super(new Boolean(testValue).toString());
+ super(Boolean.valueOf(testValue).toString());
booleanValue = testValue;
- booleanClassValue = new Boolean(testValue);
+ booleanClassValue = Boolean.valueOf(testValue);
}
public static RelationalDescriptor descriptor() {
@@ -83,7 +83,7 @@ public void setBooleanClassValue(Boolean boolValue) {
}
public void setBooleanClassValue(boolean boolValue) {
- booleanClassValue = new Boolean(boolValue);
+ booleanClassValue = Boolean.valueOf(boolValue);
}
public void setBooleanValue(Boolean boolValue) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/NumericTester.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/NumericTester.java
index 736b9d7..26d4ca1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/NumericTester.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/NumericTester.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,17 +44,17 @@ public class NumericTester extends TypeTester {
public NumericTester() {
super("ZERO");
intValue = 0;
- integerClassValue = new Integer(0);
+ integerClassValue = Integer.valueOf(0);
floatValue = 0;
- floatClassValue = new Float(0);
+ floatClassValue = Float.valueOf(0);
longValue = 0;
- longClassValue = new Long(0);
+ longClassValue = Long.valueOf(0);
doubleValue = 0;
- doubleClassValue = new Double(0);
+ doubleClassValue = Double.valueOf(0);
shortValue = (short)0;
- shortClassValue = new Short((short)0);
+ shortClassValue = Short.valueOf((short)0);
byteValue = (byte)0;
- byteClassValue = new Byte((byte)0);
+ byteClassValue = Byte.valueOf((byte)0);
bigIntegerValue = new BigInteger("0");
bigDecimalValue = new BigDecimal(bigIntegerValue, 19);
}
@@ -274,7 +274,7 @@ public void setBigIntegerValue(BigInteger aBigInteger) {
}
public void setByteClassValue(byte aByte) {
- byteClassValue = new Byte(aByte);
+ byteClassValue = Byte.valueOf(aByte);
}
public void setByteClassValue(Byte aByte) {
@@ -286,7 +286,7 @@ public void setByteValue(byte aByte) {
}
public void setDoubleClassValue(double aDouble) {
- doubleClassValue = new Double(aDouble);
+ doubleClassValue = Double.valueOf(aDouble);
}
public void setDoubleClassValue(Double aDouble) {
@@ -298,7 +298,7 @@ public void setDoubleValue(double aDouble) {
}
public void setFloatClassValue(float aFloat) {
- floatClassValue = new Float(aFloat);
+ floatClassValue = Float.valueOf(aFloat);
}
public void setFloatClassValue(Float aFloat) {
@@ -310,7 +310,7 @@ public void setFloatValue(float newFloat) {
}
public void setIntegerClassValue(int anInteger) {
- integerClassValue = new Integer(anInteger);
+ integerClassValue = Integer.valueOf(anInteger);
}
public void setIntegerClassValue(Integer anInteger) {
@@ -322,7 +322,7 @@ public void setIntegerValue(int anInt) {
}
public void setLongClassValue(long aLong) {
- longClassValue = new Long(aLong);
+ longClassValue = Long.valueOf(aLong);
}
public void setLongClassValue(Long aLong) {
@@ -338,7 +338,7 @@ public void setShortClassValue(Short aShort) {
}
public void setShortClassValue(short aShort) {
- shortClassValue = new Short(aShort);
+ shortClassValue = Short.valueOf(aShort);
}
public void setShortValue(short aShort) {
@@ -402,17 +402,17 @@ protected static NumericTester zeroValues(DatabasePlatform platform) {
NumericTester tester = new NumericTester("ZERO");
tester.setIntegerValue(0);
- tester.setIntegerClassValue(new Integer(0));
+ tester.setIntegerClassValue(Integer.valueOf(0));
tester.setFloatValue(0);
- tester.setFloatClassValue(new Float(0));
+ tester.setFloatClassValue(Float.valueOf(0));
tester.setLongValue(0);
- tester.setLongClassValue(new Long(0));
+ tester.setLongClassValue(Long.valueOf(0));
tester.setDoubleValue(0);
- tester.setDoubleClassValue(new Double(0));
+ tester.setDoubleClassValue(Double.valueOf(0));
tester.setShortValue((short)0);
- tester.setShortClassValue(new Short((short)0));
+ tester.setShortClassValue(Short.valueOf((short)0));
tester.setByteValue((byte)0);
- tester.setByteClassValue(new Byte((byte)0));
+ tester.setByteClassValue(Byte.valueOf((byte)0));
tester.setBigIntegerValue(new BigInteger("0"));
tester.setBigDecimalValue(new BigDecimal("0"));
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/ConcurrentAddress.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/ConcurrentAddress.java
index 42b15be..adc1958 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/ConcurrentAddress.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/ConcurrentAddress.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -311,7 +311,7 @@ public static RelationalDescriptor descriptor() {
DirectToFieldMapping cityMapping = new DirectToFieldMapping();
cityMapping.setAttributeName("city");
cityMapping.setFieldName("CONCURRENT_ADDRESS.CITY");
- cityMapping.setWeight(new Integer(10));
+ cityMapping.setWeight(Integer.valueOf(10));
descriptor.addMapping(cityMapping);
DirectToFieldMapping countryMapping = new DirectToFieldMapping();
@@ -319,7 +319,7 @@ public static RelationalDescriptor descriptor() {
countryMapping.setFieldName("CONCURRENT_ADDRESS.COUNTRY");
countryMapping.setSetMethodName("setCountry");
countryMapping.setGetMethodName("getCountry");
- countryMapping.setWeight(new Integer(9));
+ countryMapping.setWeight(Integer.valueOf(9));
descriptor.addMapping(countryMapping);
DirectToFieldMapping idMapping = new DirectToFieldMapping();
@@ -327,13 +327,13 @@ public static RelationalDescriptor descriptor() {
idMapping.setFieldName("CONCURRENT_ADDRESS.ADDRESS_ID");
idMapping.setSetMethodName("setId");
idMapping.setGetMethodName("getId");
- idMapping.setWeight(new Integer(8));
+ idMapping.setWeight(Integer.valueOf(8));
descriptor.addMapping(idMapping);
DirectToFieldMapping postalCodeMapping = new DirectToFieldMapping();
postalCodeMapping.setAttributeName("postalCode");
postalCodeMapping.setFieldName("CONCURRENT_ADDRESS.P_CODE");
- postalCodeMapping.setWeight(new Integer(7));
+ postalCodeMapping.setWeight(Integer.valueOf(7));
descriptor.addMapping(postalCodeMapping);
DirectToFieldMapping provinceMapping = new DirectToFieldMapping();
@@ -341,13 +341,13 @@ public static RelationalDescriptor descriptor() {
provinceMapping.setFieldName("CONCURRENT_ADDRESS.PROVINCE");
provinceMapping.setSetMethodName("setProvince");
provinceMapping.setGetMethodName("getProvince");
- provinceMapping.setWeight(new Integer(6));
+ provinceMapping.setWeight(Integer.valueOf(6));
descriptor.addMapping(provinceMapping);
DirectToFieldMapping streetMapping = new DirectToFieldMapping();
streetMapping.setAttributeName("street");
streetMapping.setFieldName("CONCURRENT_ADDRESS.STREET");
- streetMapping.setWeight(new Integer(5));
+ streetMapping.setWeight(Integer.valueOf(5));
descriptor.addMapping(streetMapping);
return descriptor;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/NoIdentityMergeCloneTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/NoIdentityMergeCloneTest.java
index ea9ed8e..ef54b46 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/NoIdentityMergeCloneTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/NoIdentityMergeCloneTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,7 @@ public void setup() {
while (iterator.hasNext()) {
ClassDescriptor descriptor = (ClassDescriptor)iterator.next();
checkCacheState.put(descriptor,
- new Integer(descriptor.getQueryManager().getDoesExistQuery().getExistencePolicy()));
+ Integer.valueOf(descriptor.getQueryManager().getDoesExistQuery().getExistencePolicy()));
if(descriptor.requiresInitialization((AbstractSession) getSession())) {
// identityMapClass is null for AggregateObject, AggregateMapping and Interface descriptors.
identityMapTypes.put(descriptor, descriptor.getIdentityMapClass());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/changeflag/TransparentMapTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/changeflag/TransparentMapTest.java
index a479e02..54aa99c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/changeflag/TransparentMapTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/changeflag/TransparentMapTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -112,7 +112,7 @@ public void test() {
//test update
this.licenceType = "Alcohol License";
this.licenceValue = (Boolean)clone.getLicenses().get(licenceType);
- clone.getLicenses().put(licenceType, new Boolean((!(this.licenceValue).booleanValue())));
+ clone.getLicenses().put(licenceType, Boolean.valueOf(!(this.licenceValue).booleanValue()));
uow.commit();
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ChangeTrackedWeakReferenceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ChangeTrackedWeakReferenceTest.java
index 7f18bcf..b29e5d6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ChangeTrackedWeakReferenceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ChangeTrackedWeakReferenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public void test(){
try{
Long[] arr = new Long[100000];
for (int i = 0; i< 100000; ++i){
- arr[i] = new Long(i);
+ arr[i] = Long.valueOf(i);
}
}catch (Error er){
//ignore
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/DeferredChangeWeakReferenceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/DeferredChangeWeakReferenceTest.java
index ab5d394..663db18 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/DeferredChangeWeakReferenceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/DeferredChangeWeakReferenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@ public void test(){
try{
Long[] arr = new Long[100000];
for (int i = 0; i< 100000; ++i){
- arr[i] = new Long(i);
+ arr[i] = Long.valueOf(i);
}
}catch (Error er){
//ignore
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ForceWeakReferenceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ForceWeakReferenceTest.java
index 0f93cf5..6371166 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ForceWeakReferenceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/ForceWeakReferenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public void test(){
try{
Long[] arr = new Long[10000000];
for (int i = 0; i< 10000000; ++i){
- arr[i] = new Long(i);
+ arr[i] = Long.valueOf(i);
}
System.gc();
try{
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/HardReferenceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/HardReferenceTest.java
index 18dc544..790ca38 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/HardReferenceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/HardReferenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@ public void test(){
try{
Long[] arr = new Long[100000];
for (int i = 0; i< 100000; ++i){
- arr[i] = new Long(i);
+ arr[i] = Long.valueOf(i);
}
}catch (Error er){
//ignore
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/WeakReferenceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/WeakReferenceTest.java
index ce92add..314d9ec 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/WeakReferenceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/referencesettings/WeakReferenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@ public void test(){
try{
Long[] arr = new Long[10000000];
for (int i = 0; i< 10000000; ++i){
- arr[i] = new Long(i);
+ arr[i] = Long.valueOf(i);
}
System.gc();
try{
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java
index 5adf6b9..cb679c1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,7 +41,7 @@ protected void setup() {
public void test() {
try {
- mapping.setAttributeValueInObject(null, new Integer(0));
+ mapping.setAttributeValueInObject(null, Integer.valueOf(0));
} catch (EclipseLinkException exception) {
caughtException = exception;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/PrintStackTraceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/PrintStackTraceTest.java
index 83e8cdf..86001cc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/PrintStackTraceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/PrintStackTraceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ public PrintStackTraceTest() {
public void test() {
// do not use logMessages(), which has been already set up for the session
- Integer integer = new Integer(1);
+ Integer integer = Integer.valueOf(1);
try {
UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(integer);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/QueryParameterForOneToOneValidationTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/QueryParameterForOneToOneValidationTest.java
index 86747f9..6638971 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/QueryParameterForOneToOneValidationTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/QueryParameterForOneToOneValidationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,7 +78,7 @@ public void test() {
try {
// doesn't matter what id is queried
Vector params = new Vector();
- params.add(new Integer(id));
+ params.add(Integer.valueOf(id));
// special case for conforming
if (this.shouldConform) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CMWorkbenchIntegrationSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CMWorkbenchIntegrationSystem.java
index 39c19d7..ef9d0df 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CMWorkbenchIntegrationSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CMWorkbenchIntegrationSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -139,7 +139,7 @@ public static DatabaseQuery buildPersistenceTestEqualPCharQuery() {
public static DatabaseQuery buildPersistenceTestEqualCharacterQuery() {
ExpressionBuilder builder = new ExpressionBuilder(ConversionDataObject.class);
- Expression expression = builder.get("aCharacter").equal(new Character('b'));
+ Expression expression = builder.get("aCharacter").equal(Character.valueOf('b'));
ReadObjectQuery query = new ReadObjectQuery(ConversionDataObject.class);
query.setSelectionCriteria(expression);
return query;
@@ -171,7 +171,7 @@ public static DatabaseQuery buildPersistenceTestEqualPByteArrayQuery() {
public static DatabaseQuery buildPersistenceTestEqualByteQuery() {
ExpressionBuilder builder = new ExpressionBuilder(ConversionDataObject.class);
- Expression expression = builder.get("aByte").equal(new Byte((byte)3));
+ Expression expression = builder.get("aByte").equal(Byte.valueOf((byte)3));
ReadObjectQuery query = new ReadObjectQuery(ConversionDataObject.class);
query.setSelectionCriteria(expression);
return query;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/EmployeeCustomSQLMWIntegrationSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/EmployeeCustomSQLMWIntegrationSystem.java
index 829b28f..33c1c31 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/EmployeeCustomSQLMWIntegrationSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/EmployeeCustomSQLMWIntegrationSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -99,9 +99,9 @@ public void buildStoredProcedureCallInQueryIntoDescriptor() {
StoredProcedureCall call = new StoredProcedureCall();
call.setProcedureName("StoredProcedure_InOut_Out_In");
- call.addNamedInOutputArgumentValue("P_INOUT", new Integer(100), "P_INOUT_FIELD_NAME", Integer.class);
+ call.addNamedInOutputArgumentValue("P_INOUT", Integer.valueOf(100), "P_INOUT_FIELD_NAME", Integer.class);
call.addNamedOutputArgument("P_OUT", "P_OUT_FIELD_NAME", Integer.class);
- call.addNamedArgumentValue("P_IN", new Integer(1000));
+ call.addNamedArgumentValue("P_IN", Integer.valueOf(1000));
//Set stored procedure to Named query.
DataReadQuery dataReadQuery = new DataReadQuery();
@@ -115,9 +115,9 @@ public void buildUNamedStoredProcedureCallInQueryIntoDescriptor() {
StoredProcedureCall unamedcall = new StoredProcedureCall();
unamedcall.setProcedureName("StoredProcedure_InOut_Out_In");
- unamedcall.addUnamedInOutputArgumentValue(new Integer(100), "P_INOUT_FIELD_NAME", Integer.class);
+ unamedcall.addUnamedInOutputArgumentValue(Integer.valueOf(100), "P_INOUT_FIELD_NAME", Integer.class);
unamedcall.addUnamedOutputArgument("P_OUT_FIELD_NAME", Integer.class);
- unamedcall.addUnamedArgumentValue(new Integer(1000));
+ unamedcall.addUnamedArgumentValue(Integer.valueOf(1000));
//Set stored procedure to Named query
DataReadQuery unameddataReadQuery = new DataReadQuery();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java
index 5ede58c..3f44aba 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,10 +37,10 @@ public void setup() {
InheritancePolicy iPolicy = project.getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Project.class).getInheritancePolicy();
// Inheritance Properties.
- iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class, new Byte("1"));
- iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class, new Short("2"));
- iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.Project.class, new Long("3"));
- iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.PhoneNumber.class, new Double("4.0"));
+ iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class, Byte.valueOf("1"));
+ iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class, Short.valueOf("2"));
+ iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.Project.class, Long.valueOf("3"));
+ iPolicy.addClassIndicator(org.eclipse.persistence.testing.models.employee.domain.PhoneNumber.class, Double.valueOf("4.0"));
}
/**
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredFunctionCallTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredFunctionCallTest.java
index 6e929ed..6cecb18 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredFunctionCallTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredFunctionCallTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,8 +60,8 @@ public void setup() {
public void test() {
Vector parameters = new Vector();
- Long p_inout = new Long(99);
- Long p_in = new Long(100);
+ Long p_inout = Long.valueOf(99);
+ Long p_in = Long.valueOf(100);
parameters.add(p_inout);
parameters.add(p_in);
result = getSession().executeQuery(query, parameters);
@@ -70,17 +70,17 @@ public void test() {
public void verify() {
DatabaseRecord row = (DatabaseRecord)((Vector)result).firstElement();
Long p_inout = (Long)row.get("P_INOUT");
- if (!p_inout.equals(new Long(100))) {
+ if (!p_inout.equals(Long.valueOf(100))) {
throw new TestErrorException(
"The stored function did not execute correctly. Expected: [P_INOUT = 100]");
}
Long p_out = (Long)row.get("P_OUT");
- if (!p_out.equals(new Long(99))) {
+ if (!p_out.equals(Long.valueOf(99))) {
throw new TestErrorException(
"The stored function did not execute correctly. Expected: [P_OUT = 99]");
}
Long returnValue = (Long)row.getValues().firstElement();
- if (!returnValue.equals(new Long(99))) {
+ if (!returnValue.equals(Long.valueOf(99))) {
throw new TestErrorException(
"The stored function did not execute correctly. Expected: [return value = 99]");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredProcedureCallTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredProcedureCallTest.java
index 17c4d88..6d4c190 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredProcedureCallTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLStoredProcedureCallTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,7 +89,7 @@ private void verifyNamedArgumentStoredProcedureCall() {
Integer P_INOUT_FIELD_NAME = (Integer)row.get("P_INOUT_FIELD_NAME");
Integer P_OUT_FIELD_NAME = (Integer)row.get("P_OUT_FIELD_NAME");
- if (!P_INOUT_FIELD_NAME.equals(new Integer(1000)) || !P_OUT_FIELD_NAME.equals(new Integer(100))) {
+ if (!P_INOUT_FIELD_NAME.equals(Integer.valueOf(1000)) || !P_OUT_FIELD_NAME.equals(Integer.valueOf(100))) {
throw new TestErrorException("Stored Procedure which write to or read from XML does not execute as expected.");
}
}
@@ -109,8 +109,8 @@ private void verifyUNamedArgumentStoredProcedureCall() {
Integer UNAMED_P_INOUT_FIELD_NAME = (Integer)unamedrow.get("P_INOUT_FIELD_NAME");
Integer UNAMED_P_OUT_FIELD_NAME = (Integer)unamedrow.get("P_OUT_FIELD_NAME");
- if (!UNAMED_P_INOUT_FIELD_NAME.equals(new Integer(1000)) ||
- !UNAMED_P_OUT_FIELD_NAME.equals(new Integer(100))) {
+ if (!UNAMED_P_INOUT_FIELD_NAME.equals(Integer.valueOf(1000)) ||
+ !UNAMED_P_OUT_FIELD_NAME.equals(Integer.valueOf(100))) {
throw new TestErrorException("UNnamed Stored Procedure which write to or read from XML dose not execute as expected.");
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/writing/ComplexUpdateTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/writing/ComplexUpdateTest.java
index 4037833..b07d5c2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/writing/ComplexUpdateTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/writing/ComplexUpdateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,7 +51,7 @@ public void commitParentUnitOfWork() {
}
public String getName() {
- return super.getName() + new Boolean(usesUnitOfWork) + new Boolean(usesNestedUnitOfWork);
+ return super.getName() + Boolean.valueOf(usesUnitOfWork) + Boolean.valueOf(usesNestedUnitOfWork);
}
public void reset() {
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java
index 497dff1..63ec1a3 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/HelperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,7 +72,7 @@ public void basicTest() {
aVector.clear();
for (int i = 0; i < 3; i++) {
- aVector.add(i, new Integer(i));
+ aVector.add(i, Integer.valueOf(i));
}
Vector reverseVector = Helper.reverseVector(aVector);
@@ -95,7 +95,7 @@ public void checkAreVectorTypesAssignableTest() {
@Test
public void checkAreVectorTypesAssignableWithNullVectorTest() {
Vector v1 = new Vector();
- v1.addElement(new Integer(1));
+ v1.addElement(Integer.valueOf(1));
Assert.assertFalse("An exception should not have been thrown when checking if vectors are assignable - when one of the vectors is null.",
Helper.areTypesAssignable(v1, null));
}
@@ -135,8 +135,8 @@ public void compareArrayContentTest() {
Integer[] array2 = new Integer[3];
Integer[] array3 = new Integer[3];
for (int count = 0; count < 3; count++) {
- Integer counter = new Integer(count);
- Integer counter2 = new Integer(count + 9);
+ Integer counter = Integer.valueOf(count);
+ Integer counter2 = Integer.valueOf(count + 9);
array1[count] = counter;
array2[count] = counter;
array3[count] = counter2;
@@ -154,12 +154,12 @@ public void compareArrayLengthTest() {
Integer[] array2 = new Integer[2];
Integer[] array3 = new Integer[3];
for (int count = 0; count < 2; count++) {
- Integer counter = new Integer(count);
+ Integer counter = Integer.valueOf(count);
array1[count] = counter;
array2[count] = counter;
array3[count] = counter;
}
- array3[2] = new Integer(10);
+ array3[2] = Integer.valueOf(10);
Assert.assertTrue("Helper.compareArrays(Object[] array1, Object[] array2) does not recognize that object arrays are of same length.",
Helper.compareArrays(array1, array2));
@@ -195,7 +195,7 @@ public void compareCharArrayLengthTest() {
public void timeFromDateTest() {
boolean optimizedDatesState = Helper.shouldOptimizeDates();
try {
- Date testDate = Helper.utilDateFromLong(new Long(System.currentTimeMillis()));
+ Date testDate = Helper.utilDateFromLong(Long.valueOf(System.currentTimeMillis()));
String testTime = new Time(testDate.getTime()).toString();
Helper.setShouldOptimizeDates(false);
@@ -214,7 +214,7 @@ public void timeFromDateTest() {
public void TimeFromLongTest() {
boolean optimizedDatesState = Helper.shouldOptimizeDates();
try {
- Long currentTime = new Long(System.currentTimeMillis());
+ Long currentTime = Long.valueOf(System.currentTimeMillis());
Time expectedTestTime = new Time(currentTime.longValue());
Helper.setShouldOptimizeDates(false);
@@ -257,7 +257,7 @@ public void timeFromStringTest() {
public void timestampFromDateTest() {
boolean optimizedDatesState = Helper.shouldOptimizeDates();
try {
- Date currentTime = Helper.utilDateFromLong(new Long(System.currentTimeMillis()));
+ Date currentTime = Helper.utilDateFromLong(Long.valueOf(System.currentTimeMillis()));
String testTime = new Timestamp(currentTime.getTime()).toString();
Helper.setShouldOptimizeDates(true);
@@ -272,7 +272,7 @@ public void timestampFromDateTest() {
public void timestampFromLongTest() {
boolean optimizedDatesState = Helper.shouldOptimizeDates();
try {
- Long currentTime = new Long(System.currentTimeMillis());
+ Long currentTime = Long.valueOf(System.currentTimeMillis());
String testTime = new Timestamp(currentTime.longValue()).toString();
Helper.setShouldOptimizeDates(true);
diff --git a/foundation/eclipselink.extension.oracle.spatial.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/structconverter/StructConverterTestSuite.java b/foundation/eclipselink.extension.oracle.spatial.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/structconverter/StructConverterTestSuite.java
index a1f7372..1ceee97 100644
--- a/foundation/eclipselink.extension.oracle.spatial.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/structconverter/StructConverterTestSuite.java
+++ b/foundation/eclipselink.extension.oracle.spatial.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/structconverter/StructConverterTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@ public void testPlatform() {
EntityManager em = createEntityManager(STRUCT_CONVERTER_PU);
try{
// trigger deploy
- em.find(SimpleSpatial.class, new Long(1));
+ em.find(SimpleSpatial.class, Long.valueOf(1));
} catch (Exception e){};
StructConverter converter = getServerSession(STRUCT_CONVERTER_PU).getPlatform().getTypeConverters().get(JGeometry.class);
@@ -112,7 +112,7 @@ public void testXMLPlatform() {
EntityManager em = createEntityManager(XML_STRUCT_CONVERTER_PU);
try {
// trigger deploy
- em.find(SimpleXMLSpatial.class, new Long(1));
+ em.find(SimpleXMLSpatial.class, Long.valueOf(1));
} catch (Exception e){};
StructConverter converter = getServerSession(XML_STRUCT_CONVERTER_PU).getPlatform().getTypeConverters().get(JGeometry.class);
@@ -140,7 +140,7 @@ public void testSimpleSpatialWrite(){
em.clear();
- simpleSpatial = em.find(SimpleSpatial.class, new Long(1000));
+ simpleSpatial = em.find(SimpleSpatial.class, Long.valueOf(1000));
assertNotNull("JGeometry was not properly read in.", simpleSpatial.getJGeometry());
rollbackTransaction(em);
@@ -162,7 +162,7 @@ public void testSimpleXMLSpatialWrite() {
em.clear();
- simpleSpatial = em.find(SimpleXMLSpatial.class, new Long(1000));
+ simpleSpatial = em.find(SimpleXMLSpatial.class, Long.valueOf(1000));
assertNotNull("JGeometry was not properly read in.", simpleSpatial.getJGeometry());
rollbackTransaction(em);
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceComparisonTestResult.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceComparisonTestResult.java
index 5557b15..a1ec078 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceComparisonTestResult.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceComparisonTestResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -171,10 +171,10 @@ public void computeResults() {
// Set the test average count as the test time.
this.setAverageTestCount((long)testAverage);
- this.testAverages.add(new Double(testAverage));
+ this.testAverages.add(Double.valueOf(testAverage));
this.testMins.add(PerformanceComparisonTestResult.minResults(times));
this.testMaxs.add(PerformanceComparisonTestResult.maxResults(times));
- this.testStandardDeviations.add(new Double(testStandardDeviation));
+ this.testStandardDeviations.add(Double.valueOf(testStandardDeviation));
if (testIndex > 0) {
double testBaseLineAverage = ((Number)this.testAverages.get(0)).doubleValue();
@@ -182,7 +182,7 @@ public void computeResults() {
// Difference
double percentageDifference =
PerformanceComparisonTestResult.percentageDifference(testAverage, testBaseLineAverage);
- this.percentageDifferences.add(new Double(percentageDifference));
+ this.percentageDifferences.add(Double.valueOf(percentageDifference));
}
}
}
@@ -215,7 +215,7 @@ public void addTestCount(long time, int test) {
if (getTestCounts().size() <= test) {
getTestCounts().add(new ArrayList());
}
- ((List)getTestCounts().get(test)).add(new Long(time));
+ ((List)getTestCounts().get(test)).add(Long.valueOf(time));
}
/**
@@ -295,7 +295,7 @@ public void logResult(Writer log) {
* Compute the max of the results.
*/
public static Number maxResults(List times) {
- Number testMax = new Double(0);
+ Number testMax = Double.valueOf(0);
for (int index = 0; index < times.size(); index++) {
Number time = (Number)times.get(index);
if (time.doubleValue() > testMax.doubleValue()) {
@@ -309,7 +309,7 @@ public static Number maxResults(List times) {
* Compute the min of the results.
*/
public static Number minResults(List times) {
- Number testMin = new Double(0);
+ Number testMin = Double.valueOf(0);
for (int index = 0; index < times.size(); index++) {
Number time = (Number)times.get(index);
if ((testMin.doubleValue() == 0) || (time.doubleValue() < testMin.doubleValue())) {
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java
index 07ceb4a..d84fe70 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,12 +92,12 @@ public static void verify(PerformanceRegressionTest test) {
TestResult lastResult = (TestResult)stream.nextElement();
double lastCount = lastResult.getTestTime();
PerformanceComparisonTestResult testResult = (PerformanceComparisonTestResult)((TestCase)test).getTestResult();
- testResult.getBaselineVersionResults().add(new Double(lastCount));
+ testResult.getBaselineVersionResults().add(Double.valueOf(lastCount));
// Average last 5 runs.
int numberOfRuns = 0;
while (stream.hasMoreElements() && (numberOfRuns < 4)) {
TestResult nextResult = (TestResult)stream.nextElement();
- testResult.getBaselineVersionResults().add(new Double(nextResult.getTestTime()));
+ testResult.getBaselineVersionResults().add(Double.valueOf(nextResult.getTestTime()));
numberOfRuns++;
}
stream.close();
@@ -115,11 +115,11 @@ public static void verify(PerformanceRegressionTest test) {
query.useCursoredStream(1, 1);
stream = (CursoredStream)session.executeQuery(query);
// Average last 5 runs.
- testResult.getCurrentVersionResults().add(new Double(currentCount));
+ testResult.getCurrentVersionResults().add(Double.valueOf(currentCount));
numberOfRuns = 0;
while (stream.hasMoreElements() && (numberOfRuns < 4)) {
TestResult nextResult = (TestResult)stream.nextElement();
- testResult.getCurrentVersionResults().add(new Double(nextResult.getTestTime()));
+ testResult.getCurrentVersionResults().add(Double.valueOf(nextResult.getTestTime()));
numberOfRuns++;
}
stream.close();
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/SybaseTransactionIsolationListener.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/SybaseTransactionIsolationListener.java
index d0134de..c901f6f 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/SybaseTransactionIsolationListener.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/SybaseTransactionIsolationListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@ public void postAcquireConnection(SessionEvent event) {
stmt1 = conn.createStatement();
result = stmt1.executeQuery("select @@isolation");
result.next();
- isolationLevel = new Integer(result.getInt(1));
+ isolationLevel = Integer.valueOf(result.getInt(1));
if(isolationLevel > 0) {
// If conn1 began transaction and updated the row (but hasn't committed the transaction yet),
// then conn2 should be able to read the original (not updated) state of the row.
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestVariation.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestVariation.java
index 2fa18bd..adc1def 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestVariation.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestVariation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -252,7 +252,7 @@ protected void setup() throws Throwable {
}
if (setters[i] != null) {
- Object[] args = { new Boolean(required[i]) };
+ Object[] args = { Boolean.valueOf(required[i]) };
setters[i].invoke(object, args);
} else {
fields[i].setBoolean(object, required[i]);
@@ -265,7 +265,7 @@ public void reset() throws Throwable {
super.reset();
for (int i = required.length - 1; i >= 0; i--) {
if (setters[i] != null) {
- Object[] args = { new Boolean(original[i]) };
+ Object[] args = { Boolean.valueOf(original[i]) };
setters[i].invoke(object, args);
} else {
fields[i].setBoolean(object, original[i]);
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/ui/LoadBuildDisplayPanel.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/ui/LoadBuildDisplayPanel.java
index 6187191..fd8294c 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/ui/LoadBuildDisplayPanel.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/ui/LoadBuildDisplayPanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -873,12 +873,12 @@ public void poppulateLoadBuildTable(Vector summaries) {
row.addElement(summary.getLoadBuildSummary().jvm);
row.addElement(summary.getLoadBuildSummary().machine);
row.addElement(summary.getLoadBuildSummary().toplinkVersion);
- row.addElement(new Integer(summary.getTotalTests()));
- row.addElement(new Integer(summary.getSetupFailures()));
- row.addElement(new Integer(summary.getErrors()));
- row.addElement(new Integer(summary.getFatalErrors()));
- row.addElement(new Integer(summary.getProblems()));
- row.addElement(new Long(summary.getTotalTime()));
+ row.addElement(Integer.valueOf(summary.getTotalTests()));
+ row.addElement(Integer.valueOf(summary.getSetupFailures()));
+ row.addElement(Integer.valueOf(summary.getErrors()));
+ row.addElement(Integer.valueOf(summary.getFatalErrors()));
+ row.addElement(Integer.valueOf(summary.getProblems()));
+ row.addElement(Long.valueOf(summary.getTotalTime()));
tableModel.addRow(row);
}
getSelectedTable().setModel(tableModel);
@@ -900,9 +900,9 @@ public void poppulateTestResultTable(Vector results) {
Vector row = new Vector();
row.addElement(result.getName());
row.addElement(result.getOutcome());
- row.addElement(new Long(result.getTestTime()));
- row.addElement(new Long(result.getTotalTime()));
- row.addElement(new Boolean(result.getException() != null));
+ row.addElement(Long.valueOf(result.getTestTime()));
+ row.addElement(Long.valueOf(result.getTotalTime()));
+ row.addElement(Boolean.valueOf(result.getException() != null));
row.addElement(result.getLoadBuildSummary().timestamp);
row.addElement(result.getLoadBuildSummary().loginChoice);
row.addElement(result.getLoadBuildSummary().os);
@@ -929,14 +929,14 @@ public void poppulateTestSummaryTable(Vector summaries) {
TestResultsSummary summary = (TestResultsSummary)enumtr.nextElement();
Vector row = new Vector();
row.addElement(summary.getName());
- row.addElement(new Integer(summary.getTotalTests()));
- row.addElement(new Integer(summary.getSetupFailures()));
- row.addElement(new Integer(summary.getPassed()));
- row.addElement(new Integer(summary.getErrors()));
- row.addElement(new Integer(summary.getFatalErrors()));
- row.addElement(new Integer(summary.getProblems()));
- row.addElement(new Integer(summary.getWarnings()));
- row.addElement(new Long(summary.getTotalTime()));
+ row.addElement(Integer.valueOf(summary.getTotalTests()));
+ row.addElement(Integer.valueOf(summary.getSetupFailures()));
+ row.addElement(Integer.valueOf(summary.getPassed()));
+ row.addElement(Integer.valueOf(summary.getErrors()));
+ row.addElement(Integer.valueOf(summary.getFatalErrors()));
+ row.addElement(Integer.valueOf(summary.getProblems()));
+ row.addElement(Integer.valueOf(summary.getWarnings()));
+ row.addElement(Long.valueOf(summary.getTotalTime()));
tableModel.addRow(row);
}
getSelectedTable().setModel(tableModel);
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java
index b61d163..514c982 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -86,33 +86,33 @@ public static Hashtable getMethods() {
}
public static String getOperator(int anOperator) {
- return (String)getOperators().get(new Integer(anOperator));
+ return (String)getOperators().get(Integer.valueOf(anOperator));
}
public static Hashtable getOperators() {
if (operators == null) {
operators = new Hashtable();
- operators.put(new Integer(ExpressionOperator.Equal), Equals);
- operators.put(new Integer(ExpressionOperator.NotEqual), NotEquals);
- operators.put(new Integer(ExpressionOperator.LessThan), LessThan);
- operators.put(new Integer(ExpressionOperator.LessThanEqual),
+ operators.put(Integer.valueOf(ExpressionOperator.Equal), Equals);
+ operators.put(Integer.valueOf(ExpressionOperator.NotEqual), NotEquals);
+ operators.put(Integer.valueOf(ExpressionOperator.LessThan), LessThan);
+ operators.put(Integer.valueOf(ExpressionOperator.LessThanEqual),
LessThanEqual);
- operators.put(new Integer(ExpressionOperator.GreaterThan),
+ operators.put(Integer.valueOf(ExpressionOperator.GreaterThan),
GreaterThan);
- operators.put(new Integer(ExpressionOperator.GreaterThanEqual),
+ operators.put(Integer.valueOf(ExpressionOperator.GreaterThanEqual),
GreaterThanEqual);
- operators.put(new Integer(ExpressionOperator.Like), Like);
- operators.put(new Integer(ExpressionOperator.NotLike), NotLike);
- operators.put(new Integer(ExpressionOperator.In), In);
- operators.put(new Integer(ExpressionOperator.NotIn), NotIn);
- operators.put(new Integer(ExpressionOperator.Between), Between);
- operators.put(new Integer(ExpressionOperator.NotBetween),
+ operators.put(Integer.valueOf(ExpressionOperator.Like), Like);
+ operators.put(Integer.valueOf(ExpressionOperator.NotLike), NotLike);
+ operators.put(Integer.valueOf(ExpressionOperator.In), In);
+ operators.put(Integer.valueOf(ExpressionOperator.NotIn), NotIn);
+ operators.put(Integer.valueOf(ExpressionOperator.Between), Between);
+ operators.put(Integer.valueOf(ExpressionOperator.NotBetween),
NotBetween);
- operators.put(new Integer(ExpressionOperator.Or), Or);
- operators.put(new Integer(ExpressionOperator.And), And);
- operators.put(new Integer(ExpressionOperator.Not), Not);
- operators.put(new Integer(ExpressionOperator.ToLowerCase), Lower);
- operators.put(new Integer(ExpressionOperator.ToUpperCase), Upper);
+ operators.put(Integer.valueOf(ExpressionOperator.Or), Or);
+ operators.put(Integer.valueOf(ExpressionOperator.And), And);
+ operators.put(Integer.valueOf(ExpressionOperator.Not), Not);
+ operators.put(Integer.valueOf(ExpressionOperator.ToLowerCase), Lower);
+ operators.put(Integer.valueOf(ExpressionOperator.ToUpperCase), Upper);
}
return operators;
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
index 96c6941..48ed7ed 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -118,7 +118,7 @@ public static long currentDatabaseTimeMillis(org.eclipse.persistence.sessions.Se
long endTime = System.currentTimeMillis();
long jvmTime = (endTime - startTime) / 2 + startTime;
long offset = databaseTime.getTime() - jvmTime;
- timeOffsetsMap.put(rootSession, new Long(offset));
+ timeOffsetsMap.put(rootSession, Long.valueOf(offset));
return jvmTime + offset;
}
}
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java
index 236b608..32b0701 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -3078,7 +3078,7 @@ public void resetSequenceButtons() {
getSequenceCounterNameText().setEnabled(!getNativeSequencingCheckbox().isSelected());
getSequenceFieldNameText().setEnabled(!getNativeSequencingCheckbox().isSelected());
getSequenceTableNameText().setEnabled(!getNativeSequencingCheckbox().isSelected());
- getSequencePreallocationSizeText().setText(new Integer(getLogin().getDefaultSequence().getPreallocationSize()).toString());
+ getSequencePreallocationSizeText().setText(Integer.valueOf(getLogin().getDefaultSequence().getPreallocationSize()).toString());
}
public void resetStringButtons() {
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/ProfileBrowserPanel.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/ProfileBrowserPanel.java
index 79b4839..104a784 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/ProfileBrowserPanel.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/ProfileBrowserPanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -122,7 +122,7 @@ public Vector buildProfileSummaryByClass() {
} else {
newTime = oldTime.longValue() + profileTime;
}
- summary.getOperationTimings().put(name, new Long(newTime));
+ summary.getOperationTimings().put(name, Long.valueOf(newTime));
}
}
@@ -173,7 +173,7 @@ public Vector buildProfileSummaryByQuery() {
} else {
newTime = oldTime.longValue() + profileTime;
}
- summary.getOperationTimings().put(name, new Long(newTime));
+ summary.getOperationTimings().put(name, Long.valueOf(newTime));
}
}
@@ -236,7 +236,7 @@ public Vector buildProfileSummaryByQueryAndClass() {
} else {
newTime = oldTime.longValue() + profileTime;
}
- summary.getOperationTimings().put(name, new Long(newTime));
+ summary.getOperationTimings().put(name, Long.valueOf(newTime));
}
}
@@ -519,11 +519,11 @@ public void resetProfiles() {
Helper.getShortClassName(profile.getDomainClass());
}
}
- items[2] = new Long(profile.getTotalTime()).toString();
- items[3] = new Long(profile.getLocalTime()).toString();
+ items[2] = Long.valueOf(profile.getTotalTime()).toString();
+ items[3] = Long.valueOf(profile.getLocalTime()).toString();
items[4] =
- new Long(profile.getNumberOfInstancesEffected()).toString();
- items[5] = new Long(profile.getObjectsPerSecond()).toString();
+ Long.valueOf(profile.getNumberOfInstancesEffected()).toString();
+ items[5] = Long.valueOf(profile.getObjectsPerSecond()).toString();
if (profile.getOperationTimings().containsKey(SessionProfiler.SqlPrepare)) {
items[6] =
profile.getOperationTimings().get(SessionProfiler.SqlPrepare).toString();
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java
index a7fec11..4166859 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -3418,7 +3418,7 @@ public void resetCache() {
CacheKey key = (CacheKey) cacheEnumeration.nextElement();
String[] values = new String[4];
values[0] = key.getKey().toString();
- values[1] = new Integer(key.getObject().hashCode()).toString();
+ values[1] = Integer.valueOf(key.getObject().hashCode()).toString();
values[2] = String.valueOf(key.getWriteLockValue());
values[3] = key.getObject().toString();
model.addRow(values);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourcePlatform.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourcePlatform.java
index 9023722..0199811 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourcePlatform.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourcePlatform.java
@@ -90,7 +90,7 @@ public class DatasourcePlatform implements Platform {
protected String endDelimiter = null;
/** Ensures that only one thread at a time can add/remove sequences */
- protected Object sequencesLock = new Boolean(true);
+ protected Object sequencesLock = Boolean.valueOf(true);
/** If the native sequence type is not supported, if table sequencing should be used. */
protected boolean defaultNativeSequenceToTable;
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java
index 09c6505..509bbea 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -157,13 +157,13 @@ public void printJava(Object object) {
}
public void printByte(Byte aByte) {
- printString("new Byte((byte)");
+ printString("Byte.valueOf((byte)");
printString((aByte).toString());
printString(")");
}
public void printCharacter(Character aCharacter) {
- printString("new Character('");
+ printString("Character.valueOf('");
printString((aCharacter).toString());
printString("')");
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/Context.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/Context.java
index 6f9d312..d062f91 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/Context.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/Context.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -631,8 +631,8 @@ private void setValueByXPath(Object object, CoreObjectBuilder objectBuilder, Str
* <p>Set values in the object model based on the corresponding document. The following pairings are equivalent:</p>
*
* <i>Set the Customer's ID</i>
- * <pre> context.setValueByXPath(customer, "@id", null, new Integer(123));
- * customer.setId(new Integer(123));</pre>
+ * <pre> context.setValueByXPath(customer, "@id", null, Integer.valueOf(123));
+ * customer.setId(Integer.valueOf(123));</pre>
*
* <i>Set the Customer's Name</i>
* <pre> context.setValueByXPath(customer, "ns:personal-info/ns:name/text()", aNamespaceResolver, "Jane Doe");
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java
index ef5f7cc..44ef2fe 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -605,9 +605,9 @@ protected Float convertObjectToFloat(Object sourceObject) throws ConversionExcep
if(((String) sourceObject).length() == 0) {
return 0f;
} else if(Constants.POSITIVE_INFINITY.equals(sourceObject)){
- return new Float(Float.POSITIVE_INFINITY);
+ return Float.valueOf(Float.POSITIVE_INFINITY);
}else if(Constants.NEGATIVE_INFINITY.equals(sourceObject)){
- return new Float(Float.NEGATIVE_INFINITY);
+ return Float.valueOf(Float.NEGATIVE_INFINITY);
}
}
return super.convertObjectToFloat(sourceObject);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLContext.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLContext.java
index 22a5b49..aa8c09c 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLContext.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -581,8 +581,8 @@ public <T> T getValueByXPath(Object object, String xPath, NamespaceResolver name
* <p>Set values in the object model based on the corresponding XML document. The following pairings are equivalent:</p>
*
* <i>Set the Customer's ID</i>
- * <pre> xmlContext.setValueByXPath(customer, "@id", null, new Integer(123));
- * customer.setId(new Integer(123));</pre>
+ * <pre> xmlContext.setValueByXPath(customer, "@id", null, Integer.valueOf(123));
+ * customer.setId(Integer.valueOf(123));</pre>
*
* <i>Set the Customer's Name</i>
* <pre> xmlContext.setValueByXPath(customer, "ns:personal-info/ns:name/text()", aNamespaceResolver, "Jane Doe");
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/queries/ReadAllQuery.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/queries/ReadAllQuery.java
index 4cd82d2..289c2ac 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/queries/ReadAllQuery.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/queries/ReadAllQuery.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1145,7 +1145,7 @@ public void setContainerPolicy(ContainerPolicy containerPolicy) {
* PUBLIC:
* Set the Hierarchical Query Clause for the query
* <p>Example:
- * <p>Expression startWith = builder.get("id").equal(new Integer(100)); //can be any expression which identifies a set of employees
+ * <p>Expression startWith = builder.get("id").equal(Integer.valueOf(100)); //can be any expression which identifies a set of employees
* <p>Expression connectBy = builder.get("managedEmployees"); //indicated the relationship that the hierarchy is based on, must be self-referential
* <p>Vector orderBy = new Vector();
* <p>orderBy.addElement(builder.get("startDate"));
@@ -1168,7 +1168,7 @@ public void setHierarchicalQueryClause(Expression startWith, Expression connectB
* <p>
* Example:
* <p>
- * Expression startWith = builder.get("id").equal(new Integer(100)); //can
+ * Expression startWith = builder.get("id").equal(Integer.valueOf(100)); //can
* be any expression which identifies a set of employees <br>
* Expression connectBy = builder.get("managedEmployees"); //indicated the
* relationship that the hierarchy is based on, must be self-referential <br>
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatabaseLogin.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatabaseLogin.java
index 6345dc7..1ff7438 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatabaseLogin.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatabaseLogin.java
@@ -819,7 +819,7 @@ public void setQueryRetryAttemptCount(int queryRetryAttemptCount) {
* PUBLIC:
* The default value to substitute for database NULLs can be configured
* on a per-class basis.
- * Example: login.setDefaultNullValue(long.class, new Long(0))
+ * Example: login.setDefaultNullValue(long.class, Long.valueOf(0))
*/
@Override
public void setDefaultNullValue(Class type, Object value) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatasourceLogin.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatasourceLogin.java
index 8c28c058..18fca65 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatasourceLogin.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/DatasourceLogin.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -395,7 +395,7 @@ public void setConnector(Connector connector) {
* PUBLIC:
* The default value to substitute for database NULLs can be configured
* on a per-class basis.
- * Example: login.setDefaultNullValue(long.class, new Long(0))
+ * Example: login.setDefaultNullValue(long.class, Long.valueOf(0))
*/
public void setDefaultNullValue(Class type, Object value) {
getDatasourcePlatform().getConversionManager().setDefaultNullValue(type, value);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/Project.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/Project.java
index f9b4312..f3277cb 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/Project.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/Project.java
@@ -189,7 +189,7 @@ public class Project extends CoreProject<ClassDescriptor, Login, DatabaseSession
protected Map<String, PartitioningPolicy> partitioningPolicies;
/** Ensures that only one thread at a time can add/remove descriptors */
- protected Object descriptorsLock = new Boolean(true);
+ protected Object descriptorsLock = Boolean.valueOf(true);
/** VPD connection settings */
protected String vpdIdentifier;
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/factories/ProjectClassGenerator.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/factories/ProjectClassGenerator.java
index 4f9006c..731ba29 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/factories/ProjectClassGenerator.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sessions/factories/ProjectClassGenerator.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2019 IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1928,7 +1928,7 @@ protected String printString(Object value) {
}
if (value instanceof Character) {
- return "new Character('" + value + "')";
+ return "Character.valueOf('" + value + "')";
}
//Bug2662265
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java
index 43864e6..d30a42c 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -100,12 +100,12 @@ public void createTables(DatabaseSession session) {
Vector arguments = new Vector(2);
arguments.add("EMP_SEQ");
- arguments.add(new Integer(0));
+ arguments.add(Integer.valueOf(0));
session.executeQuery(query, arguments);
arguments = new Vector(2);
arguments.add("PROJ_SEQ");
- arguments.add(new Integer(0));
+ arguments.add(Integer.valueOf(0));
session.executeQuery(query, arguments);
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/ImageSimulator.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/ImageSimulator.java
index e723951..46987e6 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/ImageSimulator.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/ImageSimulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -73,7 +73,7 @@ public static String initStringBase(int cycle) {
new Random().nextBytes(pictures);
Byte[] pics = new Byte[cycle];
for (int x = 0; x < cycle; x++) {
- pics[x] = new Byte(pictures[x]);
+ pics[x] = Byte.valueOf(pictures[x]);
}
return pics;
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNchar.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNchar.java
index d1db9ad..0a31a58 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNchar.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNchar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,12 +44,12 @@ public void copy(CharNchar obj) {
public void copyAllButId(CharNchar obj) {
setChar(null);
if (obj.getChar() != null) {
- setChar(new Character(obj.getChar().charValue()));
+ setChar(Character.valueOf(obj.getChar().charValue()));
}
setNchar(null);
if (obj.getNchar() != null) {
- setNchar(new Character(obj.getNchar().charValue()));
+ setNchar(Character.valueOf(obj.getNchar().charValue()));
}
setStr(null);
@@ -89,8 +89,8 @@ public void copyAllButId(CharNchar obj) {
}
public void setAll(char ch, char nCh, int sizeStr, int sizeClob, int sizeClob2) {
- this.ch = new Character(ch);
- this.nCh = new Character(nCh);
+ this.ch = Character.valueOf(ch);
+ this.nCh = Character.valueOf(nCh);
char[] chArray = new char[sizeStr];
char[] nchArray = new char[sizeStr];
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java
index d51c5d1..06a9085 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -169,10 +169,10 @@ protected void test() {
pstmt.setInt(1, controlObject.getId());
- pstmt.setObject(2, (new Character(controlObject.getChar())).toString());
+ pstmt.setObject(2, (Character.valueOf(controlObject.getChar())).toString());
pstmt.setFormOfUse(3, oracle.jdbc.OraclePreparedStatement.FORM_NCHAR);
- pstmt.setObject(3, (new Character(controlObject.getNchar())).toString());
+ pstmt.setObject(3, (Character.valueOf(controlObject.getNchar())).toString());
pstmt.setObject(4, controlObject.getStr());
@@ -200,10 +200,10 @@ protected void insertBigCLOB() throws java.sql.SQLException, java.io.IOException
pstmt.setInt(1, controlObject.getId());
- pstmt.setObject(2, (new Character(controlObject.getChar())).toString());
+ pstmt.setObject(2, (Character.valueOf(controlObject.getChar())).toString());
pstmt.setFormOfUse(3, oracle.jdbc.OraclePreparedStatement.FORM_NCHAR);
- pstmt.setObject(3, (new Character(controlObject.getNchar())).toString());
+ pstmt.setObject(3, (Character.valueOf(controlObject.getNchar())).toString());
pstmt.setObject(4, controlObject.getStr());
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java
index a4c7097..04d4e75 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,7 +10,7 @@
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/
-// Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
package org.eclipse.persistence.testing.tests.plsqlrecord;
@@ -309,7 +309,7 @@ public void runQuery() {
assertTrue("incorrect ENAME" , result.name.equals("GOOFY"));
assertTrue("incorrect JOB" , result.job.equals("ACTOR"));
assertNull("MGR is supposed to be null", result.manager);
- assertTrue("incorrect SAL" , result.salary.equals(new Float(3500)));
+ assertTrue("incorrect SAL" , result.salary.equals(Float.valueOf(3500)));
assertNull("COMM is supposed to be null", result.commission);
assertTrue("incorrect DEPTNO" , result.department.equals(new BigDecimal(20)));
((DatabaseSession)s).logout();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java
index df71871..d9006de 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,7 +10,7 @@
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/
-// Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
package org.eclipse.persistence.testing.tests.plsqlrecord;
@@ -272,7 +272,7 @@ public void runQuery() {
assertNull("MGR is supposed to be null", record.get("MGR"));
assertNull("HIREDATE is supposed to be null", record.get("HIREDATE"));
assertTrue("incorrect SAL" ,
- record.get("SAL").equals(new Double(6000.0)));
+ record.get("SAL").equals(Double.valueOf(6000.0)));
assertNull("COMM is supposed to be null", record.get("COMM"));
assertTrue("incorrect DEPTNO" ,
record.get("DEPTNO").equals(new BigDecimal(20)));
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java
index ef94384..048656d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,7 +10,7 @@
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/
-// Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
package org.eclipse.persistence.testing.tests.plsqlrecord;
@@ -302,7 +302,7 @@ public void runQuery() {
assertTrue("incorrect ENAME" , result.name.equals("GOOFY"));
assertTrue("incorrect JOB" , result.job.equals("ACTOR"));
assertNull("MGR is supposed to be null", result.manager);
- assertTrue("incorrect SAL" , result.salary.equals(new Float(3500)));
+ assertTrue("incorrect SAL" , result.salary.equals(Float.valueOf(3500)));
assertTrue("incorrect DEPTNO" , result.department.equals(new BigDecimal(20)));
((DatabaseSession)s).logout();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java
index d28db6f..317c212 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,7 +10,7 @@
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/
-// Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
package org.eclipse.persistence.testing.tests.plsqlrecord;
@@ -269,7 +269,7 @@ public void runQuery() {
assertTrue("incorrect ENAME" , result.name.equals("GOOFY"));
assertTrue("incorrect JOB" , result.job.equals("ACTOR"));
assertNull("MGR is supposed to be null", result.manager);
- assertTrue("incorrect SAL" , result.salary.equals(new Float(6000)));
+ assertTrue("incorrect SAL" , result.salary.equals(Float.valueOf(6000)));
assertNull("COMM is supposed to be null", result.commission);
assertTrue("incorrect DEPTNO" , result.department.equals(new BigDecimal(20)));
((DatabaseSession)s).logout();
diff --git a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/tools/profiler/oracle/DMSPerformanceProfiler.java b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/tools/profiler/oracle/DMSPerformanceProfiler.java
index 2cc52f2..e970f06 100644
--- a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/tools/profiler/oracle/DMSPerformanceProfiler.java
+++ b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/tools/profiler/oracle/DMSPerformanceProfiler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -225,7 +225,7 @@ public void startOperationProfile(String operationName) {
}
Sensor phaseEvent = getSensorByName(operationName);
if (phaseEvent != null) {
- Long startToken = new Long(((PhaseEvent)phaseEvent).start());
+ Long startToken = Long.valueOf(((PhaseEvent)phaseEvent).start());
getPhaseEventStartToken().put(operationName, startToken);
}
}
@@ -247,7 +247,7 @@ public void startOperationProfile(String operationName, DatabaseQuery query, int
Sensor phaseEvent = getPhaseEventForQuery(operationName, query, weight);
if (phaseEvent != null) {
- Long startToken = new Long(((PhaseEvent)phaseEvent).start());
+ Long startToken = Long.valueOf(((PhaseEvent)phaseEvent).start());
if (query != null) {
getPhaseEventStartToken().put(query.getSensorName(operationName, getSessionName()), startToken);
} else {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/collection/model/NodeHolder.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/collection/model/NodeHolder.java
index 25fcc03..60520cc 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/collection/model/NodeHolder.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/collection/model/NodeHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@ public void addNodes(int id) {
}
public void removeNodes(int id) {
- nodes.remove(new Integer(id));
+ nodes.remove(Integer.valueOf(id));
}
public int getId() {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/compositeid/TestCompositeId.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/compositeid/TestCompositeId.java
index fc60eba..1874106 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/compositeid/TestCompositeId.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/compositeid/TestCompositeId.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2018, 2020 IBM Corporation. All rights reserved.
+ * Copyright (c) 2018, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,11 +92,11 @@ public void testCompositeId() throws Exception {
assertNotNull(compBFind.getId());
assertNotNull(compBFind.getId().getCompAId());
assertEquals(compBFind.getId().getCompAId().getEnvironment().getValue(), "1");
- assertEquals(compBFind.getId().getCompAId().getIdentifier().getValue(), new Integer(1));
+ assertEquals(compBFind.getId().getCompAId().getIdentifier().getValue(), Integer.valueOf(1));
assertNotNull(compBFind.getId().getClientId());
assertEquals(compBFind.getId().getClientId().getValue(), "1");
assertNotNull(compBFind.getId().getRN());
- assertEquals(compBFind.getId().getRN().getValue(), new Integer(1));
+ assertEquals(compBFind.getId().getRN().getValue(), Integer.valueOf(1));
CompC compC = new CompC();
CompCId compCId = new CompCId();
@@ -118,7 +118,7 @@ public void testCompositeId() throws Exception {
assertNotSame(compC, compCFind);
assertNotNull(compC.getId());
assertNotNull(compC.getId().getBTI());
- assertEquals(compC.getId().getBTI().getValue(), new Integer(3));
+ assertEquals(compC.getId().getBTI().getValue(), Integer.valueOf(3));
assertNotNull(compC.getId().getCompBIdId());
assertEquals(compC.getId().getUserId().getValue(), "4");
assertNotNull(compC.getId().getUserId());
@@ -127,11 +127,11 @@ public void testCompositeId() throws Exception {
assertNotNull(compBU2);
assertNotNull(compBU2.getCompAId());
assertEquals(compBU2.getCompAId().getEnvironment().getValue(), "1");
- assertEquals(compBU2.getCompAId().getIdentifier().getValue(), new Integer(1));
+ assertEquals(compBU2.getCompAId().getIdentifier().getValue(), Integer.valueOf(1));
assertNotNull(compBU2.getClientId());
assertEquals(compBU2.getClientId().getValue(), "1");
assertNotNull(compBU2.getRN());
- assertEquals(compBU2.getRN().getValue(), new Integer(1));
+ assertEquals(compBU2.getRN().getValue(), Integer.valueOf(1));
} finally {
if (em != null) {
if (transaction.isActive())
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java
index 4c27ddd..857c727 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -82,14 +82,14 @@ public void persistTestBooleanPrimitive() {
em.getTransaction().commit();
Assert.assertTrue(BooleanToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Boolean(valueConvert), BooleanToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Boolean.valueOf(valueConvert), BooleanToStringAutoApplyConverter.ctdcVal);
BooleanToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityB2S findEntity = em.find(ConvertEntityB2S.class, id);
Assert.assertTrue(BooleanToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Boolean(valueConvert).toString(), BooleanToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Boolean.valueOf(valueConvert).toString(), BooleanToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -158,14 +158,14 @@ public void persistTestBytePrimitive() {
em.getTransaction().commit();
Assert.assertTrue(ByteToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Byte(valueConvert), ByteToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Byte.valueOf(valueConvert), ByteToStringAutoApplyConverter.ctdcVal);
ByteToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityBy2S findEntity = em.find(ConvertEntityBy2S.class, id);
Assert.assertTrue(ByteToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Byte(valueConvert).toString(), ByteToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Byte.valueOf(valueConvert).toString(), ByteToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -185,8 +185,8 @@ public void persistTestByteWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Byte valueConvert = new Byte((byte) 10);
- Byte valueNoConvert = new Byte((byte) 14);
+ Byte valueConvert = Byte.valueOf((byte) 10);
+ Byte valueNoConvert = Byte.valueOf((byte) 14);
try {
ByteToStringAutoApplyConverter.reset();
ConvertEntityByW2S entity = new ConvertEntityByW2S(id, valueConvert, valueNoConvert);
@@ -234,14 +234,14 @@ public void persistTestCharPrimitive() {
em.getTransaction().commit();
Assert.assertTrue(CharToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Character(valueConvert), CharToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Character.valueOf(valueConvert), CharToStringAutoApplyConverter.ctdcVal);
CharToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityC2S findEntity = em.find(ConvertEntityC2S.class, id);
Assert.assertTrue(CharToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Character(valueConvert).toString(), CharToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Character.valueOf(valueConvert).toString(), CharToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -261,8 +261,8 @@ public void persistTestCharWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Character valueConvert = new Character('A');
- Character valueNoConvert = new Character('z');
+ Character valueConvert = Character.valueOf('A');
+ Character valueNoConvert = Character.valueOf('z');
try {
CharToStringAutoApplyConverter.reset();
ConvertEntityCW2S entity = new ConvertEntityCW2S(id, valueConvert, valueNoConvert);
@@ -310,14 +310,14 @@ public void persistTestDoublePrimitive() {
em.getTransaction().commit();
Assert.assertTrue(DoubleToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Double(valueConvert), DoubleToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Double.valueOf(valueConvert), DoubleToStringAutoApplyConverter.ctdcVal);
DoubleToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityD2S findEntity = em.find(ConvertEntityD2S.class, id);
Assert.assertTrue(DoubleToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Double(valueConvert).toString(), DoubleToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Double.valueOf(valueConvert).toString(), DoubleToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -337,8 +337,8 @@ public void persistTestDoubleWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Double valueConvert = new Double(42.0);
- Double valueNoConvert = new Double(100.0);
+ Double valueConvert = Double.valueOf(42.0);
+ Double valueNoConvert = Double.valueOf(100.0);
try {
DoubleToStringAutoApplyConverter.reset();
ConvertEntityDW2S entity = new ConvertEntityDW2S(id, valueConvert, valueNoConvert);
@@ -386,14 +386,14 @@ public void persistTestFloatPrimitive() {
em.getTransaction().commit();
Assert.assertTrue(FloatToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Float(valueConvert), FloatToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Float.valueOf(valueConvert), FloatToStringAutoApplyConverter.ctdcVal);
FloatToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityF2S findEntity = em.find(ConvertEntityF2S.class, id);
Assert.assertTrue(FloatToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Float(valueConvert).toString(), FloatToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Float.valueOf(valueConvert).toString(), FloatToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -413,8 +413,8 @@ public void persistTestFloatWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Float valueConvert = new Float(42.0f);
- Float valueNoConvert = new Float(100.0f);
+ Float valueConvert = Float.valueOf(42.0f);
+ Float valueNoConvert = Float.valueOf(100.0f);
try {
FloatToStringAutoApplyConverter.reset();
ConvertEntityFW2S entity = new ConvertEntityFW2S(id, valueConvert, valueNoConvert);
@@ -462,14 +462,14 @@ public void persistTestIntegerPrimitive() {
em.getTransaction().commit();
Assert.assertTrue(IntToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Integer(valueConvert), IntToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Integer.valueOf(valueConvert), IntToStringAutoApplyConverter.ctdcVal);
IntToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityI2S findEntity = em.find(ConvertEntityI2S.class, id);
Assert.assertTrue(IntToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Integer(valueConvert).toString(), IntToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Integer.valueOf(valueConvert).toString(), IntToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -489,8 +489,8 @@ public void persistTestIntegerWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Integer valueConvert = new Integer(42);
- Integer valueNoConvert = new Integer(100);
+ Integer valueConvert = Integer.valueOf(42);
+ Integer valueNoConvert = Integer.valueOf(100);
try {
IntToStringAutoApplyConverter.reset();
ConvertEntityIW2S entity = new ConvertEntityIW2S(id, valueConvert, valueNoConvert);
@@ -538,14 +538,14 @@ public void persistTestLongPrimitive() {
em.getTransaction().commit();
Assert.assertTrue(LongToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Long(valueConvert), LongToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Long.valueOf(valueConvert), LongToStringAutoApplyConverter.ctdcVal);
LongToStringAutoApplyConverter.reset();
em.clear();
ConvertEntityL2S findEntity = em.find(ConvertEntityL2S.class, id);
Assert.assertTrue(LongToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Long(valueConvert).toString(), LongToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Long.valueOf(valueConvert).toString(), LongToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -565,8 +565,8 @@ public void persistTestLongWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Long valueConvert = new Long((long) 42);
- Long valueNoConvert = new Long((long) 100);
+ Long valueConvert = Long.valueOf((long) 42);
+ Long valueNoConvert = Long.valueOf((long) 100);
try {
LongToStringAutoApplyConverter.reset();
ConvertEntityLW2S entity = new ConvertEntityLW2S(id, valueConvert, valueNoConvert);
@@ -614,14 +614,14 @@ public void persistTestShortPrimitive() {
em.getTransaction().commit();
Assert.assertTrue(ShortToStringAutoApplyConverter.convertToDatabaseTriggered);
- Assert.assertEquals(new Short(valueConvert), ShortToStringAutoApplyConverter.ctdcVal);
+ Assert.assertEquals(Short.valueOf(valueConvert), ShortToStringAutoApplyConverter.ctdcVal);
ShortToStringAutoApplyConverter.reset();
em.clear();
ConvertEntitySh2S findEntity = em.find(ConvertEntitySh2S.class, id);
Assert.assertTrue(ShortToStringAutoApplyConverter.convertToEntityTriggered);
- Assert.assertEquals(new Short(valueConvert).toString(), ShortToStringAutoApplyConverter.cteaVal);
+ Assert.assertEquals(Short.valueOf(valueConvert).toString(), ShortToStringAutoApplyConverter.cteaVal);
Assert.assertNotNull(findEntity);
Assert.assertNotNull(findEntity.getValueConvert());
Assert.assertNotNull(findEntity.getValueNoConvert());
@@ -641,8 +641,8 @@ public void persistTestShortWrapper() {
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Short valueConvert = new Short((short) 42);
- Short valueNoConvert = new Short((short) 100);
+ Short valueConvert = Short.valueOf((short) 42);
+ Short valueNoConvert = Short.valueOf((short) 100);
try {
ShortToStringAutoApplyConverter.reset();
ConvertEntityShW2S entity = new ConvertEntityShW2S(id, valueConvert, valueNoConvert);
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java
index 878b90b..adcef20 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2017 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -89,7 +89,7 @@ public class TestBasicPersistence {
String rmiPortProp = System.getProperty("rmi.port");
if (!(rmiPortProp == null || rmiPortProp.isEmpty())) {
try {
- rmiPortVal = new Integer(rmiPortProp);
+ rmiPortVal = Integer.valueOf(rmiPortProp);
} catch (NumberFormatException nfe) {
// Use default value.
}
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/jpql/TestAggregateFunctions.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/jpql/TestAggregateFunctions.java
index 9603cde..7939472 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/jpql/TestAggregateFunctions.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/jpql/TestAggregateFunctions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -72,7 +72,7 @@ public void testEmptyAggregateFunctionsWithPrimitives() {
q = em.createQuery("SELECT COUNT(n.primitive) FROM NoResultEntity n");
res = q.getSingleResult();
- Assert.assertEquals("Result of COUNT aggregate should have been a Long", new Long(0), res);
+ Assert.assertEquals("Result of COUNT aggregate should have been a Long", Long.valueOf(0), res);
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -117,7 +117,7 @@ public void testEmptyAggregateFunctionsWithWrappers() {
q = em.createQuery("SELECT COUNT(n.wrapper) FROM NoResultEntity n");
res = q.getSingleResult();
- Assert.assertEquals("Result of COUNT aggregate should have been a Long", new Long(0), res);
+ Assert.assertEquals("Result of COUNT aggregate should have been a Long", Long.valueOf(0), res);
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -159,23 +159,23 @@ public void testAggregateFunctionsWithPrimitives() {
Query q = em.createQuery("SELECT MIN(se.itemInteger2) FROM SimpleEntity se");
Object res = q.getSingleResult();
- Assert.assertEquals("Result of MIN aggregate should have been NULL", new Integer(0), res);
+ Assert.assertEquals("Result of MIN aggregate should have been NULL", Integer.valueOf(0), res);
Query q2 = em.createQuery("SELECT MAX(se.itemInteger2) FROM SimpleEntity se");
Object res2 = q2.getSingleResult();
- Assert.assertEquals("Result of MAX aggregate should have been NULL", new Integer(0), res2);
+ Assert.assertEquals("Result of MAX aggregate should have been NULL", Integer.valueOf(0), res2);
Query q3 = em.createQuery("SELECT AVG(se.itemInteger2) FROM SimpleEntity se");
Object res3 = q3.getSingleResult();
- Assert.assertEquals("Result of AVG aggregate should have been NULL", new Double(0), res3);
+ Assert.assertEquals("Result of AVG aggregate should have been NULL", Double.valueOf(0), res3);
Query q4 = em.createQuery("SELECT SUM(se.itemInteger2) FROM SimpleEntity se");
Object res4 = q4.getSingleResult();
- Assert.assertEquals("Result of SUM aggregate should have been NULL", new Long(0), res4);
+ Assert.assertEquals("Result of SUM aggregate should have been NULL", Long.valueOf(0), res4);
Query q5 = em.createQuery("SELECT COUNT(se.itemInteger2) FROM SimpleEntity se");
Object res5 = q5.getSingleResult();
- Assert.assertEquals("Result of COUNT aggregate should have been a Long", new Long(2), res5);
+ Assert.assertEquals("Result of COUNT aggregate should have been a Long", Long.valueOf(2), res5);
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -204,12 +204,12 @@ public void testAggregateFunctionsWithWrappers() {
SimpleEntity se = new SimpleEntity();
se.setKeyString("SimpleEntity1");
- se.setItemInteger1(new Integer(0));
+ se.setItemInteger1(Integer.valueOf(0));
entities.add(se);
SimpleEntity se2 = new SimpleEntity();
se2.setKeyString("SimpleEntity2");
- se2.setItemInteger1(new Integer(0));
+ se2.setItemInteger1(Integer.valueOf(0));
entities.add(se2);
EntityManager em = resultEmf.createEntityManager();
@@ -223,23 +223,23 @@ public void testAggregateFunctionsWithWrappers() {
Query q = em.createQuery("SELECT MIN(se.itemInteger1) FROM SimpleEntity se");
Object res = q.getSingleResult();
- Assert.assertEquals("Result of MIN aggregate should have been NULL", new Integer(0), res);
+ Assert.assertEquals("Result of MIN aggregate should have been NULL", Integer.valueOf(0), res);
Query q2 = em.createQuery("SELECT MAX(se.itemInteger1) FROM SimpleEntity se");
Object res2 = q2.getSingleResult();
- Assert.assertEquals("Result of MAX aggregate should have been NULL", new Integer(0), res2);
+ Assert.assertEquals("Result of MAX aggregate should have been NULL", Integer.valueOf(0), res2);
Query q3 = em.createQuery("SELECT AVG(se.itemInteger1) FROM SimpleEntity se");
Object res3 = q3.getSingleResult();
- Assert.assertEquals("Result of AVG aggregate should have been NULL", new Double(0), res3);
+ Assert.assertEquals("Result of AVG aggregate should have been NULL", Double.valueOf(0), res3);
Query q4 = em.createQuery("SELECT SUM(se.itemInteger1) FROM SimpleEntity se");
Object res4 = q4.getSingleResult();
- Assert.assertEquals("Result of SUM aggregate should have been NULL", new Long(0), res4);
+ Assert.assertEquals("Result of SUM aggregate should have been NULL", Long.valueOf(0), res4);
Query q5 = em.createQuery("SELECT COUNT(se.itemInteger1) FROM SimpleEntity se");
Object res5 = q5.getSingleResult();
- Assert.assertEquals("Result of COUNT aggregate should have been a Long", new Long(2), res5);
+ Assert.assertEquals("Result of COUNT aggregate should have been a Long", Long.valueOf(2), res5);
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/mapping/TestAttributeOverride.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/mapping/TestAttributeOverride.java
index d96afa3..28cbafa 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/mapping/TestAttributeOverride.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/mapping/TestAttributeOverride.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -135,7 +135,7 @@ public void testOverrideLowerCaseElementCollectionObjectMapping() {
em = emf.createEntityManager();
try {
- Integer id = new Integer(41);
+ Integer id = Integer.valueOf(41);
OverrideEmbeddableB emb1 = new OverrideEmbeddableB(43, 44, new OverrideNestedEmbeddableB(45, 46));
OverrideEmbeddableB emb2 = new OverrideEmbeddableB(47, 48, new OverrideNestedEmbeddableB(49, 50));
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/property/TestParameterBinding.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/property/TestParameterBinding.java
index 01bd486..df99272 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/property/TestParameterBinding.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/property/TestParameterBinding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -114,9 +114,9 @@ public void testCOALESCE_ForceBindJPQLParameters() {
//3: Test COALESCE function with all arguments as parameters
TypedQuery<GenericEntity> query = em.createQuery("SELECT 1 FROM GenericEntity s "
+ "WHERE ABS(COALESCE(?1, ?2)) >= ?3", GenericEntity.class);
- query.setParameter(1, new Integer(1));
- query.setParameter(2, new Integer(20));
- query.setParameter(3, new Integer(300));
+ query.setParameter(1, Integer.valueOf(1));
+ query.setParameter(2, Integer.valueOf(20));
+ query.setParameter(3, Integer.valueOf(300));
query.getResultList();
DatabaseCall call = ((JpaQuery<GenericEntity>)query).getDatabaseQuery().getCall();
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryCase.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryCase.java
index 91dd3eb..3971db9 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryCase.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryCase.java
@@ -88,7 +88,7 @@ public void testQuery_JPQL_Case_Literals_1() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -147,7 +147,7 @@ public void testQuery_Criteria_Case_Literals_1() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -211,7 +211,7 @@ public void testQuery_JPQL_Case_Parameters_1() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -303,7 +303,7 @@ public void testQuery_Criteria_Case_Parameters_1() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -356,7 +356,7 @@ public void testQuery_JPQL_Case_Literals_2() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -417,7 +417,7 @@ public void testQuery_Criteria_Case_Literals_2() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -480,7 +480,7 @@ public void testQuery_JPQL_Case_Parameters_2() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -561,7 +561,7 @@ public void testQuery_Criteria_Case_Parameters_2() {
assertEquals("B", dto01.get(0).getItemString2());
assertEquals("C", dto01.get(0).getItemString3());
assertEquals("D", dto01.get(0).getItemString4());
- assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -614,8 +614,8 @@ public void testQuery_JPQL_Case_Literals_3() {
assertEquals("Other", dto01.get(0).getStr2());
assertNull(dto01.get(0).getStr3());
assertNull(dto01.get(0).getStr4());
- assertEquals(new Integer(2), dto01.get(0).getInteger1());
- assertEquals(new Integer(2), dto01.get(0).getInteger2());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger1());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger2());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -648,12 +648,12 @@ public void testQuery_Criteria_Case_Literals_3() {
.otherwise("Other");
Expression<Long> selectCase2 = cb.<Long>selectCase()
- .when(cb.equal(root.get(EntityTbl01_.itemString3), "C"), new Long(1))
- .otherwise(new Long(0));
+ .when(cb.equal(root.get(EntityTbl01_.itemString3), "C"), Long.valueOf(1))
+ .otherwise(Long.valueOf(0));
Expression<Long> selectCase3 = cb.<Long>selectCase()
- .when(cb.equal(root.get(EntityTbl01_.itemString4), "D"), new Long(1))
- .otherwise(new Long(0));
+ .when(cb.equal(root.get(EntityTbl01_.itemString4), "D"), Long.valueOf(1))
+ .otherwise(Long.valueOf(0));
cquery.select(cb.construct(Dto01.class,
root.get(EntityTbl01_.itemString1),
@@ -672,8 +672,8 @@ public void testQuery_Criteria_Case_Literals_3() {
assertEquals("Other", dto01.get(0).getStr2());
assertNull(dto01.get(0).getStr3());
assertNull(dto01.get(0).getStr4());
- assertEquals(new Integer(2), dto01.get(0).getInteger1());
- assertEquals(new Integer(2), dto01.get(0).getInteger2());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger1());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger2());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -737,8 +737,8 @@ public void testQuery_JPQL_Case_Parameters_3() {
assertEquals("Other", dto01.get(0).getStr2());
assertNull(dto01.get(0).getStr3());
assertNull(dto01.get(0).getStr4());
- assertEquals(new Integer(2), dto01.get(0).getInteger1());
- assertEquals(new Integer(2), dto01.get(0).getInteger2());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger1());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger2());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -802,8 +802,8 @@ public void testQuery_Criteria_Case_Parameters_3() {
query.setParameter(resultParam2, "Other");
query.setParameter(checkParam2, "C");
query.setParameter(checkParam3, "D");
- query.setParameter(resultParam3, new Long(1));
- query.setParameter(resultParam4, new Long(1));
+ query.setParameter(resultParam3, Long.valueOf(1));
+ query.setParameter(resultParam4, Long.valueOf(1));
List<Dto01> dto01 = query.getResultList();
assertNotNull(dto01);
@@ -812,8 +812,8 @@ public void testQuery_Criteria_Case_Parameters_3() {
assertEquals("Other", dto01.get(0).getStr2());
assertNull(dto01.get(0).getStr3());
assertNull(dto01.get(0).getStr4());
- assertEquals(new Integer(2), dto01.get(0).getInteger1());
- assertEquals(new Integer(2), dto01.get(0).getInteger2());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger1());
+ assertEquals(Integer.valueOf(2), dto01.get(0).getInteger2());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -847,8 +847,8 @@ public void testQuery_JPQL_Case_Literals_4() {
List<Integer> intList = query.getResultList();
assertNotNull(intList);
assertEquals(2, intList.size());
- assertEquals(new Integer(100), intList.get(0));
- assertEquals(new Integer(100), intList.get(1));
+ assertEquals(Integer.valueOf(100), intList.get(0));
+ assertEquals(Integer.valueOf(100), intList.get(1));
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -886,8 +886,8 @@ public void testQuery_Criteria_Case_Literals_4() {
List<Integer> intList = query.getResultList();
assertNotNull(intList);
assertEquals(2, intList.size());
- assertEquals(new Integer(100), intList.get(0));
- assertEquals(new Integer(100), intList.get(1));
+ assertEquals(Integer.valueOf(100), intList.get(0));
+ assertEquals(Integer.valueOf(100), intList.get(1));
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -926,8 +926,8 @@ public void testQuery_JPQL_Case_Parameters_4() {
List<Number> intList = query.getResultList();
assertNotNull(intList);
assertEquals(2, intList.size());
- assertEquals(new Integer(100).intValue(), intList.get(0).intValue());
- assertEquals(new Integer(100).intValue(), intList.get(1).intValue());
+ assertEquals(Integer.valueOf(100).intValue(), intList.get(0).intValue());
+ assertEquals(Integer.valueOf(100).intValue(), intList.get(1).intValue());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -979,8 +979,8 @@ public void testQuery_Criteria_Case_Parameters_4() {
List<Number> intList = query.getResultList();
assertNotNull(intList);
assertEquals(2, intList.size());
- assertEquals(new Integer(100).intValue(), intList.get(0).intValue());
- assertEquals(new Integer(100).intValue(), intList.get(1).intValue());
+ assertEquals(Integer.valueOf(100).intValue(), intList.get(0).intValue());
+ assertEquals(Integer.valueOf(100).intValue(), intList.get(1).intValue());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryIN.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryIN.java
index 15c688a..587ea5d 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryIN.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryIN.java
@@ -65,7 +65,7 @@ public void testQuery_JPQL_IN_Literals_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -103,7 +103,7 @@ public void testQuery_JPQL_IN_Parameters_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
// equivalent test 2
query = em.createQuery(""
@@ -118,7 +118,7 @@ public void testQuery_JPQL_IN_Parameters_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -158,7 +158,7 @@ public void testQuery_Criteria_IN_Literals_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
// equivalent test 2
cb = em.getCriteriaBuilder();
@@ -179,7 +179,7 @@ public void testQuery_Criteria_IN_Literals_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
// equivalent test 3
cb = em.getCriteriaBuilder();
@@ -200,7 +200,7 @@ public void testQuery_Criteria_IN_Literals_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -248,7 +248,7 @@ public void testQuery_Criteria_IN_Parameters_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
// equivalent test 2
cb = em.getCriteriaBuilder();
@@ -277,7 +277,7 @@ public void testQuery_Criteria_IN_Parameters_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
// equivalent test 3
cb = em.getCriteriaBuilder();
@@ -299,7 +299,7 @@ public void testQuery_Criteria_IN_Parameters_1() {
Assert.assertEquals("TWO", dto01.get(0).getItemString2());
Assert.assertEquals("THREE", dto01.get(0).getItemString3());
Assert.assertEquals("FIVE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(1), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(1), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -334,7 +334,7 @@ public void testQuery_JPQL_IN_SUBQUERY_Literals_1() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -370,7 +370,7 @@ public void testQuery_JPQL_IN_SUBQUERY_Parameters_1() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -415,7 +415,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Literals_1() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
// equivalent test 2
cb = em.getCriteriaBuilder();
@@ -441,7 +441,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Literals_1() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -488,7 +488,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Parameters_1() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
// equivalent test 2
cb = em.getCriteriaBuilder();
@@ -516,7 +516,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Parameters_1() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -551,7 +551,7 @@ public void testQuery_JPQL_IN_SUBQUERY_Literals_2() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -589,7 +589,7 @@ public void testQuery_JPQL_IN_SUBQUERY_Parameters_2() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -634,7 +634,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Literals_2() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
// equivalent test 2
cb = em.getCriteriaBuilder();
@@ -661,7 +661,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Literals_2() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -712,7 +712,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Parameters_2() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
// equivalent test 2
cb = em.getCriteriaBuilder();
@@ -745,7 +745,7 @@ public void testQuery_Criteria_IN_SUBQUERY_Parameters_2() {
Assert.assertEquals("SEVEN", dto01.get(0).getItemString2());
Assert.assertEquals("EIGHT", dto01.get(0).getItemString3());
Assert.assertEquals("NINE", dto01.get(0).getItemString4());
- Assert.assertEquals(new Integer(2), dto01.get(0).getItemInteger1());
+ Assert.assertEquals(Integer.valueOf(2), dto01.get(0).getItemInteger1());
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/model/Dto01.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/model/Dto01.java
index 6203610..b58d83f 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/model/Dto01.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/model/Dto01.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 IBM Corporation, Oracle, and/or affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 IBM Corporation, Oracle, and/or affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,8 +40,8 @@ public Dto01(String str1, String str2, Integer integer1, Integer integer2) {
public Dto01(String str1, String str2, Long integer1, Long integer2) {
this.str1 = str1;
this.str2 = str2;
- this.integer1 = new Integer(integer1.intValue());
- this.integer2 = new Integer(integer2.intValue());
+ this.integer1 = Integer.valueOf(integer1.intValue());
+ this.integer2 = Integer.valueOf(integer2.intValue());
}
public String getStr1() {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Buyer.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Buyer.java
index 7530487..67b3adf 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Buyer.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Buyer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -108,35 +108,35 @@ public Buyer() {
}
public void addAmex(long number) {
- getCreditCards().put(AMEX, new Long(number));
+ getCreditCards().put(AMEX, Long.valueOf(number));
}
public void addCanadianImperialCreditLine(long number) {
- getCreditLines().put(CANADIAN_IMPERIAL, new Long(number));
+ getCreditLines().put(CANADIAN_IMPERIAL, Long.valueOf(number));
}
public void addDinersClub(long number) {
- getCreditCards().put(DINERS, new Long(number));
+ getCreditCards().put(DINERS, Long.valueOf(number));
}
public void addMastercard(long number) {
- getCreditCards().put(MASTERCARD, new Long(number));
+ getCreditCards().put(MASTERCARD, Long.valueOf(number));
}
public void addRoyalBankCreditLine(long number) {
- getCreditLines().put(ROYAL_BANK, new Long(number));
+ getCreditLines().put(ROYAL_BANK, Long.valueOf(number));
}
public void addScotiabankCreditLine(long number) {
- getCreditLines().put(SCOTIABANK, new Long(number));
+ getCreditLines().put(SCOTIABANK, Long.valueOf(number));
}
public void addTorontoDominionCreditLine(long number) {
- getCreditLines().put(TORONTO_DOMINION, new Long(number));
+ getCreditLines().put(TORONTO_DOMINION, Long.valueOf(number));
}
public void addVisa(long number) {
- getCreditCards().put(VISA, new Long(number));
+ getCreditCards().put(VISA, Long.valueOf(number));
}
public boolean buysSaturdayToSunday() {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java
index 24b4a95..59b98bf 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,7 +48,7 @@ public void customize(Session session) throws Exception {
if(numberOfCalls != null) {
num = numberOfCalls.intValue();
}
- sessionCalls.put(sessionName, new Integer(num + 1));
+ sessionCalls.put(sessionName, Integer.valueOf(num + 1));
//**temp
session.getEventManager().addListener(new AcquireReleaseListener());
@@ -92,7 +92,7 @@ public void customize(ClassDescriptor descriptor) {
if(numberOfCalls != null) {
num = numberOfCalls.intValue();
}
- descriptorCalls.put(javaClassName, new Integer(num + 1));
+ descriptorCalls.put(javaClassName, Integer.valueOf(num + 1));
addCustomQueryKeys(descriptor);
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/composite/advanced/Customizer.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/composite/advanced/Customizer.java
index 3f68a78..d3e27a2 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/composite/advanced/Customizer.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/composite/advanced/Customizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,7 +51,7 @@ public void customize(Session session) {
if(numberOfCalls != null) {
num = numberOfCalls.intValue();
}
- sessionCalls.put(sessionName, new Integer(num + 1));
+ sessionCalls.put(sessionName, Integer.valueOf(num + 1));
//**temp
session.getEventManager().addListener(new AcquireReleaseListener());
@@ -72,7 +72,7 @@ public void customize(ClassDescriptor descriptor) {
if(numberOfCalls != null) {
num = numberOfCalls.intValue();
}
- descriptorCalls.put(javaClassName, new Integer(num + 1));
+ descriptorCalls.put(javaClassName, Integer.valueOf(num + 1));
addCustomQueryKeys(descriptor);
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Buyer.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Buyer.java
index 4f9c465..dbf8578 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Buyer.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Buyer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -131,19 +131,19 @@ public Buyer() {
}
public void addAmex(long number) {
- getCreditCards().put(AMEX, new Long(number));
+ getCreditCards().put(AMEX, Long.valueOf(number));
}
public void addDinersClub(long number) {
- getCreditCards().put(DINERS, new Long(number));
+ getCreditCards().put(DINERS, Long.valueOf(number));
}
public void addMastercard(long number) {
- getCreditCards().put(MASTERCARD, new Long(number));
+ getCreditCards().put(MASTERCARD, Long.valueOf(number));
}
public void addVisa(long number) {
- getCreditCards().put(VISA, new Long(number));
+ getCreditCards().put(VISA, Long.valueOf(number));
}
public boolean buysSaturdayToSunday() {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Customizer.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Customizer.java
index d6f4270..d1f19b5 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Customizer.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/Customizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ public void customize(Session session) {
if(numberOfCalls != null) {
num = numberOfCalls.intValue();
}
- sessionCalls.put(sessionName, new Integer(num + 1));
+ sessionCalls.put(sessionName, Integer.valueOf(num + 1));
session.getEventManager().addListener(new SessionEventAdapter() {
public void postLogin(SessionEvent event) {
@@ -56,7 +56,7 @@ public void customize(ClassDescriptor descriptor) {
if(numberOfCalls != null) {
num = numberOfCalls.intValue();
}
- descriptorCalls.put(javaClassName, new Integer(num + 1));
+ descriptorCalls.put(javaClassName, Integer.valueOf(num + 1));
}
public static Map getSessionCalls() {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/Bicycle.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/Bicycle.java
index aa137ba..1fb40ec 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/Bicycle.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/Bicycle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public void setDescription(String aDescription) {
}
public void change() {
- this.setPassengerCapacity(new Integer(100));
+ this.setPassengerCapacity(Integer.valueOf(100));
this.setDescription("This Bike is easy to handle");
}
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/FueledVehicle.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/FueledVehicle.java
index a62a743..73d9268 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/FueledVehicle.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/FueledVehicle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ public Object clone() {
}
public void change() {
- this.setPassengerCapacity(new Integer(100));
+ this.setPassengerCapacity(Integer.valueOf(100));
this.setFuelType("HOT AIR");
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/InheritanceModelExamples.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/InheritanceModelExamples.java
index 67aa409..a268cd9 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/InheritanceModelExamples.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inheritance/InheritanceModelExamples.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,7 +22,7 @@ public class InheritanceModelExamples {
public static Bicycle bikeExample1(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(1));
+ example.setPassengerCapacity(Integer.valueOf(1));
example.setOwner(company);
example.setDescription("Hercules");
// example.addPartNumber("1288H8HH-f");
@@ -32,7 +32,7 @@ public static Bicycle bikeExample1(Company company) {
public static Bicycle bikeExample2(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(2));
+ example.setPassengerCapacity(Integer.valueOf(2));
example.setOwner(company);
example.setDescription("Atlas");
// example.addPartNumber("176339GT-a");
@@ -43,7 +43,7 @@ public static Bicycle bikeExample2(Company company) {
public static Bicycle bikeExample3(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(3));
+ example.setPassengerCapacity(Integer.valueOf(3));
example.setOwner(company);
example.setDescription("Aone");
// example.addPartNumber("188181TT-a");
@@ -53,21 +53,21 @@ public static Bicycle bikeExample3(Company company) {
public static Boat boatExample1(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(10));
+ example.setPassengerCapacity(Integer.valueOf(10));
example.setOwner(company);
return example;
}
public static Boat boatExample2(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(20));
+ example.setPassengerCapacity(Integer.valueOf(20));
example.setOwner(company);
return example;
}
public static Boat boatExample3(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(30));
example.setOwner(company);
return example;
}
@@ -75,8 +75,8 @@ public static Boat boatExample3(Company company) {
public static Bus busExample1(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("SCHOOL BUS");
example.setFuelType("Petrol");
example.setOwner(company);
@@ -90,8 +90,8 @@ public static Bus busExample1(Company company) {
public static Bus busExample2(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("TOUR BUS");
example.setFuelType("Petrol");
example.setOwner(company);
@@ -105,8 +105,8 @@ public static Bus busExample2(Company company) {
public static Bus busExample3(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("TRANSIT BUS");
example.setFuelType("Gas");
example.setOwner(company);
@@ -120,8 +120,8 @@ public static Bus busExample3(Company company) {
public static Car carExample1() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("PONTIAC");
example.setFuelType("Petrol");
// example.addPartNumber("021776RM-b");
@@ -133,8 +133,8 @@ public static Car carExample1() {
public static Car carExample2() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(4));
- example.setFuelCapacity(new Integer(50));
+ example.setPassengerCapacity(Integer.valueOf(4));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TOYOTA");
example.setFuelType("Petrol");
// example.addPartNumber("021776TT-a");
@@ -146,8 +146,8 @@ public static Car carExample2() {
public static Car carExample3() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(5));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(5));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("BMW");
example.setFuelType("Disel");
// example.addPartNumber("021776KM-k");
@@ -159,8 +159,8 @@ public static Car carExample3() {
public static Car carExample4() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(8));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(8));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("Mazda");
example.setFuelType("Coca-Cola");
// example.addPartNumber("021776KM-k");
@@ -210,8 +210,8 @@ public static Company companyExample3() {
public static FueledVehicle fueledVehicleExample1(Company company) {
FueledVehicle example = new FueledVehicle();
- example.setPassengerCapacity(new Integer(1));
- example.setFuelCapacity(new Integer(10));
+ example.setPassengerCapacity(Integer.valueOf(1));
+ example.setFuelCapacity(Integer.valueOf(10));
example.setDescription("Motercycle");
example.setOwner(company);
return example;
@@ -220,8 +220,8 @@ public static FueledVehicle fueledVehicleExample1(Company company) {
public static Car imaginaryCarExample1()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("PONTIAC");
example.setFuelType("Petrol");
// example.addPartNumber("021776RM-b");
@@ -232,8 +232,8 @@ public static Car imaginaryCarExample1()
public static Car imaginaryCarExample2()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(4));
- example.setFuelCapacity(new Integer(50));
+ example.setPassengerCapacity(Integer.valueOf(4));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TOYOTA");
example.setFuelType("Petrol");
// example.addPartNumber("021776TT-a");
@@ -244,8 +244,8 @@ public static Car imaginaryCarExample2()
public static Car imaginaryCarExample3()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(5));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(5));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("BMW");
example.setFuelType("Disel");
// example.addPartNumber("021776KM-k");
@@ -256,8 +256,8 @@ public static Car imaginaryCarExample3()
public static Car imaginaryCarExample4()
{
Car example = new Car();
- example.setPassengerCapacity(new Integer(8));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(8));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("Mazda");
example.setFuelType("Coca-Cola");
// example.addPartNumber("021776KM-k");
@@ -268,7 +268,7 @@ public static Car imaginaryCarExample4()
public static NonFueledVehicle nonFueledVehicleExample1(Company company) {
NonFueledVehicle example = new NonFueledVehicle();
- example.setPassengerCapacity(new Integer(1));
+ example.setPassengerCapacity(Integer.valueOf(1));
example.setOwner(company);
return example;
}
@@ -320,8 +320,8 @@ public static Person personExample6() {
public static Car sportsCarExample1() {
SportsCar example = new SportsCar();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("Corvet");
example.setFuelType("Disel");
return example;
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inherited/Birthday.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inherited/Birthday.java
index e8fc6f4..e676756 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inherited/Birthday.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/inherited/Birthday.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,7 +57,7 @@ public Integer getYear() {
public int hashCode() {
String hc = year.toString() + month.toString() + day.toString();
- return new Integer(hc).intValue();
+ return Integer.valueOf(hc).intValue();
}
public void setDay(Integer day) {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/lob/ImageSimulator.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/lob/ImageSimulator.java
index 757a447..b426545 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/lob/ImageSimulator.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/lob/ImageSimulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,12 +40,12 @@ public static Image generateImage(int blobSize, int clobSize) {
generatedImage.setScript(initStringBase(clobSize / 100));
generatedImage.setAudio(initByteBase(blobSize));
generatedImage.setCommentary(initCharArrayBase(clobSize));
- generatedImage.setCustomAttribute1(new SerializableNonEntity(new Long(Long.MAX_VALUE)));
- generatedImage.setCustomAttribute2(new SerializableNonEntity(new Long(Long.MAX_VALUE)));
- generatedImage.setXml1(new SerializableNonEntity(new Long(Long.MIN_VALUE)));
- generatedImage.setXml2(new SerializableNonEntity(new Long(Long.MIN_VALUE)));
- generatedImage.setJson1(new SerializableNonEntity(new Long(Long.MIN_VALUE)));
- generatedImage.setJson2(new SerializableNonEntity(new Long(Long.MIN_VALUE)));
+ generatedImage.setCustomAttribute1(new SerializableNonEntity(Long.valueOf(Long.MAX_VALUE)));
+ generatedImage.setCustomAttribute2(new SerializableNonEntity(Long.valueOf(Long.MAX_VALUE)));
+ generatedImage.setXml1(new SerializableNonEntity(Long.valueOf(Long.MIN_VALUE)));
+ generatedImage.setXml2(new SerializableNonEntity(Long.valueOf(Long.MIN_VALUE)));
+ generatedImage.setJson1(new SerializableNonEntity(Long.valueOf(Long.MIN_VALUE)));
+ generatedImage.setJson2(new SerializableNonEntity(Long.valueOf(Long.MIN_VALUE)));
return generatedImage;
}
@@ -77,7 +77,7 @@ public static String initStringBase(int cycle) {
new Random().nextBytes(pictures);
Byte[] pics = new Byte[cycle];
for (int x = 0; x < cycle; x++) {
- pics[x] = new Byte(pictures[x]);
+ pics[x] = Byte.valueOf(pictures[x]);
}
return pics;
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/sessionbean/EmployeeServiceBean.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/sessionbean/EmployeeServiceBean.java
index 8147349..ba978b4 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/sessionbean/EmployeeServiceBean.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/sessionbean/EmployeeServiceBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,7 +40,7 @@ public List findAll() {
}
public Employee findById(int id) {
- Employee employee = entityManager.find(Employee.class, new Integer(id));
+ Employee employee = entityManager.find(Employee.class, Integer.valueOf(id));
if (employee != null) {
employee.getAddress();
}
@@ -54,7 +54,7 @@ public List findByFirstName(String fname) {
return query.getResultList();
}
public Employee fetchById(int id) {
- Employee employee = entityManager.find(Employee.class, new Integer(id));
+ Employee employee = entityManager.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
employee.getManager();
return employee;
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/advanced/Employee.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/advanced/Employee.java
index 6ce8f68..ec99c48 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/advanced/Employee.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/advanced/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -125,11 +125,11 @@ public Employee(String firstName, String lastName){
}
public void addAmex(long number) {
- getCreditCards().put(AMEX, new Long(number));
+ getCreditCards().put(AMEX, Long.valueOf(number));
}
public void addCanadianImperialCreditLine(long number) {
- getCreditLines().put(CANADIAN_IMPERIAL, new Long(number));
+ getCreditLines().put(CANADIAN_IMPERIAL, Long.valueOf(number));
}
public void addDealer(Dealer dealer) {
@@ -137,7 +137,7 @@ public void addDealer(Dealer dealer) {
}
public void addDinersClub(long number) {
- getCreditCards().put(DINERS, new Long(number));
+ getCreditCards().put(DINERS, Long.valueOf(number));
}
public void addManagedEmployee(Employee emp) {
@@ -146,7 +146,7 @@ public void addManagedEmployee(Employee emp) {
}
public void addMastercard(long number) {
- getCreditCards().put(MASTERCARD, new Long(number));
+ getCreditCards().put(MASTERCARD, Long.valueOf(number));
}
public void addPhoneNumber(PhoneNumber phone) {
@@ -163,19 +163,19 @@ public void addResponsibility(String responsibility) {
}
public void addRoyalBankCreditLine(long number) {
- getCreditLines().put(ROYAL_BANK, new Long(number));
+ getCreditLines().put(ROYAL_BANK, Long.valueOf(number));
}
public void addScotiabankCreditLine(long number) {
- getCreditLines().put(SCOTIABANK, new Long(number));
+ getCreditLines().put(SCOTIABANK, Long.valueOf(number));
}
public void addTorontoDominionCreditLine(long number) {
- getCreditLines().put(TORONTO_DOMINION, new Long(number));
+ getCreditLines().put(TORONTO_DOMINION, Long.valueOf(number));
}
public void addVisa(long number) {
- getCreditCards().put(VISA, new Long(number));
+ getCreditCards().put(VISA, Long.valueOf(number));
}
/**
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2/Employee.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2/Employee.java
index dfb64b6..e6702af 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2/Employee.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -127,11 +127,11 @@ public Employee(String firstName, String lastName){
}
public void addAmex(long number) {
- getCreditCards().put(AMEX, new Long(number));
+ getCreditCards().put(AMEX, Long.valueOf(number));
}
public void addCanadianImperialCreditLine(long number) {
- getCreditLines().put(CANADIAN_IMPERIAL, new Long(number));
+ getCreditLines().put(CANADIAN_IMPERIAL, Long.valueOf(number));
}
public void addDealer(Dealer dealer) {
@@ -139,7 +139,7 @@ public void addDealer(Dealer dealer) {
}
public void addDinersClub(long number) {
- getCreditCards().put(DINERS, new Long(number));
+ getCreditCards().put(DINERS, Long.valueOf(number));
}
public void addManagedEmployee(Employee emp) {
@@ -148,7 +148,7 @@ public void addManagedEmployee(Employee emp) {
}
public void addMastercard(long number) {
- getCreditCards().put(MASTERCARD, new Long(number));
+ getCreditCards().put(MASTERCARD, Long.valueOf(number));
}
public void addPhoneNumber(PhoneNumber phone) {
@@ -165,19 +165,19 @@ public void addResponsibility(String responsibility) {
}
public void addRoyalBankCreditLine(long number) {
- getCreditLines().put(ROYAL_BANK, new Long(number));
+ getCreditLines().put(ROYAL_BANK, Long.valueOf(number));
}
public void addScotiabankCreditLine(long number) {
- getCreditLines().put(SCOTIABANK, new Long(number));
+ getCreditLines().put(SCOTIABANK, Long.valueOf(number));
}
public void addTorontoDominionCreditLine(long number) {
- getCreditLines().put(TORONTO_DOMINION, new Long(number));
+ getCreditLines().put(TORONTO_DOMINION, Long.valueOf(number));
}
public void addVisa(long number) {
- getCreditCards().put(VISA, new Long(number));
+ getCreditCards().put(VISA, Long.valueOf(number));
}
/**
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/Bicycle.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/Bicycle.java
index e57afc6..3f12907 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/Bicycle.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/Bicycle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,7 +28,7 @@ public void setDescription(String aDescription) {
}
public void change() {
- this.setPassengerCapacity(new Integer(100));
+ this.setPassengerCapacity(Integer.valueOf(100));
this.setDescription("This Bike is easy to handle");
}
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/FueledVehicle.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/FueledVehicle.java
index c2e534b..324a320 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/FueledVehicle.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/FueledVehicle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,7 +54,7 @@ public void setFuelType(String type) {
}
public void change() {
- this.setPassengerCapacity(new Integer(100));
+ this.setPassengerCapacity(Integer.valueOf(100));
this.setFuelType("HOT AIR");
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/InheritanceModelExamples.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/InheritanceModelExamples.java
index a8f02aa..73dbfe9 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/InheritanceModelExamples.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inheritance/InheritanceModelExamples.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,7 +22,7 @@ public class InheritanceModelExamples {
public static Bicycle bikeExample1(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(1));
+ example.setPassengerCapacity(Integer.valueOf(1));
example.setOwner(company);
example.setDescription("Hercules");
// example.addPartNumber("1288H8HH-f");
@@ -32,7 +32,7 @@ public static Bicycle bikeExample1(Company company) {
public static Bicycle bikeExample2(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(2));
+ example.setPassengerCapacity(Integer.valueOf(2));
example.setOwner(company);
example.setDescription("Atlas");
// example.addPartNumber("176339GT-a");
@@ -43,7 +43,7 @@ public static Bicycle bikeExample2(Company company) {
public static Bicycle bikeExample3(Company company) {
Bicycle example = new Bicycle();
- example.setPassengerCapacity(new Integer(3));
+ example.setPassengerCapacity(Integer.valueOf(3));
example.setOwner(company);
example.setDescription("Aone");
// example.addPartNumber("188181TT-a");
@@ -53,21 +53,21 @@ public static Bicycle bikeExample3(Company company) {
public static Boat boatExample1(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(10));
+ example.setPassengerCapacity(Integer.valueOf(10));
example.setOwner(company);
return example;
}
public static Boat boatExample2(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(20));
+ example.setPassengerCapacity(Integer.valueOf(20));
example.setOwner(company);
return example;
}
public static Boat boatExample3(Company company) {
Boat example = new Boat();
- example.setPassengerCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(30));
example.setOwner(company);
return example;
}
@@ -75,8 +75,8 @@ public static Boat boatExample3(Company company) {
public static Bus busExample1(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("SCHOOL BUS");
example.setFuelType("Petrol");
example.setOwner(company);
@@ -90,8 +90,8 @@ public static Bus busExample1(Company company) {
public static Bus busExample2(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("TOUR BUS");
example.setFuelType("Petrol");
example.setOwner(company);
@@ -105,8 +105,8 @@ public static Bus busExample2(Company company) {
public static Bus busExample3(Company company) {
Bus example = new Bus();
- example.setPassengerCapacity(new Integer(30));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(30));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("TRANSIT BUS");
example.setFuelType("Gas");
example.setOwner(company);
@@ -120,8 +120,8 @@ public static Bus busExample3(Company company) {
public static Car carExample1() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("PONTIAC");
example.setFuelType("Petrol");
// example.addPartNumber("021776RM-b");
@@ -133,8 +133,8 @@ public static Car carExample1() {
public static Car carExample2() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(4));
- example.setFuelCapacity(new Integer(50));
+ example.setPassengerCapacity(Integer.valueOf(4));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TOYOTA");
example.setFuelType("Petrol");
// example.addPartNumber("021776TT-a");
@@ -146,8 +146,8 @@ public static Car carExample2() {
public static Car carExample3() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(5));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(5));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("BMW");
example.setFuelType("Disel");
// example.addPartNumber("021776KM-k");
@@ -159,8 +159,8 @@ public static Car carExample3() {
public static Car carExample4() {
Car example = new Car();
- example.setPassengerCapacity(new Integer(8));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(8));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("Mazda");
example.setFuelType("Coca-Cola");
// example.addPartNumber("021776KM-k");
@@ -210,8 +210,8 @@ public static Company companyExample3() {
public static FueledVehicle fueledVehicleExample1(Company company) {
FueledVehicle example = new FueledVehicle();
- example.setPassengerCapacity(new Integer(1));
- example.setFuelCapacity(new Integer(10));
+ example.setPassengerCapacity(Integer.valueOf(1));
+ example.setFuelCapacity(Integer.valueOf(10));
example.setDescription("Motercycle");
example.setOwner(company);
return example;
@@ -220,8 +220,8 @@ public static FueledVehicle fueledVehicleExample1(Company company) {
public static Car imaginaryCarExample1()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(30));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(30));
example.setDescription("PONTIAC");
example.setFuelType("Petrol");
// example.addPartNumber("021776RM-b");
@@ -232,8 +232,8 @@ public static Car imaginaryCarExample1()
public static Car imaginaryCarExample2()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(4));
- example.setFuelCapacity(new Integer(50));
+ example.setPassengerCapacity(Integer.valueOf(4));
+ example.setFuelCapacity(Integer.valueOf(50));
example.setDescription("TOYOTA");
example.setFuelType("Petrol");
// example.addPartNumber("021776TT-a");
@@ -244,8 +244,8 @@ public static Car imaginaryCarExample2()
public static Car imaginaryCarExample3()
{
ImaginaryCar example = new ImaginaryCar();
- example.setPassengerCapacity(new Integer(5));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(5));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("BMW");
example.setFuelType("Disel");
// example.addPartNumber("021776KM-k");
@@ -256,8 +256,8 @@ public static Car imaginaryCarExample3()
public static Car imaginaryCarExample4()
{
Car example = new Car();
- example.setPassengerCapacity(new Integer(8));
- example.setFuelCapacity(new Integer(100));
+ example.setPassengerCapacity(Integer.valueOf(8));
+ example.setFuelCapacity(Integer.valueOf(100));
example.setDescription("Mazda");
example.setFuelType("Coca-Cola");
// example.addPartNumber("021776KM-k");
@@ -268,7 +268,7 @@ public static Car imaginaryCarExample4()
public static NonFueledVehicle nonFueledVehicleExample1(Company company) {
NonFueledVehicle example = new NonFueledVehicle();
- example.setPassengerCapacity(new Integer(1));
+ example.setPassengerCapacity(Integer.valueOf(1));
example.setOwner(company);
return example;
}
@@ -319,8 +319,8 @@ public static Person personExample6() {
public static Car sportsCarExample1() {
SportsCar example = new SportsCar();
- example.setPassengerCapacity(new Integer(2));
- example.setFuelCapacity(new Integer(60));
+ example.setPassengerCapacity(Integer.valueOf(2));
+ example.setFuelCapacity(Integer.valueOf(60));
example.setDescription("Corvet");
example.setFuelType("Disel");
return example;
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inherited/Birthday.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inherited/Birthday.java
index da77473..1aa12e6 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inherited/Birthday.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/xml/inherited/Birthday.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,7 +54,7 @@ public Integer getYear() {
public int hashCode() {
String hc = year.toString() + month.toString() + day.toString();
- return new Integer(hc).intValue();
+ return Integer.valueOf(hc).intValue();
}
public void setDay(Integer day) {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/EmployeePopulator.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/EmployeePopulator.java
index cf1aaaf..654eff5 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/EmployeePopulator.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/EmployeePopulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -201,7 +201,7 @@ public Employee basicEmployeeExample1() {
employee.setFirstName("Bob");
employee.setLastName("Smith");
employee.setMale();
- employee.setSalary(new Long(35000));
+ employee.setSalary(Long.valueOf(35000));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.setDepartment(departmentExample1());
@@ -224,7 +224,7 @@ public Employee basicEmployeeExample10() {
employee.setFemale();
employee.setPeriod(employmentPeriodExample10());
employee.setAddress(addressExample10());
- employee.setSalary(new Long(56232));
+ employee.setSalary(Long.valueOf(56232));
employee.addPhoneNumber(phoneNumberExample1());
employee.addPhoneNumber(phoneNumberExample2());
employee.addResponsibility("Sort files");
@@ -244,7 +244,7 @@ public Employee basicEmployeeExample11() {
employee.setFemale();
employee.setPeriod(employmentPeriodExample11());
employee.setAddress(addressExample11());
- employee.setSalary(new Long(75000));
+ employee.setSalary(Long.valueOf(75000));
employee.addPhoneNumber(phoneNumberExample2());
employee.addPhoneNumber(phoneNumberExample3());
employee.addPhoneNumber(phoneNumberExample4());
@@ -266,7 +266,7 @@ public Employee basicEmployeeExample12() {
employee.setMale();
employee.setPeriod(employmentPeriodExample12());
employee.setAddress(addressExample12());
- employee.setSalary(new Long(50000));
+ employee.setSalary(Long.valueOf(50000));
employee.addPhoneNumber(phoneNumberExample3());
employee.addPhoneNumber(phoneNumberExample4());
employee.addResponsibility("Bug fixes");
@@ -283,7 +283,7 @@ public Employee basicEmployeeExample13() {
try {
employee.setFirstName("SquareRoot");
employee.setLastName("TestCase1");
- employee.setSalary(new Long(36));
+ employee.setSalary(Long.valueOf(36));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.addPhoneNumber(phoneNumberExample1());
@@ -302,7 +302,7 @@ public Employee basicEmployeeExample14() {
try {
employee.setFirstName("SquareRoot");
employee.setLastName("TestCase2");
- employee.setSalary(new Long(49));
+ employee.setSalary(Long.valueOf(49));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.addPhoneNumber(phoneNumberExample1());
@@ -322,7 +322,7 @@ public Employee basicEmployeeExample15() {
try {
employee.setFirstName("No Phone Number");
employee.setLastName("Test case");
- employee.setSalary(new Long(555));
+ employee.setSalary(Long.valueOf(555));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.addResponsibility("Find ways to make the days go by faster");
@@ -340,7 +340,7 @@ public Employee basicEmployeeExample2() {
employee.setFirstName("John");
employee.setLastName("Way");
employee.setMale();
- employee.setSalary(new Long(53000));
+ employee.setSalary(Long.valueOf(53000));
startCalendar.set(1970, 0, 1, 8, 0, 0);
endCalendar.set(1970, 0, 1, 17, 30, 0);
employee.setPeriod(employmentPeriodExample2());
@@ -364,7 +364,7 @@ public Employee basicEmployeeExample3() {
employee.setFirstName("Charles");
employee.setLastName("Chanley");
employee.setMale();
- employee.setSalary(new Long(43000));
+ employee.setSalary(Long.valueOf(43000));
startCalendar.set(1970, 0, 1, 7, 0, 0);
endCalendar.set(1970, 0, 1, 15, 30, 0);
employee.setPeriod(employmentPeriodExample6());
@@ -387,7 +387,7 @@ public Employee basicEmployeeExample4() {
employee.setFirstName("Emanual");
employee.setLastName("Smith");
employee.setMale();
- employee.setSalary(new Long(49631));
+ employee.setSalary(Long.valueOf(49631));
startCalendar.set(1970, 0, 1, 6, 45, 0);
endCalendar.set(1970, 0, 1, 16, 32, 0);
employee.setPeriod(employmentPeriodExample5());
@@ -411,7 +411,7 @@ public Employee basicEmployeeExample5() {
employee.setFirstName("Sarah");
employee.setLastName("Way");
employee.setFemale();
- employee.setSalary(new Long(87000));
+ employee.setSalary(Long.valueOf(87000));
startCalendar.set(1970, 0, 1, 12, 0, 0);
endCalendar.set(1970, 0, 1, 20, 0, 30);
employee.setPeriod(employmentPeriodExample4());
@@ -434,7 +434,7 @@ public Employee basicEmployeeExample6() {
employee.setFirstName("Marcus");
employee.setLastName("Saunders");
employee.setMale();
- employee.setSalary(new Long(54300));
+ employee.setSalary(Long.valueOf(54300));
employee.setPeriod(employmentPeriodExample3());
employee.setAddress(addressExample3());
employee.addResponsibility("Write user specifications.");
@@ -454,7 +454,7 @@ public Employee basicEmployeeExample7() {
employee.setFirstName("Nancy");
employee.setLastName("White");
employee.setFemale();
- employee.setSalary(new Long(31000));
+ employee.setSalary(Long.valueOf(31000));
employee.setPeriod(employmentPeriodExample7());
employee.setAddress(addressExample7());
employee.addPhoneNumber(phoneNumberExample3());
@@ -472,7 +472,7 @@ public Employee basicEmployeeExample8() {
employee.setFirstName("Fred");
employee.setLastName("Jones");
employee.setMale();
- employee.setSalary(new Long(500000));
+ employee.setSalary(Long.valueOf(500000));
employee.setPeriod(employmentPeriodExample8());
employee.setAddress(addressExample8());
employee.addPhoneNumber(phoneNumberExample4());
@@ -491,7 +491,7 @@ public Employee basicEmployeeExample9() {
employee.setFirstName("Betty");
employee.setLastName("Jones");
employee.setFemale();
- employee.setSalary(new Long(500001));
+ employee.setSalary(Long.valueOf(500001));
startCalendar.set(1970, 0, 1, 22, 0, 0);
endCalendar.set(1970, 0, 1, 5, 30, 0);
employee.setPeriod(employmentPeriodExample9());
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/converters/LongToStringConverter.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/converters/LongToStringConverter.java
index 8d0c721..0b42741 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/converters/LongToStringConverter.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/converters/LongToStringConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,6 @@ public String convertToDatabaseColumn(Long attribute) {
@Override
public Long convertToEntityAttribute(String dbData) {
- return (dbData == null) ? null : new Long(dbData);
+ return (dbData == null) ? null : Long.valueOf(dbData);
}
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/xml/EmployeePopulator.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/xml/EmployeePopulator.java
index e96b86e..f6c10b6 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/xml/EmployeePopulator.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa21/advanced/xml/EmployeePopulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -187,7 +187,7 @@ public Employee basicEmployeeExample1() {
employee.setFirstName("Bob");
employee.setLastName("Smith");
employee.setMale();
- employee.setSalary(new Long(35000));
+ employee.setSalary(Long.valueOf(35000));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.setDepartment(departmentExample1());
@@ -210,7 +210,7 @@ public Employee basicEmployeeExample10() {
employee.setFemale();
employee.setPeriod(employmentPeriodExample10());
employee.setAddress(addressExample10());
- employee.setSalary(new Long(56232));
+ employee.setSalary(Long.valueOf(56232));
employee.addPhoneNumber(phoneNumberExample1());
employee.addPhoneNumber(phoneNumberExample2());
employee.addResponsibility("Sort files");
@@ -230,7 +230,7 @@ public Employee basicEmployeeExample11() {
employee.setFemale();
employee.setPeriod(employmentPeriodExample11());
employee.setAddress(addressExample11());
- employee.setSalary(new Long(75000));
+ employee.setSalary(Long.valueOf(75000));
employee.addPhoneNumber(phoneNumberExample2());
employee.addPhoneNumber(phoneNumberExample3());
employee.addPhoneNumber(phoneNumberExample4());
@@ -252,7 +252,7 @@ public Employee basicEmployeeExample12() {
employee.setMale();
employee.setPeriod(employmentPeriodExample12());
employee.setAddress(addressExample12());
- employee.setSalary(new Long(50000));
+ employee.setSalary(Long.valueOf(50000));
employee.addPhoneNumber(phoneNumberExample3());
employee.addPhoneNumber(phoneNumberExample4());
employee.addResponsibility("Bug fixes");
@@ -269,7 +269,7 @@ public Employee basicEmployeeExample13() {
try {
employee.setFirstName("SquareRoot");
employee.setLastName("TestCase1");
- employee.setSalary(new Long(36));
+ employee.setSalary(Long.valueOf(36));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.addPhoneNumber(phoneNumberExample1());
@@ -288,7 +288,7 @@ public Employee basicEmployeeExample14() {
try {
employee.setFirstName("SquareRoot");
employee.setLastName("TestCase2");
- employee.setSalary(new Long(49));
+ employee.setSalary(Long.valueOf(49));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.addPhoneNumber(phoneNumberExample1());
@@ -308,7 +308,7 @@ public Employee basicEmployeeExample15() {
try {
employee.setFirstName("No Phone Number");
employee.setLastName("Test case");
- employee.setSalary(new Long(555));
+ employee.setSalary(Long.valueOf(555));
employee.setPeriod(employmentPeriodExample1());
employee.setAddress(addressExample1());
employee.addResponsibility("Find ways to make the days go by faster");
@@ -326,7 +326,7 @@ public Employee basicEmployeeExample2() {
employee.setFirstName("John");
employee.setLastName("Way");
employee.setMale();
- employee.setSalary(new Long(53000));
+ employee.setSalary(Long.valueOf(53000));
startCalendar.set(1970, 0, 1, 8, 0, 0);
endCalendar.set(1970, 0, 1, 17, 30, 0);
employee.setPeriod(employmentPeriodExample2());
@@ -350,7 +350,7 @@ public Employee basicEmployeeExample3() {
employee.setFirstName("Charles");
employee.setLastName("Chanley");
employee.setMale();
- employee.setSalary(new Long(43000));
+ employee.setSalary(Long.valueOf(43000));
startCalendar.set(1970, 0, 1, 7, 0, 0);
endCalendar.set(1970, 0, 1, 15, 30, 0);
employee.setPeriod(employmentPeriodExample6());
@@ -373,7 +373,7 @@ public Employee basicEmployeeExample4() {
employee.setFirstName("Emanual");
employee.setLastName("Smith");
employee.setMale();
- employee.setSalary(new Long(49631));
+ employee.setSalary(Long.valueOf(49631));
startCalendar.set(1970, 0, 1, 6, 45, 0);
endCalendar.set(1970, 0, 1, 16, 32, 0);
employee.setPeriod(employmentPeriodExample5());
@@ -397,7 +397,7 @@ public Employee basicEmployeeExample5() {
employee.setFirstName("Sarah");
employee.setLastName("Way");
employee.setFemale();
- employee.setSalary(new Long(87000));
+ employee.setSalary(Long.valueOf(87000));
startCalendar.set(1970, 0, 1, 12, 0, 0);
endCalendar.set(1970, 0, 1, 20, 0, 30);
employee.setPeriod(employmentPeriodExample4());
@@ -420,7 +420,7 @@ public Employee basicEmployeeExample6() {
employee.setFirstName("Marcus");
employee.setLastName("Saunders");
employee.setMale();
- employee.setSalary(new Long(54300));
+ employee.setSalary(Long.valueOf(54300));
employee.setPeriod(employmentPeriodExample3());
employee.setAddress(addressExample3());
employee.addResponsibility("Write user specifications.");
@@ -440,7 +440,7 @@ public Employee basicEmployeeExample7() {
employee.setFirstName("Nancy");
employee.setLastName("White");
employee.setFemale();
- employee.setSalary(new Long(31000));
+ employee.setSalary(Long.valueOf(31000));
employee.setPeriod(employmentPeriodExample7());
employee.setAddress(addressExample7());
employee.addPhoneNumber(phoneNumberExample3());
@@ -458,7 +458,7 @@ public Employee basicEmployeeExample8() {
employee.setFirstName("Fred");
employee.setLastName("Jones");
employee.setMale();
- employee.setSalary(new Long(500000));
+ employee.setSalary(Long.valueOf(500000));
employee.setPeriod(employmentPeriodExample8());
employee.setAddress(addressExample8());
employee.addPhoneNumber(phoneNumberExample4());
@@ -477,7 +477,7 @@ public Employee basicEmployeeExample9() {
employee.setFirstName("Betty");
employee.setLastName("Jones");
employee.setFemale();
- employee.setSalary(new Long(500001));
+ employee.setSalary(Long.valueOf(500001));
startCalendar.set(1970, 0, 1, 22, 0, 0);
endCalendar.set(1970, 0, 1, 5, 30, 0);
employee.setPeriod(employmentPeriodExample9());
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa22/advanced/converters/LongToStringConverter.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa22/advanced/converters/LongToStringConverter.java
index 8f68957..29f0b3c 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa22/advanced/converters/LongToStringConverter.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa22/advanced/converters/LongToStringConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,6 @@ public String convertToDatabaseColumn(Long attribute) {
@Override
public Long convertToEntityAttribute(String dbData) {
- return (dbData == null) ? null : new Long(dbData);
+ return (dbData == null) ? null : Long.valueOf(dbData);
}
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJPAJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJPAJunitTest.java
index 63c5dc0..a2e08f0 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJPAJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJPAJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -2484,7 +2484,7 @@ public void testProperty() {
// verify properties set on Employee instance
errorMsg += verifyPropertyValue(descriptor, "entityName", String.class, "Employee");
- errorMsg += verifyPropertyValue(descriptor, "entityIntegerProperty", Integer.class, new Integer(1));
+ errorMsg += verifyPropertyValue(descriptor, "entityIntegerProperty", Integer.class, Integer.valueOf(1));
// each attribute of Employee was assigned a property attributeName with the value attribute name.
for(DatabaseMapping mapping : descriptor.getMappings()) {
@@ -2494,13 +2494,13 @@ public void testProperty() {
// attribute m_lastName has many properties of different types
DatabaseMapping mapping = descriptor.getMappingForAttributeName("lastName");
errorMsg += verifyPropertyValue(mapping, "BooleanProperty", Boolean.class, Boolean.TRUE);
- errorMsg += verifyPropertyValue(mapping, "ByteProperty", Byte.class, new Byte((byte)1));
- errorMsg += verifyPropertyValue(mapping, "CharacterProperty", Character.class, new Character('A'));
- errorMsg += verifyPropertyValue(mapping, "DoubleProperty", Double.class, new Double(1));
- errorMsg += verifyPropertyValue(mapping, "FloatProperty", Float.class, new Float(1));
- errorMsg += verifyPropertyValue(mapping, "IntegerProperty", Integer.class, new Integer(1));
- errorMsg += verifyPropertyValue(mapping, "LongProperty", Long.class, new Long(1));
- errorMsg += verifyPropertyValue(mapping, "ShortProperty", Short.class, new Short((short)1));
+ errorMsg += verifyPropertyValue(mapping, "ByteProperty", Byte.class, Byte.valueOf((byte)1));
+ errorMsg += verifyPropertyValue(mapping, "CharacterProperty", Character.class, Character.valueOf('A'));
+ errorMsg += verifyPropertyValue(mapping, "DoubleProperty", Double.class, Double.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "FloatProperty", Float.class, Float.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "IntegerProperty", Integer.class, Integer.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "LongProperty", Long.class, Long.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "ShortProperty", Short.class, Short.valueOf((short)1));
errorMsg += verifyPropertyValue(mapping, "BigDecimalProperty", java.math.BigDecimal.class, java.math.BigDecimal.ONE);
errorMsg += verifyPropertyValue(mapping, "BigIntegerProperty", java.math.BigInteger.class, java.math.BigInteger.ONE);
errorMsg += verifyPropertyValue(mapping, "byte[]Property", byte[].class, new byte[]{1, 2, 3, 4});
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJunitTest.java
index 16724e5..df4e23d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/AdvancedJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -576,7 +576,7 @@ public void testCoalesceJPQLQueryWithNullParameterValue() {
query = query.setParameter("sal", null); // deliberate null parameter value
Long result = (Long)query.getSingleResult(); // query should still function
assertNotNull("Query result should be non-null", result);
- assertEquals("Incorrect query results", new Long(2), result); // result value from db
+ assertEquals("Incorrect query results", Long.valueOf(2), result); // result value from db
} catch (RuntimeException e) {
throw e;
} finally {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java
index a48475b..d3a8c5a 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -314,7 +314,7 @@ public void testEvictClass_MappedSuperclass_RemovesAssignableSubclasses() {
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
ChestProtector e1 = new ChestProtector();
e1.setDescription("chest_protector");
- e1.setSerialNumber(new Integer(ID_PADS));
+ e1.setSerialNumber(Integer.valueOf(ID_PADS));
em.persist(e1);
commitTransaction(em);
// do not close the entityManager between transactions or you will get bug# 307445
@@ -323,7 +323,7 @@ public void testEvictClass_MappedSuperclass_RemovesAssignableSubclasses() {
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
Pads p1 = new Pads();
p1.setDescription("pads");
- p1.setSerialNumber(new Integer(ID_CHESTPROTECTOR));
+ p1.setSerialNumber(Integer.valueOf(ID_CHESTPROTECTOR));
em.persist(p1);
commitTransaction(em);
closeEntityManager(em);
@@ -388,7 +388,7 @@ public void testEvictClass_NonPersistableParentOfEntityMappedSuperclassChain_Rem
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
ChestProtector e1 = new ChestProtector();
e1.setDescription("chest_protector");
- e1.setSerialNumber(new Integer(ID_PADS));
+ e1.setSerialNumber(Integer.valueOf(ID_PADS));
em.persist(e1);
commitTransaction(em);
// do not close the entityManager between transactions or you will get bug# 307445
@@ -397,7 +397,7 @@ public void testEvictClass_NonPersistableParentOfEntityMappedSuperclassChain_Rem
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
Pads p1 = new Pads();
p1.setDescription("pads");
- p1.setSerialNumber(new Integer(ID_CHESTPROTECTOR));
+ p1.setSerialNumber(Integer.valueOf(ID_CHESTPROTECTOR));
em.persist(p1);
commitTransaction(em);
closeEntityManager(em);
@@ -461,7 +461,7 @@ public void testEvictClass_NonPersistableSubclassOfEntityMappedSuperclassChain_h
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
ChestProtector e1 = new ChestProtector();
e1.setDescription("chest_protector");
- e1.setSerialNumber(new Integer(ID_PADS));
+ e1.setSerialNumber(Integer.valueOf(ID_PADS));
em.persist(e1);
commitTransaction(em);
// do not close the entityManager between transactions or you will get bug# 307445
@@ -470,7 +470,7 @@ public void testEvictClass_NonPersistableSubclassOfEntityMappedSuperclassChain_h
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
Pads p1 = new Pads();
p1.setDescription("pads");
- p1.setSerialNumber(new Integer(ID_CHESTPROTECTOR));
+ p1.setSerialNumber(Integer.valueOf(ID_CHESTPROTECTOR));
em.persist(p1);
commitTransaction(em);
closeEntityManager(em);
@@ -529,7 +529,7 @@ public void testEvictClassObject_MappedSuperclass_RemovesAssignableSubclasses()
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
ChestProtector e1 = new ChestProtector();
e1.setDescription("chest_protector");
- e1.setSerialNumber(new Integer(ID_PADS));
+ e1.setSerialNumber(Integer.valueOf(ID_PADS));
em.persist(e1);
commitTransaction(em);
// do not close the entityManager between transactions or you will get bug# 307445
@@ -537,7 +537,7 @@ public void testEvictClassObject_MappedSuperclass_RemovesAssignableSubclasses()
beginTransaction(em);
Pads p1 = new Pads();
p1.setDescription("pads");
- p1.setSerialNumber(new Integer(ID_CHESTPROTECTOR));
+ p1.setSerialNumber(Integer.valueOf(ID_CHESTPROTECTOR));
em.persist(p1);
commitTransaction(em);
closeEntityManager(em);
@@ -589,7 +589,7 @@ public void testEvictClass_JavaLangClass_hasNoEffect() {
// HockeyGear(Abstract Entity) << GoalieGear (Concrete MappedSuperclass) << ChestProtector (Concrete Entity)
ChestProtector e1 = new ChestProtector();
e1.setDescription("gear");
- e1.setSerialNumber(new Integer(ID));
+ e1.setSerialNumber(Integer.valueOf(ID));
em.persist(e1);
commitTransaction(em);
closeEntityManager(em);
@@ -661,7 +661,7 @@ public void testGetId_fromUnsupportedJavaLangInteger_throwsIAE_on_null_descripto
EntityManager em1 = createEntityManager();
JpaCache anEclipseLinkCache = (JpaCache)getEntityManagerFactory().getCache();
try {
- anEclipseLinkCache.getId(new Integer(1));
+ anEclipseLinkCache.getId(Integer.valueOf(1));
} catch (IllegalArgumentException iae) {
_exceptionThrown = true;
} finally {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java
index 7f3bf16..edc0d8e 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2019 IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1318,8 +1318,8 @@ public void testSubString() {
int lastIndex = firstName.length();
List employees = em.createQuery("SELECT object(e) FROM Employee e where e.firstName = substring(:p1, :p2, :p3)").
setParameter("p1", firstName).
- setParameter("p2", new Integer(firstIndex)).
- setParameter("p3", new Integer(lastIndex)).
+ setParameter("p2", Integer.valueOf(firstIndex)).
+ setParameter("p3", Integer.valueOf(lastIndex)).
getResultList();
// clean up
@@ -5848,17 +5848,17 @@ public void testQueryHints() {
assertTrue("FETCH_GROUP not set.", olrQuery.getFetchGroup() == fetchGroup);
// Timeout
- query.setHint(QueryHints.JDBC_TIMEOUT, new Integer(100));
+ query.setHint(QueryHints.JDBC_TIMEOUT, Integer.valueOf(100));
assertTrue("Timeout not set.", olrQuery.getQueryTimeout() == 100);
// JDBC
- query.setHint(QueryHints.JDBC_FETCH_SIZE, new Integer(101));
+ query.setHint(QueryHints.JDBC_FETCH_SIZE, Integer.valueOf(101));
assertTrue("Fetch-size not set.", olrQuery.getFetchSize() == 101);
- query.setHint(QueryHints.JDBC_MAX_ROWS, new Integer(103));
+ query.setHint(QueryHints.JDBC_MAX_ROWS, Integer.valueOf(103));
assertTrue("Max-rows not set.", olrQuery.getMaxRows() == 103);
- query.setHint(QueryHints.JDBC_FIRST_RESULT, new Integer(123));
+ query.setHint(QueryHints.JDBC_FIRST_RESULT, Integer.valueOf(123));
assertTrue("JDBC_FIRST_RESULT not set.", olrQuery.getFirstResult() == 123);
// Refresh
@@ -7419,7 +7419,7 @@ public void testInitializeFieldForPropertyAccess(){
em = createEntityManager();
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
@@ -7461,7 +7461,7 @@ public void testSetFieldForPropertyAccess(){
int managerId = manager.getId();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
address = new Address();
@@ -7485,7 +7485,7 @@ public void testSetFieldForPropertyAccess(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
manager = employee.getManager();
@@ -7495,8 +7495,8 @@ public void testSetFieldForPropertyAccess(){
assertTrue("The manager was not persisted.", employee.getManager() != null);
assertTrue("The manager was not correctly persisted.", employee.getManager().getFirstName().equals("Metro"));
- Address initialAddress = em.find(Address.class, new Integer(addressId));
- Employee initialManager = em.find(Employee.class, new Integer(managerId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
+ Employee initialManager = em.find(Employee.class, Integer.valueOf(managerId));
employee.setAddress((Address)null);
employee.setManager((Employee)null);
em.remove(address);
@@ -7561,7 +7561,7 @@ public void testSetFieldForPropertyAccessWithRefresh(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
manager = employee.getManager();
@@ -7571,8 +7571,8 @@ public void testSetFieldForPropertyAccessWithRefresh(){
assertTrue("The manager was not persisted.", employee.getManager() != null);
assertTrue("The manager was not correctly persisted.", employee.getManager().getFirstName().equals("Metro"));
- Address initialAddress = em.find(Address.class, new Integer(addressId));
- Employee initialManager = em.find(Employee.class, new Integer(managerId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
+ Employee initialManager = em.find(Employee.class, Integer.valueOf(managerId));
employee.setAddress((Address)null);
employee.setManager((Employee)null);
em.remove(address);
@@ -7614,7 +7614,7 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
employee.getManager();
@@ -7638,7 +7638,7 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
manager = employee.getManager();
@@ -7648,8 +7648,8 @@ public void testSetFieldForPropertyAccessWithNewEM(){
assertTrue("The manager was not persisted.", employee.getManager() != null);
assertTrue("The manager was not correctly persisted.", employee.getManager().getFirstName().equals("Metro"));
- Address initialAddress = em.find(Address.class, new Integer(addressId));
- Employee initialManager = em.find(Employee.class, new Integer(managerId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
+ Employee initialManager = em.find(Employee.class, Integer.valueOf(managerId));
employee.setAddress((Address)null);
employee.setManager((Employee)null);
@@ -8418,7 +8418,7 @@ public void testClosedEmShouldThrowException() {
errorMsg = errorMsg + "; em.getDelegate() threw wrong exception: " + ex.getMessage();
}
try {
- em.getReference(Employee.class, new Integer(1));
+ em.getReference(Employee.class, Integer.valueOf(1));
errorMsg = errorMsg + "; em.getReference() didn't throw exception";
} catch(IllegalStateException ise) {
// expected
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/SQLResultSetMappingTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/SQLResultSetMappingTestSuite.java
index 341e759..2cfc319 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/SQLResultSetMappingTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/SQLResultSetMappingTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -193,7 +193,7 @@ public void testBindParameters() throws Exception {
query.addArgument("1");
Vector params = new Vector();
//4000 is a more reasonable budget given test data if results are expected
- params.add(new Integer(4000));
+ params.add(Integer.valueOf(4000));
List results = (List)getServerSession().executeQuery(query, params);
assertNotNull("No result returned", results);
assertTrue("Empty list returned", (results.size()!=0));
@@ -212,7 +212,7 @@ public void testBindParametersWithPostitional() throws Exception {
query.setShouldBindAllParameters(true);
query.addArgument("1");
Vector params = new Vector();
- params.add(new Integer(4000));
+ params.add(Integer.valueOf(4000));
List results = (List)getServerSession().executeQuery(query, params);
assertNotNull("No result returned", results);
assertTrue("Empty list returned", (results.size()!=0));
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/UpdateAllQueryAdvancedJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/UpdateAllQueryAdvancedJunitTest.java
index 8357c21..0f5b538 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/UpdateAllQueryAdvancedJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/UpdateAllQueryAdvancedJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -134,7 +134,7 @@ public static void testFirstNamePrefixBLAForSalary() {
public static void testDoubleSalaryForAll() {
ExpressionBuilder builder = new ExpressionBuilder();
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class);
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}
@@ -142,7 +142,7 @@ public static void testDoubleSalaryForSalary() {
ExpressionBuilder builder = new ExpressionBuilder();
Expression selectionExpression = builder.get("salary").lessThan(20000);
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class, selectionExpression);
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}
@@ -150,7 +150,7 @@ public static void testFirstNamePrefixBLADoubleSalaryForAll() {
ExpressionBuilder builder = new ExpressionBuilder();
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class);
updateQuery.addUpdate("firstName", Expression.fromLiteral("'BLA'", null).concat(builder.get("firstName")));
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}
@@ -159,7 +159,7 @@ public static void testFirstNamePrefixBLADoubleSalaryForSalary() {
Expression selectionExpression = builder.get("salary").lessThan(20000);
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class, selectionExpression);
updateQuery.addUpdate("firstName", Expression.fromLiteral("'BLA'", null).concat(builder.get("firstName")));
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}
@@ -168,7 +168,7 @@ public static void testFirstNamePrefixBLADoubleSalaryForSalaryForFirstName() {
Expression selectionExpression = builder.get("salary").lessThan(20000).and(builder.get("firstName").like("J%"));
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class, selectionExpression);
updateQuery.addUpdate("firstName", Expression.fromLiteral("'BLA'", null).concat(builder.get("firstName")));
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/compositepk/AdvancedCompositePKJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/compositepk/AdvancedCompositePKJunitTest.java
index f2748c2..9afc7e9 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/compositepk/AdvancedCompositePKJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/compositepk/AdvancedCompositePKJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -1048,8 +1048,8 @@ public void testNestedEmbeddableSequenceGeneration(){
b = (Book) em.merge(b);
a = (Author) em.merge(a);
- assertTrue("The PK value for "+ b.getClass() +" (" + b.getId().getNumberId().getValue() + ") is not sequence generated", (b.getId().getNumberId().getValue() >= new Long(1000)));
- assertTrue("The PK value for "+ a.getClass() +" (" + a.getId().getNumberId().getValue() + ") is not sequence generated", (a.getId().getNumberId().getValue() >= new Long(1000)));
+ assertTrue("The PK value for "+ b.getClass() +" (" + b.getId().getNumberId().getValue() + ") is not sequence generated", (b.getId().getNumberId().getValue() >= Long.valueOf(1000)));
+ assertTrue("The PK value for "+ a.getClass() +" (" + a.getId().getNumberId().getValue() + ") is not sequence generated", (a.getId().getNumberId().getValue() >= Long.valueOf(1000)));
rollbackTransaction(em);
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/concurrency/ConcurrencyTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/concurrency/ConcurrencyTest.java
index a530b53..44f0903 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/concurrency/ConcurrencyTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/concurrency/ConcurrencyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,7 +64,7 @@ public void testDeadLockOnReadLock() {
em.getTransaction().commit();
em.close();
try {
- Integer i = new Integer(5);
+ Integer i = Integer.valueOf(5);
Thread thread1 = new Thread(new Runner1(i, dept.getId(), equip.getId(), emf));
thread1.setName("Runner1");
Thread thread2 = new Thread(new Runner2(i, dept.getId(), equip.getId(), emf));
@@ -107,7 +107,7 @@ public void testTransitionToDeferedFailure() {
if (isOnServer()) {
return;
}
- Integer toWaitOn = new Integer(4);
+ Integer toWaitOn = Integer.valueOf(4);
Thread thread1 = null;
EntityManagerFactory emf = getEntityManagerFactory();
EntityManager em = emf.createEntityManager();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/composite/advanced/EntityManagerJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/composite/advanced/EntityManagerJUnitTestSuite.java
index f4a54f2..7799ff5 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/composite/advanced/EntityManagerJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/composite/advanced/EntityManagerJUnitTestSuite.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2019 IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1364,8 +1364,8 @@ public void testSubString() {
int lastIndex = firstName.length();
List employees = em.createQuery("SELECT object(e) FROM Employee e where e.firstName = substring(:p1, :p2, :p3)").
setParameter("p1", firstName).
- setParameter("p2", new Integer(firstIndex)).
- setParameter("p3", new Integer(lastIndex)).
+ setParameter("p2", Integer.valueOf(firstIndex)).
+ setParameter("p3", Integer.valueOf(lastIndex)).
getResultList();
// clean up
@@ -5250,17 +5250,17 @@ public void testQueryHints() {
assertTrue("FETCH_GROUP not set.", olrQuery.getFetchGroup() == fetchGroup);
// Timeout
- query.setHint(QueryHints.JDBC_TIMEOUT, new Integer(100));
+ query.setHint(QueryHints.JDBC_TIMEOUT, Integer.valueOf(100));
assertTrue("Timeout not set.", olrQuery.getQueryTimeout() == 100);
// JDBC
- query.setHint(QueryHints.JDBC_FETCH_SIZE, new Integer(101));
+ query.setHint(QueryHints.JDBC_FETCH_SIZE, Integer.valueOf(101));
assertTrue("Fetch-size not set.", olrQuery.getFetchSize() == 101);
- query.setHint(QueryHints.JDBC_MAX_ROWS, new Integer(103));
+ query.setHint(QueryHints.JDBC_MAX_ROWS, Integer.valueOf(103));
assertTrue("Max-rows not set.", olrQuery.getMaxRows() == 103);
- query.setHint(QueryHints.JDBC_FIRST_RESULT, new Integer(123));
+ query.setHint(QueryHints.JDBC_FIRST_RESULT, Integer.valueOf(123));
assertTrue("JDBC_FIRST_RESULT not set.", olrQuery.getFirstResult() == 123);
// Refresh
@@ -6606,7 +6606,7 @@ public void testInitializeFieldForPropertyAccess(){
em = createEntityManager();
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
@@ -6648,7 +6648,7 @@ public void testSetFieldForPropertyAccess(){
int managerId = manager.getId();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
address = new Address();
@@ -6672,7 +6672,7 @@ public void testSetFieldForPropertyAccess(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
manager = employee.getManager();
@@ -6682,8 +6682,8 @@ public void testSetFieldForPropertyAccess(){
assertTrue("The manager was not persisted.", employee.getManager() != null);
assertTrue("The manager was not correctly persisted.", employee.getManager().getFirstName().equals("Metro"));
- Address initialAddress = em.find(Address.class, new Integer(addressId));
- Employee initialManager = em.find(Employee.class, new Integer(managerId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
+ Employee initialManager = em.find(Employee.class, Integer.valueOf(managerId));
employee.setAddress((Address)null);
employee.setManager((Employee)null);
em.remove(address);
@@ -6748,7 +6748,7 @@ public void testSetFieldForPropertyAccessWithRefresh(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
manager = employee.getManager();
@@ -6758,8 +6758,8 @@ public void testSetFieldForPropertyAccessWithRefresh(){
assertTrue("The manager was not persisted.", employee.getManager() != null);
assertTrue("The manager was not correctly persisted.", employee.getManager().getFirstName().equals("Metro"));
- Address initialAddress = em.find(Address.class, new Integer(addressId));
- Employee initialManager = em.find(Employee.class, new Integer(managerId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
+ Employee initialManager = em.find(Employee.class, Integer.valueOf(managerId));
employee.setAddress((Address)null);
employee.setManager((Employee)null);
em.remove(address);
@@ -6801,7 +6801,7 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
employee.getManager();
@@ -6825,7 +6825,7 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
manager = employee.getManager();
@@ -6835,8 +6835,8 @@ public void testSetFieldForPropertyAccessWithNewEM(){
assertTrue("The manager was not persisted.", employee.getManager() != null);
assertTrue("The manager was not correctly persisted.", employee.getManager().getFirstName().equals("Metro"));
- Address initialAddress = em.find(Address.class, new Integer(addressId));
- Employee initialManager = em.find(Employee.class, new Integer(managerId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
+ Employee initialManager = em.find(Employee.class, Integer.valueOf(managerId));
employee.setAddress((Address)null);
employee.setManager((Employee)null);
@@ -7280,7 +7280,7 @@ public void testClosedEmShouldThrowException() {
errorMsg = errorMsg + "; em.getDelegate() threw wrong exception: " + ex.getMessage();
}
try {
- em.getReference(Employee.class, new Integer(1));
+ em.getReference(Employee.class, Integer.valueOf(1));
errorMsg = errorMsg + "; em.getReference() didn't throw exception";
} catch(IllegalStateException ise) {
// expected
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/criteria/JUnitCriteriaUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/criteria/JUnitCriteriaUnitTestSuite.java
index 697c61e..e9a87b4 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/criteria/JUnitCriteriaUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/criteria/JUnitCriteriaUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -469,7 +469,7 @@ public void testSelectEmployeeWithSameParameterUsedMultipleTimes() {
//need to cast to erase the type on the get("id") expression so it matches the type on param1
cq.where(qb.or( qb.greaterThan(root.<Integer>get("id" ), param1), param1.isNull()) );
- em.createQuery(cq).setParameter(param1, new Integer(1)).getResultList();
+ em.createQuery(cq).setParameter(param1, Integer.valueOf(1)).getResultList();
} finally {
rollbackTransaction(em);
closeEntityManager(em);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/BooleanJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/BooleanJUnitTestCase.java
index d8379aa..c59a5bc 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/BooleanJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/BooleanJUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,17 +64,17 @@ public void testCreateWrapperTypes() {
beginTransaction(em);
WrapperTypes[] wrapperTypes = new WrapperTypes[4];
wrapperTypes[0] = new WrapperTypes(BigDecimal.ZERO, BigInteger.ZERO, Boolean.FALSE,
- new Byte("0"), 'A', new Short("0"),
- 0, 0L, new Float(0.0), 0.0, "A String");
+ Byte.valueOf("0"), 'A', Short.valueOf("0"),
+ 0, 0L, Float.valueOf(0.0f), 0.0, "A String");
wrapperTypes[1] = new WrapperTypes(BigDecimal.ONE, BigInteger.ONE, Boolean.TRUE,
- new Byte("1"), 'B', new Short("1"),
- 1, 1L, new Float(1.0), 1.0, "B String");
+ Byte.valueOf("1"), 'B', Short.valueOf("1"),
+ 1, 1L, Float.valueOf(1.0f), 1.0, "B String");
wrapperTypes[2] = new WrapperTypes(new BigDecimal(2), new BigInteger("2"), Boolean.FALSE,
- new Byte("2"), 'C', new Short("2"),
- 2, 2L, new Float(2.0), 2.0, "C String");
+ Byte.valueOf("2"), 'C', Short.valueOf("2"),
+ 2, 2L, Float.valueOf(2.0f), 2.0, "C String");
wrapperTypes[3] = new WrapperTypes(new BigDecimal(3), new BigInteger("3"), Boolean.TRUE,
- new Byte("3"), 'D', new Short("3"),
- 3, 3L, new Float(3.0), 3.0, "D String");
+ Byte.valueOf("3"), 'D', Short.valueOf("3"),
+ 3, 3L, Float.valueOf(3.0f), 3.0, "D String");
for (WrapperTypes wrapperType: wrapperTypes) {
em.persist(wrapperType);
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java
index 6c28eea..64a27a2 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -94,8 +94,8 @@ public void testCreateWrapperTypes() {
beginTransaction(em);
wt = new WrapperTypes(BigDecimal.ZERO, BigInteger.ZERO, Boolean.FALSE,
- new Byte("0"), 'A', new Short("0"),
- 0, 0L, new Float(0.0), 0.0, "A String");
+ Byte.valueOf("0"), 'A', Short.valueOf("0"),
+ 0, 0L, Float.valueOf(0.0f), 0.0, "A String");
em.persist(wt);
wrapperId = wt.getId();
commitTransaction(em);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java
index 413b46e..3d35f82 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014 IBM Corporation. All rights reserved.
* Copyright (c) 2010 Frank Schwarz. All rights reserved.
* Copyright (c) 2008 Daryl Davis. All rights reserved.
@@ -1558,14 +1558,14 @@ public void testLAZYLOBWithEmbeddedId() {
beginTransaction(em);
Lobtest lobtest = new Lobtest();
- Byte b1 = new Byte("1");
- Byte b2 = new Byte("2");
+ Byte b1 = Byte.valueOf("1");
+ Byte b2 = Byte.valueOf("2");
lobtest.setContentdata(new byte[]{b1, b2});
lobtest.setUuid("123456789");
pk.setDocid("blah");
- pk.setVersionid(new BigInteger(new Long(System.currentTimeMillis()).toString()));
+ pk.setVersionid(new BigInteger(Long.valueOf(System.currentTimeMillis()).toString()));
lobtest.setLobtestPK(pk);
em.persist(lobtest);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java
index 161f778..cb5340d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -120,7 +120,7 @@ public void find() {
EntityManager em = emf.createEntityManager();
DynamicEntity simpleInstance = find(em, 1);
assertNotNull("Could not find simple instance with id = 1", simpleInstance);
- simpleInstance = find(em, new Integer(1));
+ simpleInstance = find(em, Integer.valueOf(1));
assertNotNull("Could not find simple instance with id = Integer(1)", simpleInstance);
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java
index 906cc5a..7cb9b12 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -718,8 +718,8 @@ public void testSubString() {
int lastIndex = firstName.length();
List employees = em.createQuery("SELECT object(e) FROM Employee e where e.firstName = substring(:p1, :p2, :p3)").
setParameter("p1", firstName).
- setParameter("p2", new Integer(firstIndex)).
- setParameter("p3", new Integer(lastIndex)).
+ setParameter("p2", Integer.valueOf(firstIndex)).
+ setParameter("p3", Integer.valueOf(lastIndex)).
getResultList();
// clean up
@@ -2561,12 +2561,12 @@ public void testQueryHints() {
query.setHint(QueryHints.READ_ONLY, Boolean.FALSE);
assertFalse("Read-only not set.", olrQuery.isReadOnly());
- query.setHint(QueryHints.JDBC_TIMEOUT, new Integer(100));
+ query.setHint(QueryHints.JDBC_TIMEOUT, Integer.valueOf(100));
assertTrue("Timeout not set.", olrQuery.getQueryTimeout() == 100);
- query.setHint(QueryHints.JDBC_FETCH_SIZE, new Integer(101));
+ query.setHint(QueryHints.JDBC_FETCH_SIZE, Integer.valueOf(101));
assertTrue("Fetch-size not set.", olrQuery.getFetchSize() == 101);
- query.setHint(QueryHints.JDBC_MAX_ROWS, new Integer(103));
+ query.setHint(QueryHints.JDBC_MAX_ROWS, Integer.valueOf(103));
assertTrue("Max-rows not set.", olrQuery.getMaxRows() == 103);
query.setHint(QueryHints.REFRESH_CASCADE, CascadePolicy.NoCascading);
assertTrue(olrQuery.getCascadePolicy()==DatabaseQuery.NoCascading);
@@ -3503,7 +3503,7 @@ public void testInitializeFieldForPropertyAccess() {
em = createEntityManager();
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
@@ -3540,7 +3540,7 @@ public void testSetFieldForPropertyAccess() {
int addressId = address.getId();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
address = new Address();
@@ -3560,13 +3560,13 @@ public void testSetFieldForPropertyAccess() {
em = createEntityManager();
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
assertTrue("The address was not correctly persisted.", employee.getAddress().getCity().equals("Metropolis"));
} finally {
- Address initialAddress = em.find(Address.class, new Integer(addressId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
employee.setAddress(null);
employee.setManager((Employee)null);
em.remove(address);
@@ -3621,13 +3621,13 @@ public void testSetFieldForPropertyAccessWithRefresh() {
em = createEntityManager();
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
assertTrue("The address was not correctly persisted.", employee.getAddress().getCity().equals("Metropolis"));
} finally {
- Address initialAddress = em.find(Address.class, new Integer(addressId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
employee.setAddress(null);
employee.setManager((Employee)null);
em.remove(address);
@@ -3663,7 +3663,7 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
address = new Address();
@@ -3683,14 +3683,14 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager();
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
assertTrue("The address was not correctly persisted.", employee.getAddress().getCity().equals("Metropolis"));
} finally {
- Address initialAddress = em.find(Address.class, new Integer(addressId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
employee.setAddress(null);
employee.setManager((Employee)null);
em.remove(address);
@@ -4415,7 +4415,7 @@ public void testClosedEmShouldThrowException() {
errorMsg = errorMsg + "; em.getDelegate() threw wrong exception: " + ex.getMessage();
}
try {
- em.getReference(Employee.class, new Integer(1));
+ em.getReference(Employee.class, Integer.valueOf(1));
errorMsg = errorMsg + "; em.getReference() didn't throw exception";
} catch(IllegalStateException ise) {
// expected
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java
index e6cccff..eb17aba 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -598,8 +598,8 @@ public void testSubString() {
int lastIndex = firstName.length();
List employees = em.createQuery("SELECT object(e) FROM Employee e where e.firstName = substring(:p1, :p2, :p3)").
setParameter("p1", firstName).
- setParameter("p2", new Integer(firstIndex)).
- setParameter("p3", new Integer(lastIndex)).
+ setParameter("p2", Integer.valueOf(firstIndex)).
+ setParameter("p3", Integer.valueOf(lastIndex)).
getResultList();
// clean up
@@ -2421,12 +2421,12 @@ public void testQueryHints() {
query.setHint(QueryHints.READ_ONLY, Boolean.FALSE);
assertFalse("Read-only not set.", olrQuery.isReadOnly());
- query.setHint(QueryHints.JDBC_TIMEOUT, new Integer(100));
+ query.setHint(QueryHints.JDBC_TIMEOUT, Integer.valueOf(100));
assertTrue("Timeout not set.", olrQuery.getQueryTimeout() == 100);
- query.setHint(QueryHints.JDBC_FETCH_SIZE, new Integer(101));
+ query.setHint(QueryHints.JDBC_FETCH_SIZE, Integer.valueOf(101));
assertTrue("Fetch-size not set.", olrQuery.getFetchSize() == 101);
- query.setHint(QueryHints.JDBC_MAX_ROWS, new Integer(103));
+ query.setHint(QueryHints.JDBC_MAX_ROWS, Integer.valueOf(103));
assertTrue("Max-rows not set.", olrQuery.getMaxRows() == 103);
query.setHint(QueryHints.REFRESH_CASCADE, CascadePolicy.NoCascading);
assertTrue(olrQuery.getCascadePolicy()==DatabaseQuery.NoCascading);
@@ -3355,7 +3355,7 @@ public void testInitializeFieldForPropertyAccess() {
em = createEntityManager("fieldaccess");
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
@@ -3392,7 +3392,7 @@ public void testSetFieldForPropertyAccess() {
int addressId = address.getId();
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
address = new Address();
@@ -3412,13 +3412,13 @@ public void testSetFieldForPropertyAccess() {
em = createEntityManager("fieldaccess");
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
assertTrue("The address was not correctly persisted.", employee.getAddress().getCity().equals("Metropolis"));
} finally {
- Address initialAddress = em.find(Address.class, new Integer(addressId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
employee.setAddress(null);
employee.setManager((Employee)null);
em.remove(address);
@@ -3473,13 +3473,13 @@ public void testSetFieldForPropertyAccessWithRefresh() {
em = createEntityManager("fieldaccess");
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
assertTrue("The address was not correctly persisted.", employee.getAddress().getCity().equals("Metropolis"));
} finally {
- Address initialAddress = em.find(Address.class, new Integer(addressId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
employee.setAddress(null);
employee.setManager((Employee)null);
em.remove(address);
@@ -3515,7 +3515,7 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager("fieldaccess");
beginTransaction(em);
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
employee.getAddress();
address = new Address();
@@ -3535,14 +3535,14 @@ public void testSetFieldForPropertyAccessWithNewEM(){
em = createEntityManager("fieldaccess");
beginTransaction(em);
try {
- employee = em.find(Employee.class, new Integer(id));
+ employee = em.find(Employee.class, Integer.valueOf(id));
address = employee.getAddress();
assertTrue("The address was not persisted.", employee.getAddress() != null);
assertTrue("The address was not correctly persisted.", employee.getAddress().getCity().equals("Metropolis"));
} finally {
- Address initialAddress = em.find(Address.class, new Integer(addressId));
+ Address initialAddress = em.find(Address.class, Integer.valueOf(addressId));
employee.setAddress(null);
employee.setManager((Employee)null);
em.remove(address);
@@ -4213,7 +4213,7 @@ public void testClosedEmShouldThrowException() {
errorMsg = errorMsg + "; em.getDelegate() threw wrong exception: " + ex.getMessage();
}
try {
- em.getReference(Employee.class, new Integer(1));
+ em.getReference(Employee.class, Integer.valueOf(1));
errorMsg = errorMsg + "; em.getReference() didn't throw exception";
} catch(IllegalStateException ise) {
// expected
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/SQLResultSetMappingTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/SQLResultSetMappingTestSuite.java
index e84dcac..1b1cbd0 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/SQLResultSetMappingTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/SQLResultSetMappingTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -203,7 +203,7 @@ public void testBindParameters() throws Exception {
query.addArgument("1");
Vector params = new Vector();
//4000 is a more reasonable budget given test data if results are expected
- params.add(new Integer(4000));
+ params.add(Integer.valueOf(4000));
List results = (List)getServerSession("fieldaccess").executeQuery(query, params);
assertNotNull("No result returned", results);
assertTrue("Empty list returned", (results.size()!=0));
@@ -222,7 +222,7 @@ public void testBindParametersWithPostitional() throws Exception {
query.setShouldBindAllParameters(true);
query.addArgument("1");
Vector params = new Vector();
- params.add(new Integer(4000));
+ params.add(Integer.valueOf(4000));
List results = (List)getServerSession("fieldaccess").executeQuery(query, params);
assertNotNull("No result returned", results);
assertTrue("Empty list returned", (results.size()!=0));
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/UpdateAllQueryAdvancedJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/UpdateAllQueryAdvancedJunitTest.java
index febcfde..1dd6e00 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/UpdateAllQueryAdvancedJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/UpdateAllQueryAdvancedJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -196,7 +196,7 @@ public void testDoubleSalaryForAll() {
try{
ExpressionBuilder builder = new ExpressionBuilder();
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class);
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}finally{
if (isTransactionActive(em)){
@@ -218,7 +218,7 @@ public void testDoubleSalaryForSalary() {
ExpressionBuilder builder = new ExpressionBuilder();
Expression selectionExpression = builder.get("salary").lessThan(20000);
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class, selectionExpression);
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}finally{
if (isTransactionActive(em)){
@@ -240,7 +240,7 @@ public void testFirstNamePrefixBLADoubleSalaryForAll() {
ExpressionBuilder builder = new ExpressionBuilder();
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class);
updateQuery.addUpdate("firstName", Expression.fromLiteral("'BLA'", null).concat(builder.get("firstName")));
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}finally{
if (isTransactionActive(em)){
@@ -263,7 +263,7 @@ public void testFirstNamePrefixBLADoubleSalaryForSalary() {
Expression selectionExpression = builder.get("salary").lessThan(20000);
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class, selectionExpression);
updateQuery.addUpdate("firstName", Expression.fromLiteral("'BLA'", null).concat(builder.get("firstName")));
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}finally{
if (isTransactionActive(em)){
@@ -286,7 +286,7 @@ public void testFirstNamePrefixBLADoubleSalaryForSalaryForFirstName() {
Expression selectionExpression = builder.get("salary").lessThan(20000).and(builder.get("firstName").like("J%"));
UpdateAllQuery updateQuery = new UpdateAllQuery(Employee.class, selectionExpression);
updateQuery.addUpdate("firstName", Expression.fromLiteral("'BLA'", null).concat(builder.get("firstName")));
- updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), new Integer(2)));
+ updateQuery.addUpdate("salary", ExpressionMath.multiply(builder.get("salary"), Integer.valueOf(2)));
updateAllQueryInternal(updateQuery);
}finally{
if (isTransactionActive(em)){
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/ExpressionJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/ExpressionJUnitTestSuite.java
index 8e56868..31ba271 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/ExpressionJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/ExpressionJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -458,7 +458,7 @@ public void testLocateWithSingleArgument() throws Exception {
beginTransaction(em);
try {
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("name").locate("t").equal(new Integer(2));
+ Expression expression = builder.get("name").locate("t").equal(Integer.valueOf(2));
ReadAllQuery query = new ReadAllQuery();
query.setReferenceClass(Item.class);
@@ -518,7 +518,7 @@ public void testLocateWithDoubleArgument() throws Exception {
beginTransaction(em);
try {
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("name").locate("i", 2).equal(new Integer(5));
+ Expression expression = builder.get("name").locate("i", 2).equal(Integer.valueOf(5));
ReadAllQuery query = new ReadAllQuery();
query.setReferenceClass(Item.class);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/RelationshipModelJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/RelationshipModelJUnitTestSuite.java
index 2622744..b598e6d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/RelationshipModelJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fieldaccess/relationships/RelationshipModelJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -211,7 +211,7 @@ public void testGetResultCollectionTest() {
returnedCustomers1 = query1.getResultCollection();
EJBQueryImpl query2 = (EJBQueryImpl) entityManagerImpl.createQuery(ejbql1);
- query2.setParameter("id", new Integer(-10));
+ query2.setParameter("id", Integer.valueOf(-10));
returnedCustomers2 = query2.getResultCollection();
// bug:4297903, check container policy failure
@@ -233,7 +233,7 @@ public void testGetResultCollectionTest() {
entityManagerImpl = (EntityManagerImpl) em.getDelegate();
// bug:4300879, check ReadObjectQuery fails
EJBQueryImpl query4 = (EJBQueryImpl) entityManagerImpl.createQuery(ejbql1);
- query4.setParameter("id", new Integer(-10));
+ query4.setParameter("id", Integer.valueOf(-10));
ReadObjectQuery readObjectQuery2 = new ReadObjectQuery(Customer.class);
readObjectQuery2.setEJBQLString(ejbql1);
query4.setDatabaseQuery(readObjectQuery2);
@@ -293,7 +293,7 @@ public void testGetResultListTest() {
returnedCustomers1 = query1.getResultList();
Query query2 = em.createQuery(ejbql1);
- query2.setParameter("id", new Integer(-10));
+ query2.setParameter("id", Integer.valueOf(-10));
returnedCustomers2 = query2.getResultList();
// bug:4297903, check container policy failure
@@ -315,7 +315,7 @@ public void testGetResultListTest() {
entityManagerImpl = (EntityManagerImpl) em.getDelegate();
// bug:4300879, check ReadObjectQuery fails
EJBQueryImpl query4 = (EJBQueryImpl) entityManagerImpl.createQuery(ejbql1);
- query4.setParameter("id", new Integer(-10));
+ query4.setParameter("id", Integer.valueOf(-10));
ReadObjectQuery readObjectQuery2 = new ReadObjectQuery(Customer.class);
readObjectQuery2.setEJBQLString(ejbql1);
query4.setDatabaseQuery(readObjectQuery2);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/LifecycleCallbackJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/LifecycleCallbackJunitTest.java
index 3643da7..245ecb5 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/LifecycleCallbackJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/LifecycleCallbackJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -157,8 +157,8 @@ public void testPostPersistBusInheritAndDefault() {
try {
Bus bus = new Bus();
- bus.setPassengerCapacity(new Integer(50));
- bus.setFuelCapacity(new Integer(175));
+ bus.setPassengerCapacity(Integer.valueOf(50));
+ bus.setFuelCapacity(Integer.valueOf(175));
bus.setDescription("OC Transpo Bus");
bus.setFuelType("Diesel");
em.persist(bus);
@@ -203,8 +203,8 @@ public void testPostPersistSportsCarInheritAndExcludeDefault() {
try {
SportsCar sportsCar = new SportsCar();
- sportsCar.setPassengerCapacity(new Integer(4));
- sportsCar.setFuelCapacity(new Integer(55));
+ sportsCar.setPassengerCapacity(Integer.valueOf(4));
+ sportsCar.setFuelCapacity(Integer.valueOf(55));
sportsCar.setDescription("Porshe");
sportsCar.setFuelType("Gas");
em.persist(sportsCar);
@@ -238,8 +238,8 @@ public void testPrePersistBusOverrideAndAbstractInheritAndDefault() {
try {
Bus bus = new Bus();
- bus.setPassengerCapacity(new Integer(30));
- bus.setFuelCapacity(new Integer(100));
+ bus.setPassengerCapacity(Integer.valueOf(30));
+ bus.setFuelCapacity(Integer.valueOf(100));
bus.setDescription("School Bus");
bus.setFuelType("Diesel");
em.persist(bus);
@@ -281,8 +281,8 @@ public void testPrePersistSportsCarInheritAndExcludeDefault() {
try {
SportsCar sportsCar = new SportsCar();
- sportsCar.setPassengerCapacity(new Integer(2));
- sportsCar.setFuelCapacity(new Integer(60));
+ sportsCar.setPassengerCapacity(Integer.valueOf(2));
+ sportsCar.setFuelCapacity(Integer.valueOf(60));
sportsCar.setDescription("Corvette");
sportsCar.setFuelType("Gas");
em.persist(sportsCar);
@@ -314,8 +314,8 @@ public void testPrePersistSportsCarOverride() {
try {
SportsCar sportsCar = new SportsCar();
- sportsCar.setPassengerCapacity(new Integer(2));
- sportsCar.setFuelCapacity(new Integer(90));
+ sportsCar.setPassengerCapacity(Integer.valueOf(2));
+ sportsCar.setFuelCapacity(Integer.valueOf(90));
sportsCar.setDescription("Viper");
sportsCar.setFuelType("Gas");
em.persist(sportsCar);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MixedInheritanceJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MixedInheritanceJUnitTestCase.java
index 7636f27..1d0588d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MixedInheritanceJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MixedInheritanceJUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -148,7 +148,7 @@ public void testCreateNewMudTire() {
MudTireInfo mudTire = new MudTireInfo();
mudTire.setName("Goodyear Mud Tracks");
mudTire.setCode("MT-674-A4");
- mudTire.setPressure(new Integer(100));
+ mudTire.setPressure(Integer.valueOf(100));
mudTire.setTreadDepth(3);
TireRating tireRating = new TireRating();
@@ -180,7 +180,7 @@ public void testCreateNewRockTire() {
RockTireInfo rockTire = new RockTireInfo();
rockTire.setName("Goodyear Mud Tracks");
rockTire.setCode("AE-678");
- rockTire.setPressure(new Integer(100));
+ rockTire.setPressure(Integer.valueOf(100));
rockTire.setGrip(RockTireInfo.Grip.SUPER);
try {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MultipleTableInheritanceCreateTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MultipleTableInheritanceCreateTest.java
index 4a4cb07..0e47fb2 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MultipleTableInheritanceCreateTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/MultipleTableInheritanceCreateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,8 +48,8 @@ public void test() throws Exception {
Bus bus = new Bus();
bus.setBusDriver(busDriver);
- bus.setFuelCapacity(new Integer(275));
- bus.setPassengerCapacity(new Integer(100));
+ bus.setFuelCapacity(Integer.valueOf(275));
+ bus.setPassengerCapacity(Integer.valueOf(100));
beginTransaction();
getEntityManager().persist(bus);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/TablePerClassInheritanceJUnitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/TablePerClassInheritanceJUnitTest.java
index e1065d9..9c01286 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/TablePerClassInheritanceJUnitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inheritance/TablePerClassInheritanceJUnitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -118,7 +118,7 @@ public void testCreateAssassinWithGun() {
assassin.getNicknames().add("Clyde");
Gun gun = new Gun();
- gun.setCaliber(new Integer(50));
+ gun.setCaliber(Integer.valueOf(50));
gun.setDescription("Sniper rifle");
gun.setModel("9-112");
@@ -175,7 +175,7 @@ public void testAddDirectElimination() {
// Assassin already has a gun, therefore, correct weapon already set
// for a direct elimination.
directElimination = new DirectElimination();
- directElimination.setId(new Long(System.currentTimeMillis()).intValue());
+ directElimination.setId(Long.valueOf(System.currentTimeMillis()).intValue());
directElimination.setName("Joe Smuck");
directElimination.setDescription("Because he has a big mouth");
directElimination.setAssassin(assassin);
@@ -226,7 +226,7 @@ public void testAddIndirectElimination() {
assassin.setWeapon(bomb);
indirectElimination = new IndirectElimination();
- indirectElimination.setId(new Long(System.currentTimeMillis()).intValue());
+ indirectElimination.setId(Long.valueOf(System.currentTimeMillis()).intValue());
indirectElimination.setName("Jill Smuck");
indirectElimination.setDescription("Because she has a big mouth");
indirectElimination.setAssassin(assassin);
@@ -637,8 +637,8 @@ public void testGunOptimisticLocking() {
Gun gun1 = em1.find(Gun.class, gunSerialNumber);
Gun gun2 = em2.find(Gun.class, gunSerialNumber);
- gun1.setCaliber(new Integer(12));
- gun2.setCaliber(new Integer(22));
+ gun1.setCaliber(Integer.valueOf(12));
+ gun2.setCaliber(Integer.valueOf(22));
em1.getTransaction().commit();
em2.getTransaction().commit();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inherited/InheritedModelJunitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inherited/InheritedModelJunitTest.java
index 7d9e4ad..41c98db 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inherited/InheritedModelJunitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/inherited/InheritedModelJunitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -337,7 +337,7 @@ public void testCreateBlue() {
try {
Blue blue = new Blue();
- blue.setAlcoholContent(new Float(5.3));
+ blue.setAlcoholContent(Float.valueOf(5.3f));
em.persist(blue);
m_blueId = blue.getId();
blue.setUniqueKey(m_blueId.toBigInteger());
@@ -1109,8 +1109,8 @@ public void testInheritedClone() {
consumer.setName("Keith Alexander");
BlueLight blueLight = new BlueLight();
- blueLight.setAlcoholContent(new Float(4.0));
- blueLight.setUniqueKey(new BigInteger((new Long(System.currentTimeMillis()).toString())));
+ blueLight.setAlcoholContent(Float.valueOf(4.0f));
+ blueLight.setUniqueKey(new BigInteger((Long.valueOf(System.currentTimeMillis()).toString())));
em.persist(blueLight);
consumer.addBlueLightBeerToConsume(blueLight);
clone.setBeerConsumer(consumer);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/AdvancedQueryTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/AdvancedQueryTestSuite.java
index d89b1e6..87e95f7 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/AdvancedQueryTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/AdvancedQueryTestSuite.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2019 IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -594,12 +594,12 @@ public void testNativeResultType() {
query.setParameter(1, employee.getId());
query.setParameter(2, employee.getFirstName());
arrayResult = (Object[])query.getSingleResult();
- if ((arrayResult.length != 1) || (!new Integer(((Number)arrayResult[0]).intValue()).equals(employee.getId()))) {
+ if ((arrayResult.length != 1) || (!Integer.valueOf(((Number)arrayResult[0]).intValue()).equals(employee.getId()))) {
fail("Array result not correct: " + arrayResult);
}
listResult = query.getResultList();
arrayResult = (Object[])listResult.get(0);
- if ((arrayResult.length != 1) || (!new Integer(((Number)arrayResult[0]).intValue()).equals(employee.getId()))) {
+ if ((arrayResult.length != 1) || (!Integer.valueOf(((Number)arrayResult[0]).intValue()).equals(employee.getId()))) {
fail("Array result not correct: " + arrayResult);
}
@@ -609,12 +609,12 @@ public void testNativeResultType() {
query.setParameter(1, employee.getId());
query.setParameter(2, employee.getFirstName());
Map mapResult = (Map)query.getSingleResult();
- if ((mapResult.size() != 2) || (!mapResult.get("F_NAME").equals(employee.getFirstName())) || (!(new Integer(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
+ if ((mapResult.size() != 2) || (!mapResult.get("F_NAME").equals(employee.getFirstName())) || (!(Integer.valueOf(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
fail("Map result not correct: " + mapResult);
}
listResult = query.getResultList();
mapResult = (Map)listResult.get(0);
- if ((mapResult.size() != 2) || (!mapResult.get("F_NAME").equals(employee.getFirstName())) || (!(new Integer(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
+ if ((mapResult.size() != 2) || (!mapResult.get("F_NAME").equals(employee.getFirstName())) || (!(Integer.valueOf(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
fail("Map result not correct: " + mapResult);
}
@@ -624,12 +624,12 @@ public void testNativeResultType() {
query.setParameter(1, employee.getId());
query.setParameter(2, employee.getFirstName());
mapResult = (Map)query.getSingleResult();
- if ((mapResult.size() != 1) || (!(new Integer(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
+ if ((mapResult.size() != 1) || (!(Integer.valueOf(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
fail("Map result not correct: " + mapResult);
}
listResult = query.getResultList();
mapResult = (Map)listResult.get(0);
- if ((mapResult.size() != 1) || (!(new Integer(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
+ if ((mapResult.size() != 1) || (!(Integer.valueOf(((Number)mapResult.get("EMP_ID")).intValue())).equals(employee.getId()))) {
fail("Map result not correct: " + mapResult);
}
@@ -638,12 +638,12 @@ public void testNativeResultType() {
query.setParameter(1, employee.getId());
query.setParameter(2, employee.getFirstName());
Object valueResult = query.getSingleResult();
- if (!(new Integer(((Number)valueResult).intValue())).equals(employee.getId())) {
+ if (!(Integer.valueOf(((Number)valueResult).intValue())).equals(employee.getId())) {
fail("Value result not correct: " + valueResult);
}
listResult = query.getResultList();
valueResult = listResult.get(0);
- if (!(new Integer(((Number)valueResult).intValue())).equals(employee.getId())) {
+ if (!(Integer.valueOf(((Number)valueResult).intValue())).equals(employee.getId())) {
fail("Value result not correct: " + valueResult);
}
} finally {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLComplexTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLComplexTestSuite.java
index e186c7c..c7cdd4f 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLComplexTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLComplexTestSuite.java
@@ -785,8 +785,8 @@ public void complexReverseSqrtTest()
Employee emp1 = (Employee) expectedResult.elementAt(0);
Employee emp2 = (Employee) expectedResult.elementAt(1);
- double salarySquareRoot1 = Math.sqrt((new Double(emp1.getSalary()).doubleValue()));
- double salarySquareRoot2 = Math.sqrt((new Double(emp2.getSalary()).doubleValue()));
+ double salarySquareRoot1 = Math.sqrt((Double.valueOf(emp1.getSalary()).doubleValue()));
+ double salarySquareRoot2 = Math.sqrt((Double.valueOf(emp2.getSalary()).doubleValue()));
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
ejbqlString = ejbqlString + salarySquareRoot1;
@@ -824,8 +824,8 @@ public void complexSqrtTest()
Employee emp1 = (Employee) expectedResult.elementAt(0);
Employee emp2 = (Employee) expectedResult.elementAt(1);
- double salarySquareRoot1 = Math.sqrt((new Double(emp1.getSalary()).doubleValue()));
- double salarySquareRoot2 = Math.sqrt((new Double(emp2.getSalary()).doubleValue()));
+ double salarySquareRoot1 = Math.sqrt((Double.valueOf(emp1.getSalary()).doubleValue()));
+ double salarySquareRoot2 = Math.sqrt((Double.valueOf(emp2.getSalary()).doubleValue()));
String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE ";
ejbqlString = ejbqlString + "(SQRT(emp.salary) = ";
@@ -1387,7 +1387,7 @@ public void complexConstructorAggregatesTest()
sum += e.getSalary();
}
}
- LongHolder expectedResult = new LongHolder(new Long(sum), new Long(count));
+ LongHolder expectedResult = new LongHolder(Long.valueOf(sum), Long.valueOf(count));
Assert.assertTrue("Constructor with aggregates argument Test Case Failed", result.equals(expectedResult));
}
@@ -1404,7 +1404,7 @@ public void complexConstructorCountOnJoinedVariableTest()
Collection managed = e.getManagedEmployees();
if ((managed != null) && (managed.size() > 0)) {
EmployeeDetail d = new EmployeeDetail(
- e.getFirstName(), e.getLastName(), new Long(managed.size()));
+ e.getFirstName(), e.getLastName(), Long.valueOf(managed.size()));
expectedResult.add(d);
}
}
@@ -2722,8 +2722,8 @@ public void complexIndexOfInSelectClauseTest(){
em.persist(consumer);
em.flush();
List expectedResult = new ArrayList();
- expectedResult.add(new Integer(0));
- expectedResult.add(new Integer(1));
+ expectedResult.add(Integer.valueOf(0));
+ expectedResult.add(Integer.valueOf(1));
clearCache();
String ejbqlString = "select index(d) from EXPERT_CONSUMER e join e.designations d";
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLExamplesTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLExamplesTestSuite.java
index 9480be2..5630fa7 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLExamplesTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLExamplesTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -448,7 +448,7 @@ public void testExistsExpression() {
subQuery.setReferenceClass(Employee.class);
Expression managerExpression = employeeBuilder.get("manager").get("id").equal(managerBuilder.get("id"));
- subQuery.addAttribute("one", new ConstantExpression(new Integer(1), subQuery.getExpressionBuilder()));
+ subQuery.addAttribute("one", new ConstantExpression(Integer.valueOf(1), subQuery.getExpressionBuilder()));
subQuery.setSelectionCriteria(managerExpression);
Expression employeeExpression = employeeBuilder.exists(subQuery);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLSimpleTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLSimpleTestSuite.java
index e088eca..c3185c4 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLSimpleTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLSimpleTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1014,10 +1014,10 @@ public void simpleLikeEscapeTestWithParameter() {
// \ is always treated as escape in MySQL. Therefore ESCAPE '\' is considered a syntax error
if (getServerSession().getPlatform().isMySQL()) {
patternString = "234 RUBY $_Way";
- escChar = new Character('$');
+ escChar = Character.valueOf('$');
} else {
patternString = "234 RUBY \\_Way";
- escChar = new Character('\\');
+ escChar = Character.valueOf('\\');
}
List result = em.createQuery(ejbqlString).setParameter("pattern", patternString).setParameter("esc", escChar).getResultList();
@@ -1588,11 +1588,11 @@ public void conformResultsInUnitOfWorkTest() {
serverSession.login();
UnitOfWork unitOfWork = serverSession.acquireUnitOfWork();
Employee newEmployee = new Employee();
- newEmployee.setId(new Integer(9000));
+ newEmployee.setId(Integer.valueOf(9000));
unitOfWork.registerObject(newEmployee);
Vector testV = new Vector();
- testV.addElement(new Integer(9000));
+ testV.addElement(Integer.valueOf(9000));
Employee result = (Employee)unitOfWork.executeQuery(readObjectQuery, testV);
@@ -2149,7 +2149,7 @@ public void selectUsingLockModeQueryHintTest() {
try {
jakarta.persistence.Query query = em.createNamedQuery("findEmployeeByPK");
query.setParameter("id", emp1.getId());
- query.setHint("lockMode", new Short((short)1));
+ query.setHint("lockMode", Short.valueOf((short)1));
emp2 = (Employee)query.getSingleResult();
} catch (Exception e) {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLUnitTestSuite.java
index 385f78b..baddf10 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -373,7 +373,7 @@ public void testSelectEmployeeWithSameParameterUsedMultipleTimes() {
try {
String ejbqlString = "SELECT emp FROM Employee emp WHERE emp.id > :param1 OR :param1 IS null";
- createEntityManager().createQuery(ejbqlString).setParameter("param1", new Integer(1)).getResultList();
+ createEntityManager().createQuery(ejbqlString).setParameter("param1", Integer.valueOf(1)).getResultList();
} catch (Exception e) {
exception = e;
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java
index 6c53b68..9058545 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java
@@ -646,7 +646,7 @@ public void testParameterTypeValidation() {
Query query = em.createQuery("Select e from Employee e where e.firstName = :fname AND e.lastName = :lname ");
try {
query.setParameter("fname", "foo");
- query.setParameter("lname", new Integer(1));
+ query.setParameter("lname", Integer.valueOf(1));
query.getResultList();
} catch (IllegalArgumentException ex) {
assertTrue("Failed to throw expected IllegalArgumentException, when parameter with incorrect type is used", ex.getMessage().contains("attempted to set a value of type"));
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAPerformanceRegressionModel.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAPerformanceRegressionModel.java
index bc4e565..0ae7e01 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAPerformanceRegressionModel.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/JPAPerformanceRegressionModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -315,7 +315,7 @@ public void test() throws Exception {
manager.close();
}
manager = createEntityManager();
- address = manager.find(Address.class, new Long(address.getId()));
+ address = manager.find(Address.class, Long.valueOf(address.getId()));
if (address.getStreet().equals("Hastings")) {
throwError("Change tracking detected the change (not used?).");
} else {
@@ -343,7 +343,7 @@ public void test() throws Exception {
manager.close();
}
manager = createEntityManager();
- address = manager.find(Address.class, new Long(address.getId()));
+ address = manager.find(Address.class, Long.valueOf(address.getId()));
if (address.getStreet().equals("Hastings")) {
throwError("Change tracking detected the change (not used?).");
} else {
@@ -373,7 +373,7 @@ public void test() throws Exception {
manager.close();
}
manager = createEntityManager();
- employee = manager.getReference(Employee.class, new Long(employee.getId()));
+ employee = manager.getReference(Employee.class, Long.valueOf(employee.getId()));
if (employee.getLastName().equals("Hastings")) {
throwError("Change tracking detected the change (not used?).");
} else {
@@ -402,7 +402,7 @@ public void test() throws Exception {
manager.close();
}
manager = createEntityManager();
- employee = manager.getReference(Employee.class, new Long(employee.getId()));
+ employee = manager.getReference(Employee.class, Long.valueOf(employee.getId()));
manager.refresh(employee);
if (employee.getPeriod().getStartDate().getDate() == 7) {
throwError("Change tracking detected the change (not used?).");
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPA2ReadObjectCompletelyEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPA2ReadObjectCompletelyEmployeePerformanceComparisonTest.java
index bdb014b..fd40503 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPA2ReadObjectCompletelyEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPA2ReadObjectCompletelyEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ Employee employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
employee.getAddress().toString();
String.valueOf(employee.getManager());
employee.getManagedEmployees().size();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyJoinedPerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyJoinedPerformanceComparisonTest.java
index 8cd9cec..0a2d8fa 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyJoinedPerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyJoinedPerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,9 @@ public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
Query query = manager.createQuery("Select e from Employee e join fetch e.address left join fetch e.phoneNumbers");
- query.setHint("org.hibernate.readOnly", new Boolean(isReadOnly()));
- query.setHint("eclipselink.read-only", new Boolean(isReadOnly()));
- query.setHint("toplink.return-shared", new Boolean(isReadOnly()));
+ query.setHint("org.hibernate.readOnly", Boolean.valueOf(isReadOnly()));
+ query.setHint("eclipselink.read-only", Boolean.valueOf(isReadOnly()));
+ query.setHint("toplink.return-shared", Boolean.valueOf(isReadOnly()));
List result = query.getResultList();
for (Iterator iterator = result.iterator(); iterator.hasNext();) {
Employee employee = (Employee)iterator.next();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyPerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyPerformanceComparisonTest.java
index be35d72..fc87827 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyPerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadAllEmployeeCompletelyPerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,9 @@ public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
Query query = manager.createQuery("Select e from Employee e");
- query.setHint("org.hibernate.readOnly", new Boolean(isReadOnly()));
- query.setHint("eclipselink.read-only", new Boolean(isReadOnly()));
- query.setHint("toplink.return-shared", new Boolean(isReadOnly()));
+ query.setHint("org.hibernate.readOnly", Boolean.valueOf(isReadOnly()));
+ query.setHint("eclipselink.read-only", Boolean.valueOf(isReadOnly()));
+ query.setHint("toplink.return-shared", Boolean.valueOf(isReadOnly()));
List result = query.getResultList();
for (Iterator iterator = result.iterator(); iterator.hasNext();) {
Employee employee = (Employee)iterator.next();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectAddressPerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectAddressPerformanceComparisonTest.java
index 6568090..5688dc6 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectAddressPerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectAddressPerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,7 +50,7 @@ public void test() throws Exception {
Query query = manager.createQuery("Select a from Address a where a.id = :id");
query.setHint(QueryHints.QUERY_TYPE, QueryType.ReadObject);
query.setHint(QueryHints.CACHE_USAGE, CacheUsage.CheckCacheByExactPrimaryKey);
- query.setParameter("id", new Long(this.addressId));
+ query.setParameter("id", Long.valueOf(this.addressId));
Address address = (Address)query.getSingleResult();
address.toString();
manager.getTransaction().commit();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectCompletelyEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectCompletelyEmployeePerformanceComparisonTest.java
index 872bb5f..b881aa2 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectCompletelyEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectCompletelyEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ Employee employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
employee.getAddress().toString();
String.valueOf(employee.getManager());
employee.getManagedEmployees().size();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectEmployeePerformanceComparisonTest.java
index 9b41c64..f65bfdc 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ Employee employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
employee.toString();
manager.getTransaction().commit();
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectGetAddressPerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectGetAddressPerformanceComparisonTest.java
index 409cca0..93d9db8 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectGetAddressPerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/reading/JPAReadObjectGetAddressPerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Address address = manager.getReference(Address.class, new Long(this.addressId));
+ Address address = manager.getReference(Address.class, Long.valueOf(this.addressId));
address.getId();
manager.getTransaction().commit();
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2ComplexUpdateEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2ComplexUpdateEmployeePerformanceComparisonTest.java
index fd4f10d..a42cdd7 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2ComplexUpdateEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2ComplexUpdateEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.find(Employee.class, new Long(originalEmployee.getId()));
+ Employee employee = manager.find(Employee.class, Long.valueOf(originalEmployee.getId()));
count++;
employee.setFirstName(originalEmployee.getFirstName() + count);
employee.setLastName(originalEmployee.getLastName() + count);
@@ -100,7 +100,7 @@ public void test() throws Exception {
manager.getTransaction().commit();
} catch (Exception exception) {
// Cache can get stale from TopLink run, so force refresh.
- employee = manager.getReference(Employee.class, new Long(originalEmployee.getId()));
+ employee = manager.getReference(Employee.class, Long.valueOf(originalEmployee.getId()));
manager.refresh(employee);
employee.getPhoneNumbers();
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2InsertDeleteEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2InsertDeleteEmployeePerformanceComparisonTest.java
index 52df8d6..cb6990f 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2InsertDeleteEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2InsertDeleteEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,7 +40,7 @@ public void setup() {
Employee any = (Employee)manager.createQuery("Select e from Employee e").getResultList().get(0);
// Create a query to avoid a cache hit to load emulated data.
Query query = manager.createQuery("Select e from Employee e where e.id = :id");
- query.setParameter("id", new Long(any.getId()));
+ query.setParameter("id", Long.valueOf(any.getId()));
any = (Employee)query.getSingleResult();
manager.close();
manager = createEntityManager();
@@ -82,7 +82,7 @@ public void test() throws Exception {
manager = createEntityManager();
manager.getTransaction().begin();
- employee = manager.getReference(Employee.class, new Long(employee.getId()));
+ employee = manager.getReference(Employee.class, Long.valueOf(employee.getId()));
manager.remove(employee);
manager.getTransaction().commit();
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2UpdateEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2UpdateEmployeePerformanceComparisonTest.java
index 4aae2fd..916ed07 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2UpdateEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPA2UpdateEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,13 +49,13 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ Employee employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
count++;
employee.setFirstName(this.firstName + count);
try {
manager.getTransaction().commit();
} catch (Exception exception) {
- employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
manager.refresh(employee);
}
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAComplexUpdateEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAComplexUpdateEmployeePerformanceComparisonTest.java
index 1da6263..1809ccd 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAComplexUpdateEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAComplexUpdateEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,7 +48,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.find(Employee.class, new Long(originalEmployee.getId()));
+ Employee employee = manager.find(Employee.class, Long.valueOf(originalEmployee.getId()));
count++;
employee.setFirstName(originalEmployee.getFirstName() + count);
employee.setLastName(originalEmployee.getLastName() + count);
@@ -77,7 +77,7 @@ public void test() throws Exception {
manager.getTransaction().commit();
} catch (Exception exception) {
// Cache can get stale from TopLink run, so force refresh.
- employee = manager.getReference(Employee.class, new Long(originalEmployee.getId()));
+ employee = manager.getReference(Employee.class, Long.valueOf(originalEmployee.getId()));
manager.refresh(employee);
employee.getPhoneNumbers();
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteAddressPerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteAddressPerformanceComparisonTest.java
index 12cfea8..36e1db9 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteAddressPerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteAddressPerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@ public void setup() {
Address any = (Address)manager.createQuery("Select a from Address a").getResultList().get(0);
// Create a query to avoid a cache hit to load emulated data.
Query query = manager.createQuery("Select a from Address a where a.id = :id");
- query.setParameter("id", new Long(any.getId()));
+ query.setParameter("id", Long.valueOf(any.getId()));
any = (Address)query.getSingleResult();
manager.close();
manager = createEntityManager();
@@ -60,7 +60,7 @@ public void test() throws Exception {
manager = createEntityManager();
manager.getTransaction().begin();
- address = manager.getReference(Address.class, new Long(address.getId()));
+ address = manager.getReference(Address.class, Long.valueOf(address.getId()));
manager.remove(address);
manager.getTransaction().commit();
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteEmployeePerformanceComparisonTest.java
index b6a59b3..3341ded 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAInsertDeleteEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@ public void setup() {
Employee any = (Employee)manager.createQuery("Select e from Employee e").getResultList().get(0);
// Create a query to avoid a cache hit to load emulated data.
Query query = manager.createQuery("Select e from Employee e where e.id = :id");
- query.setParameter("id", new Long(any.getId()));
+ query.setParameter("id", Long.valueOf(any.getId()));
any = (Employee)query.getSingleResult();
manager.close();
manager = createEntityManager();
@@ -86,7 +86,7 @@ public void test() throws Exception {
manager = createEntityManager();
manager.getTransaction().begin();
- employee = manager.getReference(Employee.class, new Long(employee.getId()));
+ employee = manager.getReference(Employee.class, Long.valueOf(employee.getId()));
manager.remove(employee);
manager.getTransaction().commit();
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateAddressPerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateAddressPerformanceComparisonTest.java
index d957b8a..4631ae5 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateAddressPerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateAddressPerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Address address = manager.find(Address.class, new Long(this.addressId));
+ Address address = manager.find(Address.class, Long.valueOf(this.addressId));
count++;
address.setStreet(street + count);
manager.getTransaction().commit();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateEmployeePerformanceComparisonTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateEmployeePerformanceComparisonTest.java
index 7ee0c03..95e8176 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateEmployeePerformanceComparisonTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/performance/writing/JPAUpdateEmployeePerformanceComparisonTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,13 +49,13 @@ public void setup() {
public void test() throws Exception {
EntityManager manager = createEntityManager();
manager.getTransaction().begin();
- Employee employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ Employee employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
count++;
employee.setFirstName(this.firstName + count);
try {
manager.getTransaction().commit();
} catch (Exception exception) {
- employee = manager.getReference(Employee.class, new Long(this.employeeId));
+ employee = manager.getReference(Employee.class, Long.valueOf(this.employeeId));
manager.refresh(employee);
}
manager.close();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/EMQueryJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/EMQueryJUnitTestSuite.java
index d714481..f5e7220 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/EMQueryJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/EMQueryJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@
import junit.framework.TestSuite;
public class EMQueryJUnitTestSuite extends JUnitTestCase {
- protected Integer nonExistingCustomerId = new Integer(999999);
+ protected Integer nonExistingCustomerId = Integer.valueOf(999999);
public EMQueryJUnitTestSuite() {
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/ExpressionJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/ExpressionJUnitTestSuite.java
index 8978aa2..d877952 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/ExpressionJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/ExpressionJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -404,7 +404,7 @@ public void testLocateWithSingleArgument() throws Exception {
closeEntityManager(em);
try{
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("name").locate("t").equal(new Integer(2));
+ Expression expression = builder.get("name").locate("t").equal(Integer.valueOf(2));
ReadAllQuery r = new ReadAllQuery();
r.setReferenceClass(Item.class);
@@ -453,7 +453,7 @@ public void testLocateWithDoubleArgument() throws Exception {
closeEntityManager(em);
try{
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("name").locate("i", 2).equal(new Integer(5));
+ Expression expression = builder.get("name").locate("i", 2).equal(Integer.valueOf(5));
ReadAllQuery r = new ReadAllQuery();
r.setReferenceClass(Item.class);
@@ -503,7 +503,7 @@ public void testLocateWithDoubleArgument_Neg() throws Exception {
closeEntityManager(em);
try{
ExpressionBuilder builder = new ExpressionBuilder();
- Expression expression = builder.get("name").locate("t", 4).equal(new Integer(0));
+ Expression expression = builder.get("name").locate("t", 4).equal(Integer.valueOf(0));
ReadAllQuery r = new ReadAllQuery();
r.setReferenceClass(Item.class);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/RelationshipModelJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/RelationshipModelJUnitTestSuite.java
index 3a74c87..e0c2e32 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/RelationshipModelJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/relationships/RelationshipModelJUnitTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -473,7 +473,7 @@ public void testGetResultCollectionTest() {
returnedCustomers1 = query1.getResultCollection();
EJBQueryImpl query2 = (EJBQueryImpl) entityManagerImpl.createQuery(ejbql1);
- query2.setParameter("id", new Integer(-10));
+ query2.setParameter("id", Integer.valueOf(-10));
returnedCustomers2 = query2.getResultCollection();
// bug:4297903, check container policy failure
@@ -495,7 +495,7 @@ public void testGetResultCollectionTest() {
entityManagerImpl = (EntityManagerImpl) em.getDelegate();
// bug:4300879, check ReadObjectQuery fails
EJBQueryImpl query4 = (EJBQueryImpl) entityManagerImpl.createQuery(ejbql1);
- query4.setParameter("id", new Integer(-10));
+ query4.setParameter("id", Integer.valueOf(-10));
ReadObjectQuery readObjectQuery2 = new ReadObjectQuery(Customer.class);
readObjectQuery2.setEJBQLString(ejbql1);
query4.setDatabaseQuery(readObjectQuery2);
@@ -555,7 +555,7 @@ public void testGetResultListTest() {
returnedCustomers1 = query1.getResultList();
Query query2 = em.createQuery(ejbql1);
- query2.setParameter("id", new Integer(-10));
+ query2.setParameter("id", Integer.valueOf(-10));
returnedCustomers2 = query2.getResultList();
// bug:4297903, check container policy failure
@@ -577,7 +577,7 @@ public void testGetResultListTest() {
entityManagerImpl = (EntityManagerImpl) em.getDelegate();
// bug:4300879, check ReadObjectQuery fails
EJBQueryImpl query4 = (EJBQueryImpl) entityManagerImpl.createQuery(ejbql1);
- query4.setParameter("id", new Integer(-10));
+ query4.setParameter("id", Integer.valueOf(-10));
ReadObjectQuery readObjectQuery2 = new ReadObjectQuery(Customer.class);
readObjectQuery2.setEJBQLString(ejbql1);
query4.setDatabaseQuery(readObjectQuery2);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsAdvancedJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsAdvancedJUnitTestCase.java
index 270fc5e..7bac506 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsAdvancedJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsAdvancedJUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1049,8 +1049,8 @@ public void testSubString() {
int lastIndex = firstName.length();
List employees = em.createQuery("SELECT object(e) FROM XMLEmployee e where e.firstName = substring(:p1, :p2, :p3)").
setParameter("p1", firstName).
- setParameter("p2", new Integer(firstIndex)).
- setParameter("p3", new Integer(lastIndex)).
+ setParameter("p2", Integer.valueOf(firstIndex)).
+ setParameter("p3", Integer.valueOf(lastIndex)).
getResultList();
// clean up
@@ -1299,7 +1299,7 @@ public void testProperty() {
// verify properties set on Employee instance
errorMsg += verifyPropertyValue(descriptor, "entityName", String.class, "XMLEmployee");
- errorMsg += verifyPropertyValue(descriptor, "entityIntegerProperty", Integer.class, new Integer(1));
+ errorMsg += verifyPropertyValue(descriptor, "entityIntegerProperty", Integer.class, Integer.valueOf(1));
errorMsg += verifyPropertyValue(descriptor, "ToBeOverriddenByXml", Boolean.class, Boolean.TRUE);
errorMsg += verifyPropertyValue(descriptor, "ToBeProcessed", Boolean.class, Boolean.TRUE);
@@ -1311,13 +1311,13 @@ public void testProperty() {
// attribute m_lastName has many properties of different types
DatabaseMapping mapping = descriptor.getMappingForAttributeName("lastName");
errorMsg += verifyPropertyValue(mapping, "BooleanProperty", Boolean.class, Boolean.TRUE);
- errorMsg += verifyPropertyValue(mapping, "ByteProperty", Byte.class, new Byte((byte)1));
- errorMsg += verifyPropertyValue(mapping, "CharacterProperty", Character.class, new Character('A'));
- errorMsg += verifyPropertyValue(mapping, "DoubleProperty", Double.class, new Double(1));
- errorMsg += verifyPropertyValue(mapping, "FloatProperty", Float.class, new Float(1));
- errorMsg += verifyPropertyValue(mapping, "IntegerProperty", Integer.class, new Integer(1));
- errorMsg += verifyPropertyValue(mapping, "LongProperty", Long.class, new Long(1));
- errorMsg += verifyPropertyValue(mapping, "ShortProperty", Short.class, new Short((short)1));
+ errorMsg += verifyPropertyValue(mapping, "ByteProperty", Byte.class, Byte.valueOf((byte)1));
+ errorMsg += verifyPropertyValue(mapping, "CharacterProperty", Character.class, Character.valueOf('A'));
+ errorMsg += verifyPropertyValue(mapping, "DoubleProperty", Double.class, Double.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "FloatProperty", Float.class, Float.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "IntegerProperty", Integer.class, Integer.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "LongProperty", Long.class, Long.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "ShortProperty", Short.class, Short.valueOf((short)1));
errorMsg += verifyPropertyValue(mapping, "BigDecimalProperty", java.math.BigDecimal.class, java.math.BigDecimal.ONE);
errorMsg += verifyPropertyValue(mapping, "BigIntegerProperty", java.math.BigInteger.class, java.math.BigInteger.ONE);
errorMsg += verifyPropertyValue(mapping, "TimeProperty", java.sql.Time.class, Helper.timeFromString("13:59:59"));
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/composite/advanced/EntityMappingsAdvancedJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/composite/advanced/EntityMappingsAdvancedJUnitTestCase.java
index 92217af..a2f8be4 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/composite/advanced/EntityMappingsAdvancedJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/composite/advanced/EntityMappingsAdvancedJUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1077,8 +1077,8 @@ public void testSubString() {
int lastIndex = firstName.length();
List employees = em.createQuery("SELECT object(e) FROM XMLEmployee e where e.firstName = substring(:p1, :p2, :p3)").
setParameter("p1", firstName).
- setParameter("p2", new Integer(firstIndex)).
- setParameter("p3", new Integer(lastIndex)).
+ setParameter("p2", Integer.valueOf(firstIndex)).
+ setParameter("p3", Integer.valueOf(lastIndex)).
getResultList();
// clean up
@@ -1328,7 +1328,7 @@ public void testProperty() {
// verify properties set on Employee instance
errorMsg += verifyPropertyValue(descriptor, "entityName", String.class, "XMLEmployee");
- errorMsg += verifyPropertyValue(descriptor, "entityIntegerProperty", Integer.class, new Integer(1));
+ errorMsg += verifyPropertyValue(descriptor, "entityIntegerProperty", Integer.class, Integer.valueOf(1));
errorMsg += verifyPropertyValue(descriptor, "ToBeOverriddenByXml", Boolean.class, Boolean.TRUE);
errorMsg += verifyPropertyValue(descriptor, "ToBeProcessed", Boolean.class, Boolean.TRUE);
@@ -1340,13 +1340,13 @@ public void testProperty() {
// attribute m_lastName has many properties of different types
DatabaseMapping mapping = descriptor.getMappingForAttributeName("lastName");
errorMsg += verifyPropertyValue(mapping, "BooleanProperty", Boolean.class, Boolean.TRUE);
- errorMsg += verifyPropertyValue(mapping, "ByteProperty", Byte.class, new Byte((byte)1));
- errorMsg += verifyPropertyValue(mapping, "CharacterProperty", Character.class, new Character('A'));
- errorMsg += verifyPropertyValue(mapping, "DoubleProperty", Double.class, new Double(1));
- errorMsg += verifyPropertyValue(mapping, "FloatProperty", Float.class, new Float(1));
- errorMsg += verifyPropertyValue(mapping, "IntegerProperty", Integer.class, new Integer(1));
- errorMsg += verifyPropertyValue(mapping, "LongProperty", Long.class, new Long(1));
- errorMsg += verifyPropertyValue(mapping, "ShortProperty", Short.class, new Short((short)1));
+ errorMsg += verifyPropertyValue(mapping, "ByteProperty", Byte.class, Byte.valueOf((byte)1));
+ errorMsg += verifyPropertyValue(mapping, "CharacterProperty", Character.class, Character.valueOf('A'));
+ errorMsg += verifyPropertyValue(mapping, "DoubleProperty", Double.class, Double.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "FloatProperty", Float.class, Float.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "IntegerProperty", Integer.class, Integer.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "LongProperty", Long.class, Long.valueOf(1));
+ errorMsg += verifyPropertyValue(mapping, "ShortProperty", Short.class, Short.valueOf((short)1));
errorMsg += verifyPropertyValue(mapping, "BigDecimalProperty", java.math.BigDecimal.class, java.math.BigDecimal.ONE);
errorMsg += verifyPropertyValue(mapping, "BigIntegerProperty", java.math.BigInteger.class, java.math.BigInteger.ONE);
errorMsg += verifyPropertyValue(mapping, "TimeProperty", java.sql.Time.class, Helper.timeFromString("13:59:59"));
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/inheritance/EntityMappingsInheritanceJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/inheritance/EntityMappingsInheritanceJUnitTestCase.java
index 7690141..de487ca 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/inheritance/EntityMappingsInheritanceJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/inheritance/EntityMappingsInheritanceJUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -177,8 +177,8 @@ public void testCreateBusFueledVehicle() {
beginTransaction(em);
Bus bus = new Bus();
- bus.setPassengerCapacity(new Integer(50));
- bus.setFuelCapacity(new Integer(175));
+ bus.setPassengerCapacity(Integer.valueOf(50));
+ bus.setFuelCapacity(Integer.valueOf(175));
bus.setDescription("OC Transpo Bus");
bus.setFuelType("Diesel");
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ConverterTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ConverterTestSuite.java
index 3f9ae0f..9a6c81d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ConverterTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ConverterTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -146,7 +146,7 @@ public void testAnnotationConverters() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
@@ -206,7 +206,7 @@ public void testConverterExceptionWrapping1() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
//This string causes an exception to be thrown from the ResponsibilityConverter.convertToEntityAttribute method
responsibility.setDescription(ResponsibilityConverter.THROW_EXCEPTION_IN_TO_ENTITY_ATTRIBUTE);
@@ -261,7 +261,7 @@ public void testConverterExceptionWrapping2() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
//This string causes an exception to be thrown from the ResponsibilityConverter.convertToDatabaseColumn method
responsibility.setDescription(ResponsibilityConverter.THROW_EXCEPTION_IN_TO_DATABASE_COLUMN);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/DDLTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/DDLTestSuite.java
index 052cc5d..85cd964 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/DDLTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/DDLTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -171,7 +171,7 @@ public void testPersistenceGenerateSchemaOnDatabase(String createSource, String
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ForeignKeyTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ForeignKeyTestSuite.java
index 1908106..2fe57d3 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ForeignKeyTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/ForeignKeyTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -226,7 +226,7 @@ public void testReadAndWriteDDLObjects() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/StoredProcedureQueryTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/StoredProcedureQueryTestSuite.java
index 64ea10d..079323b 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/StoredProcedureQueryTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/StoredProcedureQueryTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -347,7 +347,7 @@ public void testQueryExecute1() {
// reason MySql returns a Long here. By position is ok, that is,
// it returns an Integer (as we registered)
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(numberOfEmployes));
}
@@ -383,7 +383,7 @@ public void testQueryExecute1() {
// This test also mixes index and named parameters, so this test my be invalid to begin with.
assertNotNull("The output parameter was null.", outputParamValueFromPosition);
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(numberOfEmployes));
}
@@ -512,7 +512,7 @@ public void testQueryExecute2() {
// reason MySql returns a Long here. By position is ok, that is,
// it returns an Integer (as we registered)
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(numberOfEmployes));
}
@@ -547,7 +547,7 @@ public void testQueryExecute2() {
// This test also mixes index and named parameters, so this test my be invalid to begin with.
assertNotNull("The output parameter was null.", outputParamValueFromPosition);
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(numberOfEmployes));
}
@@ -676,7 +676,7 @@ public void testQueryGetResultList() {
assertTrue("Incorrect number of addresses returned", addresses.size() == 1);
Object[] addressContent = (Object[]) addresses.get(0);
assertTrue("Incorrect data content size", addressContent.length == 6);
- assertTrue("Id content incorrect", addressContent[0].equals(new Long(address1.getId())));
+ assertTrue("Id content incorrect", addressContent[0].equals(Long.valueOf(address1.getId())));
assertTrue("Steet content incorrect", addressContent[1].equals(address1.getStreet()));
assertTrue("City content incorrect", addressContent[2].equals(address1.getCity()));
assertTrue("Country content incorrect", addressContent[3].equals(address1.getCountry()));
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLConverterTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLConverterTestSuite.java
index b792441..7c1afef 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLConverterTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLConverterTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -100,7 +100,7 @@ public void testXMLConverters() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLForeignKeyTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLForeignKeyTestSuite.java
index c019fb9..c3b441d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLForeignKeyTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa21/advanced/XMLForeignKeyTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -217,7 +217,7 @@ public void testReadAndWriteDDLObjects() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/DDLTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/DDLTestSuite.java
index cf16b6c..2367d20 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/DDLTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/DDLTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -165,7 +165,7 @@ public void testPersistenceGenerateSchemaOnDatabase(String createSource, String
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/ForeignKeyTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/ForeignKeyTestSuite.java
index 559c35a..8e236d6 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/ForeignKeyTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/ForeignKeyTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -220,7 +220,7 @@ public void testReadAndWriteDDLObjects() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/StoredProcedureQueryTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/StoredProcedureQueryTestSuite.java
index 5a61159..27ad4c0 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/StoredProcedureQueryTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/StoredProcedureQueryTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -345,7 +345,7 @@ public void testQueryExecute1() {
// reason MySql returns a Long here. By position is ok, that is,
// it returns an Integer (as we registered)
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(numberOfEmployes));
}
@@ -381,7 +381,7 @@ public void testQueryExecute1() {
// This test also mixes index and named parameters, so this test my be invalid to begin with.
assertNotNull("The output parameter was null.", outputParamValueFromPosition);
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(numberOfEmployes));
}
@@ -509,7 +509,7 @@ public void testQueryExecute2() {
// reason MySql returns a Long here. By position is ok, that is,
// it returns an Integer (as we registered)
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromName, outputParamValueFromName.equals(numberOfEmployes));
}
@@ -544,7 +544,7 @@ public void testQueryExecute2() {
// This test also mixes index and named parameters, so this test my be invalid to begin with.
assertNotNull("The output parameter was null.", outputParamValueFromPosition);
if (outputParamValueFromName instanceof Long) {
- assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(new Long(numberOfEmployes)));
+ assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(Long.valueOf(numberOfEmployes)));
} else if (outputParamValueFromName instanceof Integer) {
assertTrue("Incorrect value returned, expected " + numberOfEmployes + ", got: " + outputParamValueFromPosition, outputParamValueFromPosition.equals(numberOfEmployes));
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLConverterTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLConverterTestSuite.java
index d7a8f78..627ca17 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLConverterTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLConverterTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -100,7 +100,7 @@ public void testXMLConverters() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLForeignKeyTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLForeignKeyTestSuite.java
index f4e663a..4a81ebe 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLForeignKeyTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa22/advanced/XMLForeignKeyTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -217,7 +217,7 @@ public void testReadAndWriteDDLObjects() {
organizer.setRace(race);
Responsibility responsibility = new Responsibility();
- responsibility.setUniqueIdentifier(new Long(System.currentTimeMillis()));
+ responsibility.setUniqueIdentifier(Long.valueOf(System.currentTimeMillis()));
responsibility.setDescription("Raise funds");
race.addOrganizer(organizer, responsibility);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Cubicle.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Cubicle.java
index fc5993e..5699a5e 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Cubicle.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Cubicle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -48,7 +48,7 @@ public Cubicle() {
}
public Cubicle(CubiclePrimaryKeyClass key, String color, Employee emp) {
- this(new Integer(key.getFloor().intValue()), new Integer(key.getPlace().intValue()), color, emp);
+ this(Integer.valueOf(key.getFloor().intValue()), Integer.valueOf(key.getPlace().intValue()), color, emp);
}
public Cubicle(Integer aFloor, Integer aPlace, String aColor, Employee aEmployee) {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java
index 9f0ce20..4604845 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesFieldAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -264,13 +264,13 @@ public void fill() {
primitiveFloat = 1.5f;
primitiveDouble = 2.5;
wrapperBoolean = Boolean.TRUE;
- wrapperByte = new Byte((byte) 1);
- wrapperCharacter = new Character('A');
- wrapperShort = new Short((short) 2);
- wrapperInteger = new Integer(3);
- wrapperLong = new Long(4);
- wrapperFloat = new Float(1.5f);
- wrapperDouble = new Double(2.5);
+ wrapperByte = Byte.valueOf((byte) 1);
+ wrapperCharacter = Character.valueOf('A');
+ wrapperShort = Short.valueOf((short) 2);
+ wrapperInteger = Integer.valueOf(3);
+ wrapperLong = Long.valueOf(4);
+ wrapperFloat = Float.valueOf(1.5f);
+ wrapperDouble = Double.valueOf(2.5);
string2Varchar = "VARCHAR";
string2Clob = "CLOB";
bigDecimal = new BigDecimal("42.42");
@@ -291,26 +291,26 @@ public void fill() {
primitiveByteArray2Blob[i] = (byte) i;
}
- wrapperByteArray2Binary = new Byte[] { new Byte((byte) 0), new Byte((byte) 1), new Byte((byte) 2), new Byte((byte) 3),
- new Byte((byte) 4), new Byte((byte) 5), new Byte((byte) 6), new Byte((byte) 7) };
+ wrapperByteArray2Binary = new Byte[] { Byte.valueOf((byte) 0), Byte.valueOf((byte) 1), Byte.valueOf((byte) 2), Byte.valueOf((byte) 3),
+ Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6), Byte.valueOf((byte) 7) };
wrapperByteArray2Longvarbinary = new Byte[1111];
for (int i = 0; i < wrapperByteArray2Longvarbinary.length; i++) {
- wrapperByteArray2Longvarbinary[i] = new Byte((byte) i);
+ wrapperByteArray2Longvarbinary[i] = Byte.valueOf((byte) i);
}
wrapperByteArray2Blob = new Byte[3333];
for (int i = 0; i < wrapperByteArray2Blob.length; i++) {
- wrapperByteArray2Blob[i] = new Byte((byte) i);
+ wrapperByteArray2Blob[i] = Byte.valueOf((byte) i);
}
primitiveCharArray2Varchar = new char[] { 'V', 'A', 'R', 'C', 'A', 'R' };
primitiveCharArray2Clob = new char[] { 'C', 'L', 'O', 'B' };
- wrapperCharacterArray2Varchar = new Character[] { new Character('V'), new Character('A'), new Character('R'),
- new Character('C'), new Character('H'), new Character('A'), new Character('R') };
- wrapperCharacterArray2Clob = new Character[] { new Character('C'), new Character('L'), new Character('O'),
- new Character('B') };
+ wrapperCharacterArray2Varchar = new Character[] { Character.valueOf('V'), Character.valueOf('A'), Character.valueOf('R'),
+ Character.valueOf('C'), Character.valueOf('H'), Character.valueOf('A'), Character.valueOf('R') };
+ wrapperCharacterArray2Clob = new Character[] { Character.valueOf('C'), Character.valueOf('L'), Character.valueOf('O'),
+ Character.valueOf('B') };
serializable = new UserDefinedSerializable("REGEN"); // BLOB
setEnumOrdinal(UserDefinedEnum.EMIL);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesPropertyAccess.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesPropertyAccess.java
index 30306be..776075e 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesPropertyAccess.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/models/wdf/jpa1/types/BasicTypesPropertyAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -162,13 +162,13 @@ public void fill() {
_primitiveFloat = 1.5f;
_primitiveDouble = 2.5;
_wrapperBoolean = Boolean.TRUE;
- _wrapperByte = new Byte((byte) 1);
- _wrapperCharacter = new Character('A');
- _wrapperShort = new Short((short) 2);
- _wrapperInteger = new Integer(3);
- _wrapperLong = new Long(4);
- _wrapperFloat = new Float(1.5f);
- _wrapperDouble = new Double(2.5);
+ _wrapperByte = Byte.valueOf((byte) 1);
+ _wrapperCharacter = Character.valueOf('A');
+ _wrapperShort = Short.valueOf((short) 2);
+ _wrapperInteger = Integer.valueOf(3);
+ _wrapperLong = Long.valueOf(4);
+ _wrapperFloat = Float.valueOf(1.5f);
+ _wrapperDouble = Double.valueOf(2.5);
_string2Varchar = "VARCHAR";
_string2Clob = "CLOB";
_bigDecimal = new BigDecimal("42.42");
@@ -189,26 +189,26 @@ public void fill() {
_primitiveByteArray2Blob[i] = (byte) i;
}
- _wrapperByteArray2Binary = new Byte[] { new Byte((byte) 0), new Byte((byte) 1), new Byte((byte) 2), new Byte((byte) 3),
- new Byte((byte) 4), new Byte((byte) 5), new Byte((byte) 6), new Byte((byte) 7) };
+ _wrapperByteArray2Binary = new Byte[] { Byte.valueOf((byte) 0), Byte.valueOf((byte) 1), Byte.valueOf((byte) 2), Byte.valueOf((byte) 3),
+ Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6), Byte.valueOf((byte) 7) };
_wrapperByteArray2Longvarbinary = new Byte[1111];
for (int i = 0; i < _wrapperByteArray2Longvarbinary.length; i++) {
- _wrapperByteArray2Longvarbinary[i] = new Byte((byte) i);
+ _wrapperByteArray2Longvarbinary[i] = Byte.valueOf((byte) i);
}
_wrapperByteArray2Blob = new Byte[3333];
for (int i = 0; i < _wrapperByteArray2Blob.length; i++) {
- _wrapperByteArray2Blob[i] = new Byte((byte) i);
+ _wrapperByteArray2Blob[i] = Byte.valueOf((byte) i);
}
_primitiveCharArray2Varchar = new char[] { 'V', 'A', 'R', 'C', 'A', 'R' };
_primitiveCharArray2Clob = new char[] { 'C', 'L', 'O', 'B' };
- _wrapperCharacterArray2Varchar = new Character[] { new Character('V'), new Character('A'), new Character('R'),
- new Character('C'), new Character('H'), new Character('A'), new Character('R') };
- _wrapperCharacterArray2Clob = new Character[] { new Character('C'), new Character('L'), new Character('O'),
- new Character('B') };
+ _wrapperCharacterArray2Varchar = new Character[] { Character.valueOf('V'), Character.valueOf('A'), Character.valueOf('R'),
+ Character.valueOf('C'), Character.valueOf('H'), Character.valueOf('A'), Character.valueOf('R') };
+ _wrapperCharacterArray2Clob = new Character[] { Character.valueOf('C'), Character.valueOf('L'), Character.valueOf('O'),
+ Character.valueOf('B') };
_serializable = new UserDefinedSerializable("REGEN"); // BLOB
_enumOrdinal = UserDefinedEnum.EMIL;
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java
index c0fe527..71a460f 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -43,14 +43,14 @@ public void testInsert() {
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(EmbeddingFieldAccess.class, new Integer(0));
+ obj = em.find(EmbeddingFieldAccess.class, Integer.valueOf(0));
} finally {
closeEntityManager(em);
}
}
private EmbeddingFieldAccess find(EntityManager em, int id) {
- return em.find(EmbeddingFieldAccess.class, new Integer(id));
+ return em.find(EmbeddingFieldAccess.class, Integer.valueOf(id));
}
private void validateMutable(final int id, MutableValidator validator, String fieldName) {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java
index 42f87d2..a496104 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -44,14 +44,14 @@ public void testInsert() {
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(EmbeddingPropertyAccess.class, new Integer(0));
+ obj = em.find(EmbeddingPropertyAccess.class, Integer.valueOf(0));
} finally {
closeEntityManager(em);
}
}
private EmbeddingPropertyAccess find(EntityManager em, int id) {
- return em.find(EmbeddingPropertyAccess.class, new Integer(id));
+ return em.find(EmbeddingPropertyAccess.class, Integer.valueOf(id));
}
private void validateMutable(final int id, MutableValidator validator, String fieldName) {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeFlush.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeFlush.java
index d6aba0d..f05e6ff 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeFlush.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeFlush.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -178,7 +178,7 @@ public void testSimpleCascadeToDetached2b() throws SQLException {
em.persist(existing);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId())); // known object in state managed
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId())); // known object in state managed
em.persist(parent);
CascadingNode child = new CascadingNode(existing.getId(), parent);
child.setParent(null); // to avoid circular cascade
@@ -213,7 +213,7 @@ public void testSimpleCascadeToDetached2c() throws SQLException {
em.persist(existing);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId()));
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId()));
em.remove(existing); // known object in state deleted
em.persist(parent);
CascadingNode child = new CascadingNode(existing.getId(), parent);
@@ -253,7 +253,7 @@ public void testSimpleCascadeToRemoved() throws SQLException {
env.beginTransaction(em);
CascadingNode parent = new CascadingNode(32, null);
em.persist(parent);
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
em.remove(child);
parent.addChild(child);
verify(em.contains(parent), "Parent not contained in persistence context after persist");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeMerge.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeMerge.java
index 0aae00e..f7a6b0a 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeMerge.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeMerge.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -146,8 +146,8 @@ public void testCascadeDetached() {
CascadingNodeDescription grandchildDescription = new CascadingNodeDescription(106, null, "new grandchild");
grandchild.setDescription(grandchildDescription);
child.addChild(grandchild);
- CascadingNode managedChild = em.find(CascadingNode.class, new Integer(child.getId()));
- CascadingNodeDescription managedChildDescription = em.find(CascadingNodeDescription.class, new Integer(
+ CascadingNode managedChild = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
+ CascadingNodeDescription managedChildDescription = em.find(CascadingNodeDescription.class, Integer.valueOf(
childDescription.getId()));
CascadingNode managedGrandchild = new CascadingNode(grandchild.getId(), null);
CascadingNodeDescription managedGrandchildDescription = new CascadingNodeDescription(grandchildDescription.getId(),
@@ -253,14 +253,14 @@ public void testCascadeDetachedRemoved() {
verifyExistence(em, grandchild);
verifyExistence(em, grandchildDescription);
env.beginTransaction(em);
- CascadingNode managedParent = em.find(CascadingNode.class, new Integer(parent.getId()));
- CascadingNodeDescription managedParentDescription = em.find(CascadingNodeDescription.class, new Integer(
+ CascadingNode managedParent = em.find(CascadingNode.class, Integer.valueOf(parent.getId()));
+ CascadingNodeDescription managedParentDescription = em.find(CascadingNodeDescription.class, Integer.valueOf(
parentDescription.getId()));
- CascadingNode managedChild = em.find(CascadingNode.class, new Integer(child.getId()));
- CascadingNodeDescription managedChildDescription = em.find(CascadingNodeDescription.class, new Integer(
+ CascadingNode managedChild = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
+ CascadingNodeDescription managedChildDescription = em.find(CascadingNodeDescription.class, Integer.valueOf(
childDescription.getId()));
- CascadingNode managedGrandchild = em.find(CascadingNode.class, new Integer(grandchild.getId()));
- CascadingNodeDescription managedGrandchildDescription = em.find(CascadingNodeDescription.class, new Integer(
+ CascadingNode managedGrandchild = em.find(CascadingNode.class, Integer.valueOf(grandchild.getId()));
+ CascadingNodeDescription managedGrandchildDescription = em.find(CascadingNodeDescription.class, Integer.valueOf(
grandchildDescription.getId()));
managedParent.setChildren(null);
em.remove(managedChild);
@@ -365,7 +365,7 @@ public void testCircularCascadeWithSamePks() {
env.commitTransactionAndClear(em);
verifyExistence(em, managedNode);
env.beginTransaction(em);
- managedNode = em.find(CascadingNode.class, new Integer(managedNode.getId()));
+ managedNode = em.find(CascadingNode.class, Integer.valueOf(managedNode.getId()));
managedNode.addChild(detachedNode);
detachedNode.addChild(managedNode);
CascadingNode mergedNode = em.merge(detachedNode);
@@ -416,7 +416,7 @@ public void testCascadeManaged() {
verifyAbsence(em, child);
verifyAbsence(em, childDescription);
env.beginTransaction(em);
- parent = em.find(CascadingNode.class, new Integer(parent.getId()));
+ parent = em.find(CascadingNode.class, Integer.valueOf(parent.getId()));
parent.addChild(child);
// setup complete
CascadingNode mergedNode = em.merge(parent);
@@ -480,7 +480,7 @@ public void testCascadeRemoved() {
verifyExistence(em, child);
verifyExistence(em, childDescription);
env.beginTransaction(em);
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
em.remove(child);
parent.addChild(child);
verify(!em.contains(parent), "parent not new");
@@ -521,11 +521,11 @@ public void testCascadeRemoved() {
private void verifyExistence(EntityManager em, Object entity) {
if (entity instanceof CascadingNode) {
CascadingNode node = (CascadingNode) entity;
- CascadingNode found = em.find(CascadingNode.class, new Integer(node.getId()));
+ CascadingNode found = em.find(CascadingNode.class, Integer.valueOf(node.getId()));
verify(found != null, "cascading node with id " + node.getId() + " not found");
} else if (entity instanceof CascadingNodeDescription) {
CascadingNodeDescription desc = (CascadingNodeDescription) entity;
- CascadingNodeDescription found = em.find(CascadingNodeDescription.class, new Integer(desc.getId()));
+ CascadingNodeDescription found = em.find(CascadingNodeDescription.class, Integer.valueOf(desc.getId()));
verify(found != null, "cascading node description with id " + desc.getId() + " not found");
} else {
throw new IllegalArgumentException("not supported");
@@ -535,11 +535,11 @@ private void verifyExistence(EntityManager em, Object entity) {
private void verifyAbsence(EntityManager em, Object entity) {
if (entity instanceof CascadingNode) {
CascadingNode node = (CascadingNode) entity;
- CascadingNode found = em.find(CascadingNode.class, new Integer(node.getId()));
+ CascadingNode found = em.find(CascadingNode.class, Integer.valueOf(node.getId()));
verify(found == null, "cascading node with id " + node.getId() + " found");
} else if (entity instanceof CascadingNodeDescription) {
CascadingNodeDescription desc = (CascadingNodeDescription) entity;
- CascadingNodeDescription found = em.find(CascadingNodeDescription.class, new Integer(desc.getId()));
+ CascadingNodeDescription found = em.find(CascadingNodeDescription.class, Integer.valueOf(desc.getId()));
verify(found == null, "cascading node description with id " + desc.getId() + " found");
} else {
throw new IllegalArgumentException("not supported");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadePersist.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadePersist.java
index e4255de..87ef8a3 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadePersist.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadePersist.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -80,7 +80,7 @@ public void testSimpleCascadeManaged() throws SQLException {
env.commitTransactionAndClear(em);
// cascade from parent to child
env.beginTransaction(em);
- parent = em.find(CascadingNode.class, new Integer(parent.getId())); // parent is now managed
+ parent = em.find(CascadingNode.class, Integer.valueOf(parent.getId())); // parent is now managed
CascadingNode child = new CascadingNode(12, parent);
child.setParent(null); // to avoid circular cascade
em.persist(parent);
@@ -183,7 +183,7 @@ public void testSimpleCascadeDetached() throws SQLException {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId())); // known object in state managed
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId())); // known object in state managed
persistFailed = false;
immediateException = false;
try {
@@ -221,7 +221,7 @@ public void testSimpleCascadeDetached() throws SQLException {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId()));
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId()));
em.remove(existing); // known object in state deleted
persistFailed = false;
immediateException = false;
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRefresh.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRefresh.java
index 9618fb5..d2cc11c 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRefresh.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRefresh.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -60,8 +60,8 @@ public void testCascade() {
em.persist(parent);
verify(em.contains(parent), "parent is not managed");
verify(em.contains(parentDescription), "parentDescription is not managed");
- child = em.find(CascadingNode.class, new Integer(child.getId()));
- childDescription = em.find(CascadingNodeDescription.class, new Integer(childDescription.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
+ childDescription = em.find(CascadingNodeDescription.class, Integer.valueOf(childDescription.getId()));
childDescription.setDescription("updated");
parent.addChild(child);
child.setChildren(null);
@@ -115,11 +115,11 @@ public void testCascade() {
private void verifyExistence(EntityManager em, Object entity) {
if (entity instanceof CascadingNode) {
CascadingNode node = (CascadingNode) entity;
- CascadingNode found = em.find(CascadingNode.class, new Integer(node.getId()));
+ CascadingNode found = em.find(CascadingNode.class, Integer.valueOf(node.getId()));
verify(found != null, "cascading node with id " + node.getId() + " not found");
} else if (entity instanceof CascadingNodeDescription) {
CascadingNodeDescription desc = (CascadingNodeDescription) entity;
- CascadingNodeDescription found = em.find(CascadingNodeDescription.class, new Integer(desc.getId()));
+ CascadingNodeDescription found = em.find(CascadingNodeDescription.class, Integer.valueOf(desc.getId()));
verify(found != null, "cascading node description with id " + desc.getId() + " not found");
} else {
throw new IllegalArgumentException("not supported");
@@ -129,11 +129,11 @@ private void verifyExistence(EntityManager em, Object entity) {
private void verifyAbsence(EntityManager em, Object entity) {
if (entity instanceof CascadingNode) {
CascadingNode node = (CascadingNode) entity;
- CascadingNode found = em.find(CascadingNode.class, new Integer(node.getId()));
+ CascadingNode found = em.find(CascadingNode.class, Integer.valueOf(node.getId()));
verify(found == null, "cascading node with id " + node.getId() + " found");
} else if (entity instanceof CascadingNodeDescription) {
CascadingNodeDescription desc = (CascadingNodeDescription) entity;
- CascadingNodeDescription found = em.find(CascadingNodeDescription.class, new Integer(desc.getId()));
+ CascadingNodeDescription found = em.find(CascadingNodeDescription.class, Integer.valueOf(desc.getId()));
verify(found == null, "cascading node description with id " + desc.getId() + " found");
} else {
throw new IllegalArgumentException("not supported");
@@ -141,7 +141,7 @@ private void verifyAbsence(EntityManager em, Object entity) {
}
private void verifyDescription(EntityManager em, CascadingNodeDescription desc, String expectedDescription) {
- CascadingNodeDescription found = em.find(CascadingNodeDescription.class, new Integer(desc.getId()));
+ CascadingNodeDescription found = em.find(CascadingNodeDescription.class, Integer.valueOf(desc.getId()));
verify(found != null, "cascading node description with id " + desc.getId() + " not found");
if (found != null) {
verify(expectedDescription.equals(found.getDescription()), "cascading node " + found.getId()
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRemove.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRemove.java
index 26c3192..5764a17 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRemove.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestCascadeRemove.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -63,7 +63,7 @@ public void testSimpleCascadeNew() throws SQLException {
em.persist(child);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
CascadingNode parent = new CascadingNode(2, null);
parent.addChild(child);
verify(!em.contains(parent), "Parent not a new entity");
@@ -78,7 +78,7 @@ public void testSimpleCascadeNew() throws SQLException {
em.persist(description);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent = new CascadingNode(4, null);
parent.setDescription(description);
description.setNode(parent);
@@ -107,7 +107,7 @@ public void testSimpleCascadeManaged() throws SQLException {
env.beginTransaction(em);
CascadingNode parent = new CascadingNode(102, null);
em.persist(parent);
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(em.contains(parent), "Parent not managed");
verify(em.contains(child), "Child not managed");
@@ -123,7 +123,7 @@ public void testSimpleCascadeManaged() throws SQLException {
env.beginTransaction(em);
parent = new CascadingNode(104, null);
em.persist(parent);
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent.setDescription(description);
description.setNode(parent);
verify(em.contains(parent), "Parent not managed");
@@ -141,8 +141,8 @@ public void testSimpleCascadeManaged() throws SQLException {
em.persist(child);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- parent = em.find(CascadingNode.class, new Integer(parent.getId()));
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ parent = em.find(CascadingNode.class, Integer.valueOf(parent.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(em.contains(parent), "Parent not managed");
verify(em.contains(child), "Child not managed");
@@ -158,7 +158,7 @@ public void testSimpleCascadeManaged() throws SQLException {
em.persist(parent);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- parent = em.find(CascadingNode.class, new Integer(parent.getId()));
+ parent = em.find(CascadingNode.class, Integer.valueOf(parent.getId()));
description = parent.getDescription();
verify(em.contains(parent), "Parent not managed");
verify(em.contains(description), "Description not managed");
@@ -185,7 +185,7 @@ public void testSimpleCascadeDetached() throws SQLException {
em.persist(child);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(!em.contains(parent), "Parent not detached");
verify(em.contains(child), "Child not managed");
@@ -222,7 +222,7 @@ public void testSimpleCascadeDetached() throws SQLException {
em.persist(description);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent.setDescription(description);
verify(!em.contains(parent), "Parent not detached");
verify(em.contains(description), "Description not managed");
@@ -262,7 +262,7 @@ public void testSimpleCascadeDetached() throws SQLException {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
em.persist(existing); // status FOR_INSERT
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(!em.contains(parent), "Parent not detached");
verify(em.contains(existing), "Existing not managed");
@@ -302,7 +302,7 @@ public void testSimpleCascadeDetached() throws SQLException {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
em.persist(existing); // status FOR_INSERT
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent.setDescription(description);
verify(!em.contains(parent), "Parent not detached");
verify(em.contains(existing), "Existing not managed");
@@ -343,8 +343,8 @@ public void testSimpleCascadeDetached() throws SQLException {
em.persist(child);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId())); // state FOR_UPADTE
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId())); // state FOR_UPADTE
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(!em.contains(parent), "Parent not detached");
verify(em.contains(existing), "Existing not managed");
@@ -384,8 +384,8 @@ public void testSimpleCascadeDetached() throws SQLException {
em.persist(description);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId())); // state FOR_UPADTE
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId())); // state FOR_UPADTE
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent.setDescription(description);
verify(!em.contains(parent), "Parent not detached");
verify(em.contains(existing), "Existing not managed");
@@ -426,9 +426,9 @@ public void testSimpleCascadeDetached() throws SQLException {
em.persist(child);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId()));
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId()));
em.remove(existing); // state FOR_REMOVE
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(!em.contains(parent), "Parent not detached");
verify(!em.contains(existing), "Existing not removed");
@@ -467,9 +467,9 @@ public void testSimpleCascadeDetached() throws SQLException {
em.persist(description);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- existing = em.find(CascadingNode.class, new Integer(existing.getId()));
+ existing = em.find(CascadingNode.class, Integer.valueOf(existing.getId()));
em.remove(existing); // state FOR_REMOVE
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent.setDescription(description);
verify(!em.contains(parent), "Parent not detached");
verify(!em.contains(existing), "Existing not removed");
@@ -518,9 +518,9 @@ public void testSimpleCascadeRemoved() throws SQLException {
em.persist(child);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- parent = em.find(CascadingNode.class, new Integer(parent.getId()));
+ parent = em.find(CascadingNode.class, Integer.valueOf(parent.getId()));
em.remove(parent);
- child = em.find(CascadingNode.class, new Integer(child.getId()));
+ child = em.find(CascadingNode.class, Integer.valueOf(child.getId()));
parent.addChild(child);
verify(!em.contains(parent), "Parent not removed");
verify(em.contains(child), "Child not managed");
@@ -536,9 +536,9 @@ public void testSimpleCascadeRemoved() throws SQLException {
em.persist(description);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- parent = em.find(CascadingNode.class, new Integer(parent.getId()));
+ parent = em.find(CascadingNode.class, Integer.valueOf(parent.getId()));
em.remove(parent);
- description = em.find(CascadingNodeDescription.class, new Integer(description.getId()));
+ description = em.find(CascadingNodeDescription.class, Integer.valueOf(description.getId()));
parent.setDescription(description);
verify(!em.contains(parent), "Parent not removed");
verify(em.contains(description), "Description not managed");
@@ -567,8 +567,8 @@ public void testCircularCascade() throws SQLException {
verifyExistenceInNodeTable(node1.getId());
verifyExistenceInNodeTable(node2.getId());
env.beginTransaction(em);
- node1 = em.find(CascadingNode.class, new Integer(node1.getId()));
- node2 = em.find(CascadingNode.class, new Integer(node2.getId()));
+ node1 = em.find(CascadingNode.class, Integer.valueOf(node1.getId()));
+ node2 = em.find(CascadingNode.class, Integer.valueOf(node2.getId()));
em.remove(node1);
env.commitTransactionAndClear(em);
verifyAbsenceFromNodeTable(node1.getId());
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClear.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClear.java
index 5f3e755..7e616f0 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClear.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClear.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -36,7 +36,7 @@ public void testClearActiveTransaction() {
em.persist(dep1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep1 = em.find(Department.class, new Integer(dep1.getId()));
+ dep1 = em.find(Department.class, Integer.valueOf(dep1.getId()));
em.persist(dep2);
verify(em.contains(dep1), "entity not managed");
verify(em.contains(dep2), "entity not managed");
@@ -45,10 +45,10 @@ public void testClearActiveTransaction() {
verify(!em.contains(dep1), "entity managed");
verify(!em.contains(dep2), "entity managed");
env.commitTransactionAndClear(em);
- Department dep = em.find(Department.class, new Integer(dep1.getId()));
+ Department dep = em.find(Department.class, Integer.valueOf(dep1.getId()));
verify(dep != null, "department with id " + dep1.getId() + " does not exist");
verify("one".equals(dep.getName()), "department has wrong name: " + dep.getName());
- dep = em.find(Department.class, new Integer(dep2.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep2.getId()));
verify(dep == null, "department with id " + dep2.getId() + " exists");
} finally {
closeEntityManager(em);
@@ -66,7 +66,7 @@ public void testClearNoTransaction() {
env.beginTransaction(em);
em.persist(dep1);
env.commitTransactionAndClear(em);
- dep1 = em.find(Department.class, new Integer(dep1.getId()));
+ dep1 = em.find(Department.class, Integer.valueOf(dep1.getId()));
if (extended) {
em.persist(dep2);
verify(em.contains(dep1), "entity not managed");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClose.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClose.java
index f9f38f4..4cb6fa2 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClose.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestClose.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -101,7 +101,7 @@ public void testFindClosed() {
em.close();
verify(!em.isOpen(), "EntityManager is not closed");
try {
- em.find(Department.class, new Integer(1));
+ em.find(Department.class, Integer.valueOf(1));
flop("operation on a closed entity manager did not throw IllegalStateException");
} catch (IllegalStateException e) {
// $JL-EXC$ expected behavior
@@ -118,7 +118,7 @@ public void testGetReferenceClosed() {
em.close();
verify(!em.isOpen(), "EntityManager is not closed");
try {
- em.getReference(Department.class, new Integer(1));
+ em.getReference(Department.class, Integer.valueOf(1));
flop("operation on a closed entity manager did not throw IllegalStateException");
} catch (IllegalStateException e) {
// $JL-EXC$ expected behavior
@@ -373,7 +373,7 @@ public void testCloseActiveTransaction() {
em.persist(dep1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep1 = em.find(Department.class, new Integer(dep1.getId()));
+ dep1 = em.find(Department.class, Integer.valueOf(dep1.getId()));
em.persist(dep2);
em.close(); // persistence context should remain active
try {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestContains.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestContains.java
index 1f38d13..290452b 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestContains.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestContains.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -52,7 +52,7 @@ public void testContainsManaged() {
em.persist(dep);
env.commitTransactionAndClear(em);
// 1. managed after find ouside tx
- Object obj = em.find(Department.class, new Integer(11));
+ Object obj = em.find(Department.class, Integer.valueOf(11));
if (extended) {
verify(em.contains(obj), "object retrieved by find outside of transaction is not contained");
} else {
@@ -61,7 +61,7 @@ public void testContainsManaged() {
em.clear();
// 2. managed after find inside tx
env.beginTransaction(em);
- obj = em.find(Department.class, new Integer(11));
+ obj = em.find(Department.class, Integer.valueOf(11));
verify(em.contains(obj), "object retrieved by find inside transaction is not contained");
env.rollbackTransactionAndClear(em);
verify(!em.contains(obj), "object contained after rollback and clear");
@@ -94,7 +94,7 @@ public void testContainsRemoved() {
verify(!em.contains(dep), "object contained after commit");
// 1. remove found object
env.beginTransaction(em);
- Object obj = em.find(Department.class, new Integer(21));
+ Object obj = em.find(Department.class, Integer.valueOf(21));
verify(em.contains(obj), "object not contained after find inside tx");
em.remove(obj);
verify(!em.contains(obj), "object contained after remove");
@@ -136,7 +136,7 @@ public void testContainsDetached() {
verify(!em.contains(detachedDep), "detached object contained, another object with same pk is in state MANAGED_NEW");
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // object is now in state MANAGED
+ dep = em.find(Department.class, Integer.valueOf(id)); // object is now in state MANAGED
verify(!em.contains(detachedDep), "detached object contained, another object with same pk is in state MANAGED");
em.remove(dep); // object is now in state DELETED
verify(!em.contains(detachedDep), "detached object contained, another object with same pk is in state DELETED");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestEntityManagerFactory.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestEntityManagerFactory.java
index 2fb31d2..a2abad8 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestEntityManagerFactory.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestEntityManagerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -82,7 +82,7 @@ public void testEntityManagerFactoryCloseActiveTransaction() throws NamingExcept
em.persist(dep1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep1 = em.find(Department.class, new Integer(dep1.getId()));
+ dep1 = em.find(Department.class, Integer.valueOf(dep1.getId()));
em.persist(dep2);
try {
emf.close(); // persistence context should remain active
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestExtendedPersistenceContext.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestExtendedPersistenceContext.java
index 6f7f06a..d6c4bbb 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestExtendedPersistenceContext.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestExtendedPersistenceContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -46,7 +46,7 @@ public void testPersistOutsideTx() {
env.commitTransaction(em);
verify(em.contains(dep), "persistence context does not contain entity");
em.clear();
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
verify(dep != null, "entity not found");
} finally {
closeEntityManager(em);
@@ -63,14 +63,14 @@ public void testUpdateOutsideTx() {
env.beginTransaction(em);
em.persist(dep);
env.commitTransactionAndClear(em);
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
dep.setName("modified");
env.beginTransaction(em);
verify(em.contains(dep), "persistence context does not contain entity");
env.commitTransaction(em);
verify(em.contains(dep), "persistence context does not contain entity");
em.clear();
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
verify("modified".equals(dep.getName()), "entity not updated");
} finally {
closeEntityManager(em);
@@ -90,7 +90,7 @@ public void testRemoveOutsideTx() {
em.remove(dep);
env.beginTransaction(em);
env.commitTransactionAndClear(em);
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
verify(dep == null, "entity not removed");
} finally {
closeEntityManager(em);
@@ -112,7 +112,7 @@ public void testMergeOutsideTx() {
verify("detached".equals(dep.getName()), "entity not merged");
env.beginTransaction(em);
env.commitTransactionAndClear(em);
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
verify("detached".equals(dep.getName()), "entity not merged");
} finally {
closeEntityManager(em);
@@ -134,7 +134,7 @@ public void testRefreshOutsideTx() {
verify("test".equals(dep.getName()), "entity not refreshed");
env.beginTransaction(em);
env.commitTransactionAndClear(em);
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
verify("test".equals(dep.getName()), "entity not refreshed");
} finally {
closeEntityManager(em);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFind.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFind.java
index f9b21ac..d15454d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFind.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFind.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -31,7 +31,7 @@ public class TestFind extends JPA1Base {
private final Department _dep = new Department(1, "eins");
private final Employee _emp = new Employee(7, "first", "last", _dep);
- private final Cubicle _cub = new Cubicle(new Integer(1), new Integer(2), "yellow", _emp);
+ private final Cubicle _cub = new Cubicle(Integer.valueOf(1), Integer.valueOf(2), "yellow", _emp);
@Override
public void setup() {
@@ -57,13 +57,13 @@ public void testPositivTx() {
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Employee emp = em.find(Employee.class, new Integer(7));
+ Employee emp = em.find(Employee.class, Integer.valueOf(7));
verify(em.contains(emp), "Object not loaded");
verify(emp.getId() == 7, "wrong id");
verify(emp.getDepartment().getName().equals("eins"), "wrong department");
- emp = em.find(Employee.class, new Integer(7));
+ emp = em.find(Employee.class, Integer.valueOf(7));
verify(emp.getId() == 7, "wrong id");
- Department dep = em.find(Department.class, new Integer(1));
+ Department dep = em.find(Department.class, Integer.valueOf(1));
verify(em.contains(dep), "Object not loaded");
verify(dep.getId() == 1, "wrong id");
env.rollbackTransactionAndClear(em);
@@ -76,12 +76,12 @@ public void testPositivTx() {
public void testPositivNonTx() {
final EntityManager em = getEnvironment().getEntityManager();
try {
- Employee emp = em.find(Employee.class, new Integer(7));
+ Employee emp = em.find(Employee.class, Integer.valueOf(7));
verify(emp.getId() == 7, "wrong id");
verify(emp.getDepartment().getName().equals("eins"), "wrong department");
- emp = em.find(Employee.class, new Integer(7));
+ emp = em.find(Employee.class, Integer.valueOf(7));
verify(emp.getId() == 7, "wrong id");
- Department dep = em.find(Department.class, new Integer(1));
+ Department dep = em.find(Department.class, Integer.valueOf(1));
verify(dep.getId() == 1, "wrong id");
} finally {
closeEntityManager(em);
@@ -92,7 +92,7 @@ public void testPositivNonTx() {
public void testNegativ() {
final EntityManager em = getEnvironment().getEntityManager();
try {
- Object result = em.find(Employee.class, new Integer(17 + 4));
+ Object result = em.find(Employee.class, Integer.valueOf(17 + 4));
verify(result == null, "found something");
} finally {
closeEntityManager(em);
@@ -108,7 +108,7 @@ public void testIllegalArguments() {
final EntityManager em = getEnvironment().getEntityManager();
try {
try {
- em.find(String.class, new Integer(17 + 4));
+ em.find(String.class, Integer.valueOf(17 + 4));
flop("no IllegalArgumentException thrown");
} catch (IllegalArgumentException ex) {
verify(true, "");
@@ -140,8 +140,8 @@ public void testIllegalArguments() {
public void testFindWithCompositeKey() {
final EntityManager em = getEnvironment().getEntityManager();
try {
- Integer one = new Integer(1);
- Integer two = new Integer(2);
+ Integer one = Integer.valueOf(1);
+ Integer two = Integer.valueOf(2);
CubiclePrimaryKeyClass cubKey = new CubiclePrimaryKeyClass(one, two);
Cubicle cub = em.find(Cubicle.class, cubKey);
verify(cub.getFloor().equals(one) && cub.getPlace().equals(two), "wrong cubicle");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java
index a3f0865..8c2bc37 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -51,7 +51,7 @@ public void testRelationshipToNew() {
// case 1: direct relationship Employee -> Cubicle (new) - 1:1
Department dep = new Department(1, "dep");
Employee emp1 = new Employee(2, "first", "last", dep);
- Cubicle cub1 = new Cubicle(new Integer(3), new Integer(3), "color", emp1);
+ Cubicle cub1 = new Cubicle(Integer.valueOf(3), Integer.valueOf(3), "color", emp1);
emp1.setCubicle(cub1);
env.beginTransaction(em);
em.persist(dep);
@@ -174,7 +174,7 @@ public void testRelationshipToRemoved() {
// case 1: direct relationship Employee -> Cubicle (FOR_DELETE) - 1:1
Department dep = new Department(101, "dep");
Employee emp1 = new Employee(102, "first", "last", dep);
- Cubicle cub1 = new Cubicle(new Integer(103), new Integer(103), "color", emp1);
+ Cubicle cub1 = new Cubicle(Integer.valueOf(103), Integer.valueOf(103), "color", emp1);
emp1.setCubicle(cub1);
env.beginTransaction(em);
em.persist(dep);
@@ -183,7 +183,7 @@ public void testRelationshipToRemoved() {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
cub1 = em.find(Cubicle.class, cub1.getId());
cub1.setEmployee(null); // added as suggested by Tom
em.remove(cub1);
@@ -226,7 +226,7 @@ public void testRelationshipToRemoved() {
em.persist(emp1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
proj = em.find(Project.class, proj.getId());
emp1.getProjects().size();
em.remove(proj);
@@ -275,8 +275,8 @@ public void testRelationshipToRemoved() {
em.persist(emp2);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
- emp2 = em.find(Employee.class, new Integer(emp2.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
+ emp2 = em.find(Employee.class, Integer.valueOf(emp2.getId()));
proj = em.find(Project.class, proj.getId());
emp1.getProjects().size();
proj.getEmployees().size();
@@ -307,14 +307,14 @@ public void testRelationshipToRemoved() {
// case 1b: direct relationship Employee -> Cubicle (DELETE_EXECUTED) - 1:1
dep = new Department(111, "dep");
emp1 = new Employee(112, "first", "last", dep);
- cub1 = new Cubicle(new Integer(113), new Integer(112), "color", emp1);
+ cub1 = new Cubicle(Integer.valueOf(113), Integer.valueOf(112), "color", emp1);
env.beginTransaction(em);
em.persist(dep);
em.persist(emp1);
em.persist(cub1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
cub1 = em.find(Cubicle.class, cub1.getId());
em.remove(cub1);
em.flush();
@@ -352,7 +352,7 @@ public void testRelationshipToRemoved() {
em.persist(proj);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
proj = em.find(Project.class, proj.getId());
em.remove(proj);
em.flush();
@@ -403,8 +403,8 @@ public void testRelationshipToRemoved() {
em.persist(emp2);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
- emp2 = em.find(Employee.class, new Integer(emp2.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
+ emp2 = em.find(Employee.class, Integer.valueOf(emp2.getId()));
proj = em.find(Project.class, proj.getId());
emp1.getProjects().size();
projEmployees = proj.getEmployees();
@@ -475,10 +475,10 @@ public void testRelationshipToRemovedLazy() {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
proj = em.find(Project.class, proj.getId());
em.remove(proj);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
// copy all projects from emp1 to emp2 with out actually touching them
Employee emp2 = new Employee(203, "aaa", "bbb", dep);
proj.addEmployee(emp2); // added as suggested by Tom
@@ -523,10 +523,10 @@ public void testRelationshipToRemovedLazy() {
em.persist(emp1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(dep.getId()));
+ dep = em.find(Department.class, Integer.valueOf(dep.getId()));
proj = em.find(Project.class, proj.getId());
em.remove(proj);
- emp1 = em.find(Employee.class, new Integer(emp1.getId()));
+ emp1 = em.find(Employee.class, Integer.valueOf(emp1.getId()));
// copy all projects from emp1 to emp2 with out actually touching them
emp2 = new Employee(206, "aaa", "bbb", dep);
emp2.setProjects(emp1.getProjects());
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java
index ec795f6..f710013 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -44,7 +44,7 @@ public class TestGetReference extends JPA1Base {
private final Department _dep = new Department(1, "eins");
private final Department _dep2 = new Department(2, "zwei");
private final Employee _emp = new Employee(7, "first", "last", _dep);
- private final Cubicle _cub = new Cubicle(new Integer(1), new Integer(2), "yellow", _emp);
+ private final Cubicle _cub = new Cubicle(Integer.valueOf(1), Integer.valueOf(2), "yellow", _emp);
private final Patent _pat = new Patent("12345", 2007, "whatever", Date.valueOf("2007-01-01"));
private final CreditCardAccount _ccacc = new CreditCardAccount();
@@ -78,7 +78,7 @@ public void testSimple() {
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Employee emp = em.getReference(Employee.class, new Integer(7));
+ Employee emp = em.getReference(Employee.class, Integer.valueOf(7));
verify(em.contains(emp), "Object not managed");
env.commitTransactionAndClear(em);
} finally {
@@ -92,13 +92,13 @@ public void testPositivTx() {
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Employee emp = em.getReference(Employee.class, new Integer(7));
+ Employee emp = em.getReference(Employee.class, Integer.valueOf(7));
verify(em.contains(emp), "Object not managed");
verify(emp.getId() == 7, "wrong id");
verify(emp.getDepartment().getName().equals("eins"), "wrong department");
- emp = em.getReference(Employee.class, new Integer(7));
+ emp = em.getReference(Employee.class, Integer.valueOf(7));
verify(emp.getId() == 7, "wrong id");
- Department dep = em.getReference(Department.class, new Integer(1));
+ Department dep = em.getReference(Department.class, Integer.valueOf(1));
verify(em.contains(dep), "Object not loaded");
verify(dep.getId() == 1, "wrong id");
env.rollbackTransactionAndClear(em);
@@ -111,13 +111,13 @@ public void testPositivTx() {
public void testPositivNonTx() {
final EntityManager em = getEnvironment().getEntityManager();
try {
- Employee emp = em.getReference(Employee.class, new Integer(7));
+ Employee emp = em.getReference(Employee.class, Integer.valueOf(7));
try {
verify(emp.getId() == 7, "wrong id");
verify(emp.getDepartment().getName().equals("eins"), "wrong department");
- emp = em.getReference(Employee.class, new Integer(7));
+ emp = em.getReference(Employee.class, Integer.valueOf(7));
verify(emp.getId() == 7, "wrong id");
- Department dep = em.getReference(Department.class, new Integer(1));
+ Department dep = em.getReference(Department.class, Integer.valueOf(1));
verify(dep.getId() == 1, "wrong id");
} catch (PersistenceException e) {
if (getEnvironment().usesExtendedPC()) {
@@ -181,7 +181,7 @@ public void testNegativ() {
boolean operationFailed = false;
env.beginTransaction(em);
try {
- employee = em.getReference(Employee.class, new Integer(17 + 4));
+ employee = em.getReference(Employee.class, Integer.valueOf(17 + 4));
} catch (EntityNotFoundException e) {
// $JL-EXC$ expected behavior
operationFailed = true;
@@ -210,7 +210,7 @@ public void testIllegalArguments() {
final EntityManager em = getEnvironment().getEntityManager();
try {
try {
- em.getReference(String.class, new Integer(17 + 4));
+ em.getReference(String.class, Integer.valueOf(17 + 4));
flop("no IllegalArgumentException thrown");
} catch (IllegalArgumentException ex) {
verify(true, "");
@@ -244,8 +244,8 @@ public void testFindWithCompositeKey() {
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Integer one = new Integer(1);
- Integer two = new Integer(2);
+ Integer one = Integer.valueOf(1);
+ Integer two = Integer.valueOf(2);
CubiclePrimaryKeyClass cubKey = new CubiclePrimaryKeyClass(one, two);
Cubicle cub = em.getReference(Cubicle.class, cubKey);
verify(cub.getFloor().equals(one) && cub.getPlace().equals(two), "wrong cubicle");
@@ -656,7 +656,7 @@ public void testSerializeLoaded() throws IOException, ClassNotFoundException {
final EntityManager em = env.getEntityManager();
try {
// case 1: entity with standard serialization
- Employee emp = em.getReference(Employee.class, new Integer(7));
+ Employee emp = em.getReference(Employee.class, Integer.valueOf(7));
// load entity
emp.getFirstName();
Employee resultEmp = AbstractBaseTest.serializeDeserialize(emp);
@@ -665,7 +665,7 @@ public void testSerializeLoaded() throws IOException, ClassNotFoundException {
em.clear();
// case 2: entity with writeReplace
- Department dep = em.getReference(Department.class, new Integer(1));
+ Department dep = em.getReference(Department.class, Integer.valueOf(1));
// load entity
dep.getName();
Department resultDep = AbstractBaseTest.serializeDeserialize(dep);
@@ -674,9 +674,9 @@ public void testSerializeLoaded() throws IOException, ClassNotFoundException {
em.clear();
// case 3: related entities
- emp = em.getReference(Employee.class, new Integer(7));
+ emp = em.getReference(Employee.class, Integer.valueOf(7));
emp.getFirstName();
- dep = em.getReference(Department.class, new Integer(2));
+ dep = em.getReference(Department.class, Integer.valueOf(2));
dep.getName();
emp.setDepartment(dep);
Cubicle cub = em.getReference(Cubicle.class, new CubiclePrimaryKeyClass(1, 2));
@@ -698,7 +698,7 @@ public void testSerializeHollow() throws IOException, ClassNotFoundException {
final EntityManager em = env.getEntityManager();
try {
// case 1: entity with standard serialization
- Employee emp = em.getReference(Employee.class, new Integer(7));
+ Employee emp = em.getReference(Employee.class, Integer.valueOf(7));
boolean shouldFail = isHollow(emp);
try {
Employee resultEmp = AbstractBaseTest.serializeDeserialize(emp);
@@ -712,7 +712,7 @@ public void testSerializeHollow() throws IOException, ClassNotFoundException {
em.clear();
// case 2: entity with writeReplace
- Department dep = em.getReference(Department.class, new Integer(1));
+ Department dep = em.getReference(Department.class, Integer.valueOf(1));
shouldFail = isHollow(dep);
try {
Department resultDep = AbstractBaseTest.serializeDeserialize(dep);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestMerge.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestMerge.java
index ca092a9..7d23c1d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestMerge.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestMerge.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -105,12 +105,12 @@ public void testMergeDetachedWithRelation() {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
// relations of the managed employee
- Employee empManaged = em.find(Employee.class, new Integer(empDetached.getId()));
+ Employee empManaged = em.find(Employee.class, Integer.valueOf(empDetached.getId()));
empManaged.setFirstName("Adrian");
- revManaged = em.find(Review.class, new Integer(revManaged.getId()));
- Review revSamePKAsDetached = em.find(Review.class, new Integer(revDetached.getId()));
+ revManaged = em.find(Review.class, Integer.valueOf(revManaged.getId()));
+ Review revSamePKAsDetached = em.find(Review.class, Integer.valueOf(revDetached.getId()));
revSamePKAsDetached.setReviewText("same PK as detached review");
- revAddedInManagedEmp = em.find(Review.class, new Integer(revAddedInManagedEmp.getId()));
+ revAddedInManagedEmp = em.find(Review.class, Integer.valueOf(revAddedInManagedEmp.getId()));
em.persist(revAddedInManagedEmp);
empManaged.addReview(revManaged);
empManaged.addReview(revSamePKAsDetached);
@@ -218,7 +218,7 @@ public void testMergeManaged() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // object is now in state MANAGED
+ dep = em.find(Department.class, Integer.valueOf(id)); // object is now in state MANAGED
checkDepartment(dep, id, "MANAGED");
verify(em.contains(dep), "entity manager does not contain object");
mergeResult = em.merge(dep); // this should be ignored
@@ -247,7 +247,7 @@ public void testMergeRemoved() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
em.remove(dep);
// now the entity should be REMOVED
boolean failed = false;
@@ -277,7 +277,7 @@ public void testMergeRemoved() {
em.persist(depEM);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- depEM = em.find(Department.class, new Integer(id));
+ depEM = em.find(Department.class, Integer.valueOf(id));
checkDepartment(depEM, id, "REMOVE");
em.remove(depEM); // this is now in state REMOVED
failed = false;
@@ -302,7 +302,7 @@ public void testMergeRemoved() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
em.remove(dep);
em.flush();
// now the entity should be in state DELETE_EXECUTED
@@ -376,11 +376,11 @@ public void testMergeDetached() {
em.persist(depEM);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- depClient = em.find(Department.class, new Integer(id));
+ depClient = em.find(Department.class, Integer.valueOf(id));
env.commitTransactionAndClear(em);
env.beginTransaction(em);
depClient.setName(("NEW_NAME"));
- depEM = em.find(Department.class, new Integer(id)); // this is now in state managed
+ depEM = em.find(Department.class, Integer.valueOf(id)); // this is now in state managed
checkDepartment(depEM, id, "ORIGINAL");
verify(em.contains(depEM), "entity manager does not contain department -> it cannot be merged");
mergeResult = em.merge(depClient);
@@ -396,7 +396,7 @@ public void testMergeDetached() {
private void verifyExistence(final EntityManager em, int id, String name) {
Department dep;
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
verify(dep != null, "department not found");
verify(name.equals(dep.getName()), "department has wrong name: " + dep.getName());
}
@@ -458,8 +458,8 @@ public void testMergeNewWithRelation() {
em.persist(hobbyDetachedNotInPC);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- revManaged = em.find(Review.class, new Integer(revManaged.getId()));
- Review revSamePKAsDetached = em.find(Review.class, new Integer(revDetached.getId()));
+ revManaged = em.find(Review.class, Integer.valueOf(revManaged.getId()));
+ Review revSamePKAsDetached = em.find(Review.class, Integer.valueOf(revDetached.getId()));
revSamePKAsDetached.setReviewText("same PK as detached review");
empNew.addReview(revManaged);
empNew.addReview(revDetached);
@@ -552,10 +552,10 @@ public void testWithLazyRelationPending() {
em.persist(hobby2);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- Employee empDetached = em.find(Employee.class, new Integer(emp.getId()));
+ Employee empDetached = em.find(Employee.class, Integer.valueOf(emp.getId()));
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp = em.find(Employee.class, new Integer(emp.getId()));
+ emp = em.find(Employee.class, Integer.valueOf(emp.getId()));
emp.setFirstName("Managed");
emp = em.merge(empDetached);
verify(empDetached.getFirstName().equals(emp.getFirstName()), "Merged employee has wrong first name");
@@ -564,11 +564,11 @@ public void testWithLazyRelationPending() {
env.commitTransactionAndClear(em);
// Case 2: Change observer pending in detached object and loaded but unchanged in managed object
env.beginTransaction(em);
- empDetached = em.find(Employee.class, new Integer(emp.getId()));
+ empDetached = em.find(Employee.class, Integer.valueOf(emp.getId()));
emp.setFirstName("Detached");
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp = em.find(Employee.class, new Integer(emp.getId()));
+ emp = em.find(Employee.class, Integer.valueOf(emp.getId()));
emp.setFirstName("Managed");
Set<Review> reviews = emp.getReviews();
verify(reviews.size() == 2, "Employee has " + reviews.size() + " reviews, expected 2");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestPersist.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestPersist.java
index f96e1d0..0bb8575 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestPersist.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestPersist.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -141,7 +141,7 @@ private void verifyPersistManaged(boolean flushBeforePersist) {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
// find a department in the state MANAGED
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
verify(dep != null, "department not found");
dep.setName("CHANGED");
if (flushBeforePersist) {
@@ -186,7 +186,7 @@ private void verifyPersistRemoved(boolean flushBeforePersist) {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
em.remove(dep);
// now, the entity should be REMOVED
if (flushBeforePersist) {
@@ -197,7 +197,7 @@ private void verifyPersistRemoved(boolean flushBeforePersist) {
dep.setName("REINVIGORATED");
env.commitTransactionAndClear(em);
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
verify(dep != null, "department not found");
verify("REINVIGORATED".equals(dep.getName()), "department has wrong name: " + dep.getName());
@@ -214,7 +214,7 @@ private void verifyPersistRemoved(boolean flushBeforePersist) {
dep.setName("REINVIGORATED");
env.commitTransactionAndClear(em);
- dep = em.find(Department.class, new Integer(id2));
+ dep = em.find(Department.class, Integer.valueOf(id2));
verify(dep != null, "department not found");
verify("REINVIGORATED".equals(dep.getName()), "department has wrong name: " + dep.getName());
} finally {
@@ -315,7 +315,7 @@ public void testPersistDetached() throws SQLException {
env.commitTransactionAndClear(em);
verifyExistenceOnDatabase(id, "TMP_DEP");
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // this is now in state managed
+ dep = em.find(Department.class, Integer.valueOf(id)); // this is now in state managed
try {
em.persist(detachedDep);
} catch (EntityExistsException e) {
@@ -343,7 +343,7 @@ public void testPersistDetached() throws SQLException {
env.commitTransactionAndClear(em);
verifyExistenceOnDatabase(id, "TMP_DEP");
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
em.remove(dep); // this is now in state deleted
try {
em.persist(detachedDep);
@@ -388,7 +388,7 @@ public void testPersistDeleteExecuted() throws SQLException {
env.commitTransactionAndClear(em);
verifyExistenceOnDatabase(id, "TMP_DEP");
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
em.remove(dep);
em.flush();
try {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRefresh.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRefresh.java
index 5c9db18..3ff461b 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRefresh.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRefresh.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -101,7 +101,7 @@ public void testRefreshManagedNew() throws SQLException {
dep.setName("UPDATED");
env.commitTransactionAndClear(em);
// verify that updated name present on db
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
checkDepartment(dep, id, "UPDATED");
} finally {
closeEntityManager(em);
@@ -152,7 +152,7 @@ public void testRefreshManaged() throws SQLException {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // this is now in
+ dep = em.find(Department.class, Integer.valueOf(id)); // this is now in
// state MANAGED
dep.setName("UPDATED");
em.refresh(dep);
@@ -160,7 +160,7 @@ public void testRefreshManaged() throws SQLException {
verify(em.contains(dep), "Department is not managed");
env.commitTransactionAndClear(em);
// verify that original name present on db
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
checkDepartment(dep, id, "MANAGED");
// case 2: refresh with data changed on db in a different tx
id = 22;
@@ -170,7 +170,7 @@ public void testRefreshManaged() throws SQLException {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // this is now in
+ dep = em.find(Department.class, Integer.valueOf(id)); // this is now in
// state MANAGED
updateDepartmentOnDatabase(updatedDep);
em.refresh(dep);
@@ -179,7 +179,7 @@ public void testRefreshManaged() throws SQLException {
dep.setName("MANAGED");
env.commitTransactionAndClear(em);
// verify that original name present on db
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
checkDepartment(dep, id, "MANAGED");
} finally {
closeEntityManager(em);
@@ -208,7 +208,7 @@ public void testRefreshManagedCheckContains() throws SQLException {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // this is now in
+ dep = em.find(Department.class, Integer.valueOf(id)); // this is now in
// state MANAGED
deleteDepartmentFromDatabase(id);
verifyAbsenceFromDatabase(em, id);
@@ -235,7 +235,7 @@ private void doRefreshDeleted(int id, boolean flush) throws SQLException {
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
em.remove(dep);
if (flush) {
em.flush(); // this is now in state DELETE_EXECUTED
@@ -316,7 +316,7 @@ public void testRefreshDetached() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // this is now in
+ dep = em.find(Department.class, Integer.valueOf(id)); // this is now in
// state MANAGED
try {
em.refresh(detachedDep); // this object is detached
@@ -333,7 +333,7 @@ public void testRefreshDetached() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
em.remove(dep); // this is now in state DELETED
try {
em.refresh(detachedDep); // this object is detached
@@ -417,8 +417,8 @@ public void testRefreshManagedWithRelationships() {
em.persist(rev2);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp = em.find(Employee.class, new Integer(emp.getId()));
- rev1 = em.find(Review.class, new Integer(rev1.getId()));
+ emp = em.find(Employee.class, Integer.valueOf(emp.getId()));
+ rev1 = em.find(Review.class, Integer.valueOf(rev1.getId()));
Review rev3 = new Review(105, Date.valueOf("2006-02-05"), "Test coverage");
Set<Review> reviews = new HashSet<Review>();
reviews.add(rev1);
@@ -436,7 +436,7 @@ public void testRefreshManagedWithRelationships() {
}
env.commitTransactionAndClear(em);
// verify that original name present on db
- rev1 = em.find(Review.class, new Integer(rev1.getId()));
+ rev1 = em.find(Review.class, Integer.valueOf(rev1.getId()));
verify("UPDATED".equals(rev1.getReviewText()), "Rev1 has wrong text: " + rev1.getReviewText());
} finally {
closeEntityManager(em);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRemove.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRemove.java
index 9c0f8ca..6be2021 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRemove.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestRemove.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -96,7 +96,7 @@ private void verifyRemoveManaged(boolean flushBeforeRemove) throws SQLException
env.commitTransactionAndClear(em);
env.beginTransaction(em);
// find a department in the state MANAGED
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
verify(dep != null, "department not found");
dep.setName("NEW");
if (flushBeforeRemove) {
@@ -147,7 +147,7 @@ private void verifyRemoveRemoved(boolean flushBeforePersist) throws SQLException
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id1));
+ dep = em.find(Department.class, Integer.valueOf(id1));
em.remove(dep);
// no, the entity should be REMOVED
if (flushBeforePersist) {
@@ -251,7 +251,7 @@ public void testRemoveDetached() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id)); // object is now in state MANAGED
+ dep = em.find(Department.class, Integer.valueOf(id)); // object is now in state MANAGED
try {
em.remove(detachedDep);
} catch (IllegalArgumentException e) {
@@ -275,7 +275,7 @@ public void testRemoveDetached() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
em.remove(dep); // object is now in state DELETED
try {
em.remove(detachedDep);
@@ -318,7 +318,7 @@ public void testRemoveFlushRemoveAgain() {
em.persist(dep);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(id));
+ dep = em.find(Department.class, Integer.valueOf(id));
em.remove(dep);
em.flush();
try {
@@ -373,8 +373,8 @@ public void testRemoveWithCompositeKey() {
final JPAEnvironment env = getEnvironment();
final EntityManager em = env.getEntityManager();
try {
- Cubicle cub = new Cubicle(new Integer(30), new Integer(31), "green", null /* employee */);
- CubiclePrimaryKeyClass cubKey = new CubiclePrimaryKeyClass(new Integer(30), new Integer(31));
+ Cubicle cub = new Cubicle(Integer.valueOf(30), Integer.valueOf(31), "green", null /* employee */);
+ CubiclePrimaryKeyClass cubKey = new CubiclePrimaryKeyClass(Integer.valueOf(30), Integer.valueOf(31));
env.beginTransaction(em);
em.persist(cub);
env.commitTransactionAndClear(em);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestUpdate.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestUpdate.java
index 92eff1e..cd6fc2a 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestUpdate.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestUpdate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -33,7 +33,7 @@ public void testUpdateOfComposoiteKey() {
final JPAEnvironment env = getEnvironment();
final EntityManager em = env.getEntityManager();
try {
- CubiclePrimaryKeyClass cubKey = new CubiclePrimaryKeyClass(new Integer(40), new Integer(41));
+ CubiclePrimaryKeyClass cubKey = new CubiclePrimaryKeyClass(Integer.valueOf(40), Integer.valueOf(41));
Cubicle cub = new Cubicle(cubKey, "green", null /* employee */
);
env.beginTransaction(em);
@@ -59,8 +59,8 @@ public void testUpdateRelationWithCompositeKey() {
try {
Employee emp = new Employee(17, "first", "last", null /* department */
);
- CubiclePrimaryKeyClass key1 = new CubiclePrimaryKeyClass(new Integer(98), new Integer(99));
- CubiclePrimaryKeyClass key2 = new CubiclePrimaryKeyClass(new Integer(5), new Integer(6));
+ CubiclePrimaryKeyClass key1 = new CubiclePrimaryKeyClass(Integer.valueOf(98), Integer.valueOf(99));
+ CubiclePrimaryKeyClass key2 = new CubiclePrimaryKeyClass(Integer.valueOf(5), Integer.valueOf(6));
Cubicle cub1 = new Cubicle(key1, "orange", emp);
env.beginTransaction(em);
emp.setCubicle(cub1);
@@ -68,12 +68,12 @@ public void testUpdateRelationWithCompositeKey() {
em.persist(cub1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp = em.find(Employee.class, new Integer(17));
+ emp = em.find(Employee.class, Integer.valueOf(17));
Cubicle cub2 = new Cubicle(key2, "dusky pink", emp);
emp.setCubicle(cub2);
em.persist(cub2);
env.commitTransactionAndClear(em);
- emp = em.find(Employee.class, new Integer(17));
+ emp = em.find(Employee.class, Integer.valueOf(17));
verify(emp != null, "employee lost");
verify(emp.getCubicle() != null, "cubicle lost");
CubiclePrimaryKeyClass key = emp.getCubicle().getId();
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestLockMethod.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestLockMethod.java
index a8df07c..fa70d4e 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestLockMethod.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestLockMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -256,11 +256,11 @@ private void lockOldVersion(int id, LockModeType lockMode) {
env.commitTransactionAndClear(em1);
// read first version
env.beginTransaction(em1);
- dep1 = em1.find(Department.class, new Integer(id));
+ dep1 = em1.find(Department.class, Integer.valueOf(id));
verify(dep1 != null, "Department is null");
// change entity meanwhile
env.beginTransaction(em2);
- Department dep2 = em2.find(Department.class, new Integer(id));
+ Department dep2 = em2.find(Department.class, Integer.valueOf(id));
dep2.setName("dep" + id + "x");
env.commitTransactionAndClear(em2);
// try to lock first version
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestOptimistic.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestOptimistic.java
index 8b23973..a319f45 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestOptimistic.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/lock/TestOptimistic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -58,14 +58,14 @@ public void testOptimisticLockExceptionUpdateUpdate() {
env.commitTransactionAndClear(em1);
env.beginTransaction(em1);
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
rev1.getVersion();
EntityManager em2 = env.getEntityManagerFactory().createEntityManager();
try {
env.beginTransaction(em2);
- Review rev2 = em2.find(Review.class, new Integer(id));
+ Review rev2 = em2.find(Review.class, Integer.valueOf(id));
rev2.setReviewText("two"); // 1 update
env.commitTransactionAndClear(em2);
} finally {
@@ -109,10 +109,10 @@ public void testOptimisticLockExceptionDeleteUpdate() {
env.commitTransactionAndClear(em1);
env.beginTransaction(em1);
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
env.beginTransaction(em2);
- Review rev2 = em2.find(Review.class, new Integer(id));
+ Review rev2 = em2.find(Review.class, Integer.valueOf(id));
em2.remove(rev2); // 1 delete
env.commitTransactionAndClear(em2);
rev1.setReviewText("1"); // 2 update
@@ -149,10 +149,10 @@ public void testOptimisticLockExceptionUpdateDelete() {
em1.persist(rev1);
env.commitTransactionAndClear(em1);
env.beginTransaction(em1);
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
env.beginTransaction(em2);
- Review rev2 = em2.find(Review.class, new Integer(id));
+ Review rev2 = em2.find(Review.class, Integer.valueOf(id));
rev2.setReviewDate(Date.valueOf("2005-12-23")); // 1 update
env.commitTransactionAndClear(em2);
em1.remove(rev1); // 2 delete
@@ -186,10 +186,10 @@ public void testOptimisticLockExceptionDeleteDelete() {
em1.persist(rev1);
env.commitTransactionAndClear(em1);
env.beginTransaction(em1);
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
env.beginTransaction(em2);
- Review rev2 = em2.find(Review.class, new Integer(id));
+ Review rev2 = em2.find(Review.class, Integer.valueOf(id));
em2.remove(rev2); // 1 delete
env.commitTransactionAndClear(em2);
em1.remove(rev1); // 2 delete
@@ -218,7 +218,7 @@ public void testNoChange() {
env.commitTransactionAndClear(em);
version = rev.getVersion();
env.beginTransaction(em);
- rev = em.find(Review.class, new Integer(id));
+ rev = em.find(Review.class, Integer.valueOf(id));
verify(rev != null, "Review is null");
rev.setReviewText(rev.getReviewText()); // no change
env.commitTransactionAndClear(em);
@@ -297,7 +297,7 @@ public void testFlushWithVersion() {
rev = em.merge(rev);
em.flush();
env.commitTransactionAndClear(em); // still 4th version
- rev = em.find(Review.class, new Integer(id));
+ rev = em.find(Review.class, Integer.valueOf(id));
verify(rev.getReviewText().equals("BBB"), "wrong reviewText");
verify(rev.getReviewDate().equals(Date.valueOf("2005-12-23")), "wrong reviewDate");
verify(rev.getVersion() == startVersion + 3, "wrong version");
@@ -340,10 +340,10 @@ public void testRefreshWithVersion() {
em1.persist(rev1);
env.commitTransactionAndClear(em1);
env.beginTransaction(em1);
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
env.beginTransaction(em2);
- Review rev2 = em2.find(Review.class, new Integer(id));
+ Review rev2 = em2.find(Review.class, Integer.valueOf(id));
rev2.setReviewDate(Date.valueOf("2005-12-23"));
env.commitTransactionAndClear(em2);
em1.refresh(rev1);
@@ -368,9 +368,9 @@ public void testVersion() {
env.commitTransactionAndClear(em);
for (int i = 0; i < 3; i++) {
env.beginTransaction(em);
- rev = em.find(Review.class, new Integer(id));
+ rev = em.find(Review.class, Integer.valueOf(id));
verify(rev != null, "Review is null");
- rev.setReviewText(new Integer(i).toString());
+ rev.setReviewText(Integer.valueOf(i).toString());
env.commitTransactionAndClear(em);
verify(version < rev.getVersion(), "new version to small");
version = rev.getVersion();
@@ -391,7 +391,7 @@ public void testPersistAgain() {
em.persist(rev1);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- rev1 = em.find(Review.class, new Integer(id));
+ rev1 = em.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
em.persist(rev1);
verify(rev1.getVersion() > 0, "Version reset");
@@ -417,17 +417,17 @@ public void testIsoLevel() throws SQLException {
em1.persist(rev1);
env.commitTransactionAndClear(em1);
env.beginTransaction(em1); // Tx1 read and flush change
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
rev1.setReviewText("2");
em1.flush();
env.beginTransaction(em2); // Tx2 read flushed entity ?
- Review rev2 = em2.find(Review.class, new Integer(id));
+ Review rev2 = em2.find(Review.class, Integer.valueOf(id));
verify(rev2 != null, "Review is null");
env.rollbackTransactionAndClear(em1); // Tx1 rollback first change
// and commit second
env.beginTransaction(em1);
- rev1 = em1.find(Review.class, new Integer(id));
+ rev1 = em1.find(Review.class, Integer.valueOf(id));
verify(rev1 != null, "Review is null");
rev1.setReviewText("3");
env.commitTransactionAndClear(em1);
@@ -458,7 +458,7 @@ public void testNode() {
em.persist(first);
for (int i = 1; i < NUMBER_OF_NODES; i++) {
Node tmp = new Node(i, parent);
- tmp.setName(new Integer(i).toString());
+ tmp.setName(Integer.valueOf(i).toString());
em.persist(tmp);
parent = tmp;
}
@@ -473,7 +473,7 @@ public void testNode() {
private void updateNodes(JPAEnvironment env, EntityManager em, String newName) {
env.beginTransaction(em);
- Node tmp = em.find(Node.class, new Integer(0));
+ Node tmp = em.find(Node.class, Integer.valueOf(0));
verify(tmp.getVersion() != 0, "wrong version");
while (tmp != null) {
tmp.setName(newName);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestArguments.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestArguments.java
index 66b4a68..bf30b3d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestArguments.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestArguments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -88,7 +88,7 @@ public void testArgumentInArithmeticExpr() throws SQLException {
Query updateQuery = em
.createQuery("UPDATE Employee e SET e.salary = e.salary*(1+(:percent/100)) WHERE EXISTS (SELECT p FROM e.projects p WHERE p.name LIKE :projectName)");
- updateQuery.setParameter("percent", new Integer(15));
+ updateQuery.setParameter("percent", Integer.valueOf(15));
updateQuery.setParameter("projectName", "testing project");
updateQuery.executeUpdate();
@@ -279,7 +279,7 @@ public void testPrimitiveBoolean() {
@Test
public void testPrimitiveByte() {
- assertValidParameterForBasicTypesFieldAccess("primititveByte", new Byte((byte) 2));
+ assertValidParameterForBasicTypesFieldAccess("primititveByte", Byte.valueOf((byte) 2));
}
@Test
@@ -315,42 +315,42 @@ public void testPrimitiveDouble() {
// wrappers of primitive types
@Test
public void testWrapperBoolean() {
- assertValidParameterForBasicTypesFieldAccess("wrapperBoolean", new Boolean(true));
+ assertValidParameterForBasicTypesFieldAccess("wrapperBoolean", Boolean.valueOf(true));
}
@Test
public void testWrapperByte() {
- assertValidParameterForBasicTypesFieldAccess("wrapperByte", new Byte((byte) 2));
+ assertValidParameterForBasicTypesFieldAccess("wrapperByte", Byte.valueOf((byte) 2));
}
@Test
public void testWrapperCharacter() {
- assertValidParameterForBasicTypesFieldAccess("wrapperCharacter", new Character('c'));
+ assertValidParameterForBasicTypesFieldAccess("wrapperCharacter", Character.valueOf('c'));
}
@Test
public void testWrapperShort() {
- assertValidParameterForBasicTypesFieldAccess("wrapperShort", new Short((short) 1));
+ assertValidParameterForBasicTypesFieldAccess("wrapperShort", Short.valueOf((short) 1));
}
@Test
public void testWrapperInteger() {
- assertValidParameterForBasicTypesFieldAccess("wrapperInteger", new Integer(1));
+ assertValidParameterForBasicTypesFieldAccess("wrapperInteger", Integer.valueOf(1));
}
@Test
public void testWrapperLong() {
- assertValidParameterForBasicTypesFieldAccess("wrapperLong", new Long(1L));
+ assertValidParameterForBasicTypesFieldAccess("wrapperLong", Long.valueOf(1L));
}
@Test
public void testWrapperDouble() {
- assertValidParameterForBasicTypesFieldAccess("wrapperDouble", new Double(0.00));
+ assertValidParameterForBasicTypesFieldAccess("wrapperDouble", Double.valueOf(0.00));
}
@Test
public void testWrapperFloat() {
- assertValidParameterForBasicTypesFieldAccess("wrapperFloat", new Float(1F));
+ assertValidParameterForBasicTypesFieldAccess("wrapperFloat", Float.valueOf(1F));
}
// immutable reference types
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java
index 3d9e1ce..f81ded3 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestExtendedQueries.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -98,7 +98,7 @@ protected void resetData() {
protected String getRandomSurname() {
String tmpName = SURNAMES[nameRandomizer.nextInt(SURNAMES.length)];
if (!NUMBER_OF_SURNAMES_USED.containsKey(tmpName)) {
- NUMBER_OF_SURNAMES_USED.put(tmpName, new Integer(1));
+ NUMBER_OF_SURNAMES_USED.put(tmpName, Integer.valueOf(1));
} else {
Integer tmpNum = NUMBER_OF_SURNAMES_USED.get(tmpName);
tmpNum = Integer.valueOf(tmpNum.intValue() + 1);
@@ -110,7 +110,7 @@ protected String getRandomSurname() {
protected String getRandomGivenName() {
String tmpName = GIVEN_NAMES[nameRandomizer.nextInt(GIVEN_NAMES.length)];
if (!NUMBER_OF_GIVEN_NAMES_USED.containsKey(tmpName)) {
- NUMBER_OF_GIVEN_NAMES_USED.put(tmpName, new Integer(1));
+ NUMBER_OF_GIVEN_NAMES_USED.put(tmpName, Integer.valueOf(1));
} else {
Integer tmpNum = NUMBER_OF_GIVEN_NAMES_USED.get(tmpName);
tmpNum = Integer.valueOf(tmpNum.intValue() + 1);
@@ -282,7 +282,7 @@ public void testQueryWithBuiltinAbs() throws Exception {
try {
// test string-mapping of enums
Query query = em.createQuery("Select DISTINCT Object(emp) From Employee emp WHERE emp.salary > ABS(:dbl)");
- query.setParameter("dbl", new Double(1180D));
+ query.setParameter("dbl", Double.valueOf(1180D));
query.getResultList();
} finally {
closeEntityManager(em);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
index dca9a07..3b44b8f 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -45,7 +45,7 @@ public void testInsert() {
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(0));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(0));
} finally {
closeEntityManager(em);
}
@@ -295,7 +295,7 @@ public boolean isComparableJdbcType() {
public void testWrapperByte() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperByte(new Byte((byte) 17));
+ obj.setWrapperByte(Byte.valueOf((byte) 17));
}
public boolean isComparableJdbcType() {
@@ -314,7 +314,7 @@ public Query createQuery(EntityManager em, int id) {
public void testWrapperCharacter() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperCharacter(new Character('A'));
+ obj.setWrapperCharacter(Character.valueOf('A'));
}
public boolean isComparableJdbcType() {
@@ -333,7 +333,7 @@ public Query createQuery(EntityManager em, int id) {
public void testWrapperShort() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperShort(new Short((short) 1));
+ obj.setWrapperShort(Short.valueOf((short) 1));
}
public boolean isComparableJdbcType() {
@@ -352,7 +352,7 @@ public Query createQuery(EntityManager em, int id) {
public void testWrapperInteger() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperInteger(new Integer(1));
+ obj.setWrapperInteger(Integer.valueOf(1));
}
public boolean isComparableJdbcType() {
@@ -371,7 +371,7 @@ public Query createQuery(EntityManager em, int id) {
public void testWrapperLong() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperLong(new Long(1));
+ obj.setWrapperLong(Long.valueOf(1));
}
public boolean isComparableJdbcType() {
@@ -390,7 +390,7 @@ public Query createQuery(EntityManager em, int id) {
public void testWrapperDouble() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperDouble(new Double(1));
+ obj.setWrapperDouble(Double.valueOf(1));
}
public boolean isComparableJdbcType() {
@@ -409,7 +409,7 @@ public Query createQuery(EntityManager em, int id) {
public void testWrapperFloat() {
Validator validator = new Validator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperFloat(new Float(1));
+ obj.setWrapperFloat(Float.valueOf(1));
}
public boolean isComparableJdbcType() {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestQueryAPI.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestQueryAPI.java
index 2cb2d93..3dcd379 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestQueryAPI.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestQueryAPI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -129,11 +129,11 @@ public void testParameterSetting() {
// test invalid typed ordered param
Query q3 = em.createQuery(queryStringOrderedParam);
- assertOrderedParameterInvalid(q3, 1, new Integer(2));
+ assertOrderedParameterInvalid(q3, 1, Integer.valueOf(2));
// test invalid typed named param
Query q4 = em.createQuery(queryStringNamedParam);
- assertNamedParameterInvalid(q4, "firstname", new Integer(3));
+ assertNamedParameterInvalid(q4, "firstname", Integer.valueOf(3));
// test invalid named ordered param
Query q5 = em.createQuery(queryStringOrderedParam);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java
index 94486f5..ef792d6 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectListTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -46,7 +46,7 @@ protected void setup() throws SQLException {
env.beginTransaction(em);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(0));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(0));
} finally {
closeEntityManager(em);
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSimpleQuery.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSimpleQuery.java
index 79f84f3..cce5719 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSimpleQuery.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSimpleQuery.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -210,11 +210,11 @@ private void verifyComparisonPrepdicateResult(EntityManager em, String txt, int.
Set<Integer> actual = new HashSet<Integer>();
for (Object object : result) {
BasicTypesFieldAccess fa = (BasicTypesFieldAccess) object;
- actual.add(new Integer(fa.getId()));
+ actual.add(Integer.valueOf(fa.getId()));
}
Set<Integer> expected = new HashSet<Integer>();
for (int i : ids) {
- expected.add(new Integer(i));
+ expected.add(Integer.valueOf(i));
}
verify(expected.equals(actual), "expecetd and actual sets are different for query >>" + txt + "<<");
}
@@ -549,7 +549,7 @@ public void testQueryWithFlush() throws SQLException {
em.persist(dep10);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- Department dep = em.find(Department.class, new Integer(10));
+ Department dep = em.find(Department.class, Integer.valueOf(10));
dep.setName("newName");
em.flush();
Query query = em.createQuery("select d from Department d where d.name = :name");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalManyToMany.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalManyToMany.java
index 33e051f..689272d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalManyToMany.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalManyToMany.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -47,10 +47,10 @@
public class TestBidirectionalManyToMany extends JPA1Base {
private static final int HANS_ID_VALUE = 1;
- private static final Integer HANS_ID = new Integer(HANS_ID_VALUE);
+ private static final Integer HANS_ID = Integer.valueOf(HANS_ID_VALUE);
private static final Set<Pair> HANS_SET = new HashSet<Pair>();
private static final int FRED_ID_VALUE = 2;
- private static final Integer FRED_ID = new Integer(FRED_ID_VALUE);
+ private static final Integer FRED_ID = Integer.valueOf(FRED_ID_VALUE);
private static final Set<Pair> FRED_SET = new HashSet<Pair>();
private static final Set<Pair> SEED_SET = new HashSet<Pair>();
private static final Project PUHLEN = new Project("G\u00fcrteltiere puhlen");
@@ -348,7 +348,7 @@ public void testExchange() throws SQLException {
}
private void verifyEmployees(EntityManager em, int id, int size) {
- Project project = em.find(Project.class, new Integer(id));
+ Project project = em.find(Project.class, Integer.valueOf(id));
verify(project != null, "project not found");
Set<Employee> employees = project.getEmployees();
verify(employees.size() == size, "wrong number of employees: " + employees.size() + " expected: " + size);
@@ -388,7 +388,7 @@ public void testCopyProjectsToNew() throws SQLException {
}
checkJoinTable(expected);
env.beginTransaction(em);
- paul = em.find(Employee.class, new Integer(newId));
+ paul = em.find(Employee.class, Integer.valueOf(newId));
verify(paul.getProjects().size() == HANS_SET.size(), "Paul has wrong number of projects");
env.rollbackTransactionAndClear(em);
} finally {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalOneToOne.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalOneToOne.java
index 978aef0..a9daaad 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalOneToOne.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestBidirectionalOneToOne.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -33,10 +33,10 @@ public class TestBidirectionalOneToOne extends JPA1Base {
private static final int HANS_ID_VALUE = 1;
private static final int FRED_ID_VALUE = 2;
- private static final Integer HANS_ID = new Integer(HANS_ID_VALUE);
- private static final Integer FRED_ID = new Integer(FRED_ID_VALUE);
- private static final CubiclePrimaryKeyClass GREEN_CUBICLE_ID = new CubiclePrimaryKeyClass(new Integer(10), new Integer(20));
- private static final CubiclePrimaryKeyClass BLUE_CUBICLE_ID = new CubiclePrimaryKeyClass(new Integer(33), new Integer(44));
+ private static final Integer HANS_ID = Integer.valueOf(HANS_ID_VALUE);
+ private static final Integer FRED_ID = Integer.valueOf(FRED_ID_VALUE);
+ private static final CubiclePrimaryKeyClass GREEN_CUBICLE_ID = new CubiclePrimaryKeyClass(Integer.valueOf(10), Integer.valueOf(20));
+ private static final CubiclePrimaryKeyClass BLUE_CUBICLE_ID = new CubiclePrimaryKeyClass(Integer.valueOf(33), Integer.valueOf(44));
@Before
public void seedDataModel() throws SQLException {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployeePatent.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployeePatent.java
index 462fb32..931c89a 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployeePatent.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployeePatent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -38,8 +38,8 @@
import org.junit.Test;
public class TestEmployeePatent extends JPA1Base {
- private static final Integer EDISON = new Integer(26);
- private static final Integer TESLA = new Integer(32);
+ private static final Integer EDISON = Integer.valueOf(26);
+ private static final Integer TESLA = Integer.valueOf(32);
@Override
public void setup() {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Cubicle.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Cubicle.java
index daccf05..a6ad5e7 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Cubicle.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Cubicle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -35,7 +35,7 @@ public void setup() {
env.beginTransaction(em);
Department dep = new Department(9, "neun");
Employee emp = new Employee(5, "first", "last", dep);
- Cubicle cub = new Cubicle(new Integer(3), new Integer(4), "red", emp);
+ Cubicle cub = new Cubicle(Integer.valueOf(3), Integer.valueOf(4), "red", emp);
emp.setCubicle(cub);
em.persist(dep);
em.persist(emp);
@@ -51,7 +51,7 @@ public void setup() {
public void testRelationToCompositeKey() {
final EntityManager em = getEnvironment().getEntityManager();
try {
- Employee employee = em.find(Employee.class, new Integer(5));
+ Employee employee = em.find(Employee.class, Integer.valueOf(5));
verify(employee.getId() == 5, "wrong employee");
verify(employee.getCubicle() != null, "cubicle is null");
verify(employee.getCubicle().getFloor() != null, "floor is null");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Review.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Review.java
index ba7e5a2..d38cba8 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Review.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEmployee_Review.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -55,11 +55,11 @@ public void setup() {
em.persist(_review2);
em.flush();
env.commitTransactionAndClear(em);
- Review rev = em.find(Review.class, new Integer(12));
+ Review rev = em.find(Review.class, Integer.valueOf(12));
verify(rev != null, "Review null");
verify(rev.getId() == 12, "wrong review");
env.beginTransaction(em);
- Employee employee = em.find(Employee.class, new Integer(7));
+ Employee employee = em.find(Employee.class, Integer.valueOf(7));
verify(employee != null, "employee not found");
Set reviews = employee.getReviews();
verify(reviews.size() == 2, "set has wrong size");
@@ -74,7 +74,7 @@ public void setup() {
public void testFindIndividualReview() {
final EntityManager em = getEnvironment().getEntityManager();
try {
- Review rev = em.find(Review.class, new Integer(12));
+ Review rev = em.find(Review.class, Integer.valueOf(12));
verify(rev != null, "Review null");
verify(rev.getId() == 12, "wrong review");
} finally {
@@ -88,7 +88,7 @@ public void testNavigateReviewsInTransaction() {
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Employee employee = em.find(Employee.class, new Integer(7));
+ Employee employee = em.find(Employee.class, Integer.valueOf(7));
verify(employee != null, "employee not found");
Set reviews = employee.getReviews();
verify(reviews.size() == 2, "set has wrong size");
@@ -118,7 +118,7 @@ public void testNavigateReviewsOutsideTransaction() {
} else {
failureExpected = true;
}
- Employee employee = em.find(Employee.class, new Integer(7));
+ Employee employee = em.find(Employee.class, Integer.valueOf(7));
verify(employee != null, "employee not found");
Set reviews = employee.getReviews();
try {
@@ -142,7 +142,7 @@ public void testNavigateDeserializedEmployeeFails() throws IOException, ClassNot
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Employee employee = em.find(Employee.class, new Integer(7));
+ Employee employee = em.find(Employee.class, Integer.valueOf(7));
verify(employee != null, "employee not found");
employee = AbstractBaseTest.serializeDeserialize(employee);
Set reviews = employee.getReviews();
@@ -167,7 +167,7 @@ public void testNavigatedReviewsCanBeDeserialized() throws IOException, ClassNot
final EntityManager em = env.getEntityManager();
try {
env.beginTransaction(em);
- Employee employee = em.find(Employee.class, new Integer(7));
+ Employee employee = em.find(Employee.class, Integer.valueOf(7));
verify(employee != null, "employee not found");
Set reviews = employee.getReviews();
// touch the set
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestMultipleRelationships.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestMultipleRelationships.java
index 5962e95..01258af 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestMultipleRelationships.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestMultipleRelationships.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -37,7 +37,7 @@
public class TestMultipleRelationships extends JPA1Base {
private static final int HANS_ID_VALUE = 1;
private static final int FRED_ID_VALUE = 2;
- private static final Integer HANS_ID = new Integer(HANS_ID_VALUE);
+ private static final Integer HANS_ID = Integer.valueOf(HANS_ID_VALUE);
private static final Project PUHLEN = new Project("G\u00fcrteltiere puhlen");
private static final Project PINSELN = new Project("B\u00e4uche pinseln");
private static final Project FALTEN = new Project("Zitronen falten");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestNode.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestNode.java
index 75f2671..3fb868d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestNode.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -41,7 +41,7 @@ public void testRoot() {
em.persist(root);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- Node found = em.find(Node.class, new Integer(rootId));
+ Node found = em.find(Node.class, Integer.valueOf(rootId));
verify(found != null, "no node found");
verify(found.getParent() == null, "parent not null");
verify(found.getChildren().size() == 0, "unexpected children");
@@ -67,13 +67,13 @@ public void testTwoGenerations() {
em.persist(child2);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- Node found = em.find(Node.class, new Integer(rootId));
+ Node found = em.find(Node.class, Integer.valueOf(rootId));
verify(found != null, "no node found");
verify(found.getParent() == null, "parent not null");
verify(found.getChildren().size() == 2, "unexpected children");
env.rollbackTransactionAndClear(em);
env.beginTransaction(em);
- found = em.find(Node.class, new Integer(child1Id));
+ found = em.find(Node.class, Integer.valueOf(child1Id));
verify(found != null, "no node found");
Node parent = found.getParent();
verify(em.contains(parent), "parent not contained in em");
@@ -106,9 +106,9 @@ public void testChangeParent() {
env.commitTransactionAndClear(em);
// change the parent
env.beginTransaction(em);
- child = em.find(Node.class, new Integer(childId));
+ child = em.find(Node.class, Integer.valueOf(childId));
Node parent = child.getParent();
- root2 = em.find(Node.class, new Integer(root2Id));
+ root2 = em.find(Node.class, Integer.valueOf(root2Id));
Set<Node> children = parent.getChildren();
parent.setChildren(null);
child.setParent(root2);
@@ -119,16 +119,16 @@ public void testChangeParent() {
verify(child.postUpdateWasCalled(), "child was not updated but it is the owning side of the relationship");
// check the relationship
env.beginTransaction(em);
- child = em.find(Node.class, new Integer(childId));
+ child = em.find(Node.class, Integer.valueOf(childId));
verify(child != null, "child is null");
parent = child.getParent();
verify(parent != null, "parent is null");
- root2 = em.find(Node.class, new Integer(root2Id));
+ root2 = em.find(Node.class, Integer.valueOf(root2Id));
verify(root2 == parent, "root2 != parent");
verify(children != null, "children is null");
children = root2.getChildren();
verify(children.contains(child), "child not contained in set of children");
- root1 = em.find(Node.class, new Integer(root1Id));
+ root1 = em.find(Node.class, Integer.valueOf(root1Id));
Set children1 = root1.getChildren();
verify(children1 == null || children1.isEmpty(), "children of root1 not null or empty");
env.rollbackTransactionAndClear(em);
@@ -153,7 +153,7 @@ public void testCircle() {
em.persist(root);
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- Node found = em.find(Node.class, new Integer(rootId));
+ Node found = em.find(Node.class, Integer.valueOf(rootId));
verify(found != null, "no node found");
verify(found.getParent() == found, "parent != root");
verify(found.getChildren().size() == 1, "unexpected children");
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToMany.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToMany.java
index 95e37fd..3e71c34 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToMany.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToMany.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -40,7 +40,7 @@
public class TestUnidirectionalOneToMany extends JPA1Base {
private static final int EMP_ID_VALUE = 4;
- private static final Integer EMP_ID = new Integer(EMP_ID_VALUE);
+ private static final Integer EMP_ID = Integer.valueOf(EMP_ID_VALUE);
private static final Set<Pair> SEED_SET = new HashSet<Pair>();
static {
SEED_SET.add(new Pair(EMP_ID_VALUE, 1));
@@ -179,7 +179,7 @@ public void testDeleteReview() throws SQLException {
emp = em.find(Employee.class, EMP_ID);
reviews = emp.getReviews();
verify(reviews.size() == 2, "not exactly 2 reviews but " + reviews.size());
- Object object = em.find(Review.class, new Integer(removedId));
+ Object object = em.find(Review.class, Integer.valueOf(removedId));
verify(object == null, "review found");
env.rollbackTransactionAndClear(em);
} finally {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToOne.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToOne.java
index 667a582..53fe519 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToOne.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestUnidirectionalOneToOne.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -32,8 +32,8 @@
public class TestUnidirectionalOneToOne extends JPA1Base {
private static final int HANS_ID_VALUE = 1;
private static final int FRED_ID_VALUE = 2;
- private static final Integer HANS_ID = new Integer(HANS_ID_VALUE);
- private static final Integer FRED_ID = new Integer(FRED_ID_VALUE);
+ private static final Integer HANS_ID = Integer.valueOf(HANS_ID_VALUE);
+ private static final Integer FRED_ID = Integer.valueOf(FRED_ID_VALUE);
private static final byte[] SMOKER_GUID = new byte[16];
private static final byte[] NON_SMOKER_GUID = new byte[16];
static {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/SimpleTest.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/SimpleTest.java
index 7c30a77..cd665bf 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/SimpleTest.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/SimpleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -47,21 +47,21 @@ public void testSimple() {
em.flush();
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- dep = em.find(Department.class, new Integer(8));
+ dep = em.find(Department.class, Integer.valueOf(8));
verify(dep != null, "department is null");
- Department dep2 = em.find(Department.class, new Integer(8));
+ Department dep2 = em.find(Department.class, Integer.valueOf(8));
verify(dep == dep2, "department is not unique");
- emp = em.find(Employee.class, new Integer(3));
+ emp = em.find(Employee.class, Integer.valueOf(3));
verify(emp != null, "employee is null");
- Employee emp2 = em.find(Employee.class, new Integer(3));
+ Employee emp2 = em.find(Employee.class, Integer.valueOf(3));
verify(emp == emp2, "employee is not unique");
emp.setLastName(HASTIG);
dep.setName("88888888");
em.flush();
env.commitTransactionAndClear(em);
env.beginTransaction(em);
- emp = em.find(Employee.class, new Integer(3));
- dep = em.find(Department.class, new Integer(8));
+ emp = em.find(Employee.class, Integer.valueOf(3));
+ dep = em.find(Department.class, Integer.valueOf(8));
verify(emp != null, "employee is null");
verify(HASTIG.equals(emp.getLastName()), "employee has wrong last name: " + emp.getLastName());
em.remove(emp);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
index 5579b95..10cb6e0 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -51,7 +51,7 @@ public void testInsert() {
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(0));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(0));
} finally {
closeEntityManager(em);
}
@@ -68,24 +68,24 @@ private void validatePrimitive(final int id, Validator validator, String fieldNa
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// update unchanged object
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
verify(!obj.postUpdateWasCalled(), "postUpdate was called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " is changed");
// update changed object
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.change(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isChanged(obj), fieldName + " is unchanged");
} finally {
closeEntityManager(em);
@@ -101,11 +101,11 @@ private void validateReference(final int id, ReferenceValidator validator, Strin
env.beginTransaction(em);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
// delete the object again
env.beginTransaction(em);
- em.remove(em.find(BasicTypesFieldAccess.class, new Integer(id)));
+ em.remove(em.find(BasicTypesFieldAccess.class, Integer.valueOf(id)));
env.commitTransactionAndClear(em);
// insert object with non-null field
env.beginTransaction(em);
@@ -113,33 +113,33 @@ private void validateReference(final int id, ReferenceValidator validator, Strin
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// update unchanged
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
verify(!obj.postUpdateWasCalled(), "postUpdate was called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " is changed");
// update changed object
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.change(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isChanged(obj), fieldName + " is unchanged");
// update to null
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
} finally {
closeEntityManager(em);
@@ -155,11 +155,11 @@ private void validateMutable(final int id, MutableValidator validator, String fi
env.beginTransaction(em);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
// delete the object again
env.beginTransaction(em);
- em.remove(em.find(BasicTypesFieldAccess.class, new Integer(id)));
+ em.remove(em.find(BasicTypesFieldAccess.class, Integer.valueOf(id)));
env.commitTransactionAndClear(em);
// insert object with non-null field
env.beginTransaction(em);
@@ -167,49 +167,49 @@ private void validateMutable(final int id, MutableValidator validator, String fi
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// update unchanged
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
verify(!obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " is changed");
// update changed
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
// update original
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
validator.set(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// mutate
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.mutate(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isChanged(obj), fieldName + " not mutated");
// update to null
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
} finally {
closeEntityManager(em);
@@ -392,11 +392,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperByte() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperByte(new Byte((byte) 17));
+ obj.setWrapperByte(Byte.valueOf((byte) 17));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperByte(new Byte((byte) 18));
+ obj.setWrapperByte(Byte.valueOf((byte) 18));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -408,7 +408,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperByte().equals(new Byte((byte) 17));
+ return !obj.getWrapperByte().equals(Byte.valueOf((byte) 17));
}
};
validateReference(12, validator, "wrapperByte");
@@ -418,11 +418,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperCharacter() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperCharacter(new Character('A'));
+ obj.setWrapperCharacter(Character.valueOf('A'));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperCharacter(new Character('B'));
+ obj.setWrapperCharacter(Character.valueOf('B'));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -434,7 +434,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperCharacter().equals(new Character('A'));
+ return !obj.getWrapperCharacter().equals(Character.valueOf('A'));
}
};
validateReference(13, validator, "wrapperCharacter");
@@ -444,11 +444,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperShort() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperShort(new Short((short) 1));
+ obj.setWrapperShort(Short.valueOf((short) 1));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperShort(new Short((short) 2));
+ obj.setWrapperShort(Short.valueOf((short) 2));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -460,7 +460,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperShort().equals(new Short((short) 1));
+ return !obj.getWrapperShort().equals(Short.valueOf((short) 1));
}
};
validateReference(14, validator, "wrapperShort");
@@ -470,11 +470,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperInteger() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperInteger(new Integer(1));
+ obj.setWrapperInteger(Integer.valueOf(1));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperInteger(new Integer(2));
+ obj.setWrapperInteger(Integer.valueOf(2));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -486,7 +486,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperInteger().equals(new Integer(1));
+ return !obj.getWrapperInteger().equals(Integer.valueOf(1));
}
};
validateReference(15, validator, "wrapperInteger");
@@ -496,11 +496,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperLong() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperLong(new Long(1));
+ obj.setWrapperLong(Long.valueOf(1));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperLong(new Long(2));
+ obj.setWrapperLong(Long.valueOf(2));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -512,7 +512,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperLong().equals(new Long(1));
+ return !obj.getWrapperLong().equals(Long.valueOf(1));
}
};
validateReference(16, validator, "wrapperLong");
@@ -522,11 +522,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperDouble() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperDouble(new Double(1));
+ obj.setWrapperDouble(Double.valueOf(1));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperDouble(new Double(2));
+ obj.setWrapperDouble(Double.valueOf(2));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -538,7 +538,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperDouble().equals(new Double(1));
+ return !obj.getWrapperDouble().equals(Double.valueOf(1));
}
};
validateReference(18, validator, "wrapperDouble");
@@ -548,11 +548,11 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
public void testWrapperFloat() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesFieldAccess obj) {
- obj.setWrapperFloat(new Float(1));
+ obj.setWrapperFloat(Float.valueOf(1));
}
public void change(BasicTypesFieldAccess obj) {
- obj.setWrapperFloat(new Float(2));
+ obj.setWrapperFloat(Float.valueOf(2));
}
public void setNull(BasicTypesFieldAccess obj) {
@@ -564,7 +564,7 @@ public boolean isNull(BasicTypesFieldAccess obj) {
}
public boolean isChanged(BasicTypesFieldAccess obj) {
- return !obj.getWrapperFloat().equals(new Float(1));
+ return !obj.getWrapperFloat().equals(Float.valueOf(1));
}
};
validateReference(17, validator, "wrapperFloat");
@@ -1265,7 +1265,7 @@ public void testNullsFAshort() throws SQLException {
con.close();
}
- obj = em.find(BasicTypesFieldAccess.class, new Integer(7777));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(7777));
flop("missing Exception");
} catch (PersistenceException iae) {
// $JL-EXC$ expected behavior
@@ -1303,7 +1303,7 @@ public void testNullsFAint() throws SQLException {
con.close();
}
- obj = em.find(BasicTypesFieldAccess.class, new Integer(7778));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(7778));
flop("missing exception");
} catch (PersistenceException iae) {
// $JL-EXC$ expected behavior
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
index 8d78af9..e6edfdc 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -51,7 +51,7 @@ public void testInsert() {
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(0));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(0));
} finally {
closeEntityManager(em);
}
@@ -68,24 +68,24 @@ private void validatePrimitive(final int id, Validator validator, String fieldNa
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// update unchanged object
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
verify(!obj.postUpdateWasCalled(), "postUpdate was called -> before image fails");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " is changed");
// update changed object
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.change(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called -> before image fails");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isChanged(obj), fieldName + " is unchanged");
} finally {
closeEntityManager(em);
@@ -101,11 +101,11 @@ private void validateReference(final int id, ReferenceValidator validator, Strin
env.beginTransaction(em);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
// delete the object again
env.beginTransaction(em);
- em.remove(em.find(BasicTypesPropertyAccess.class, new Integer(id)));
+ em.remove(em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id)));
env.commitTransactionAndClear(em);
// insert object with non-null field
env.beginTransaction(em);
@@ -113,33 +113,33 @@ private void validateReference(final int id, ReferenceValidator validator, Strin
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// update unchanged
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
verify(!obj.postUpdateWasCalled(), "postUpdate was called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " is changed");
// update changed object
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.change(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isChanged(obj), fieldName + " is unchanged");
// update to null
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
} finally {
closeEntityManager(em);
@@ -155,11 +155,11 @@ private void validateMutable(final int id, MutableValidator validator, String fi
env.beginTransaction(em);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
// delete the object again
env.beginTransaction(em);
- em.remove(em.find(BasicTypesPropertyAccess.class, new Integer(id)));
+ em.remove(em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id)));
env.commitTransactionAndClear(em);
// insert object with non-null field
env.beginTransaction(em);
@@ -167,49 +167,49 @@ private void validateMutable(final int id, MutableValidator validator, String fi
em.persist(obj);
env.commitTransactionAndClear(em);
verify(true, "no Exception");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// update unchanged
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
verify(!obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " is changed");
// update changed
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
// update original
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
validator.set(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(!validator.isChanged(obj), fieldName + " not persisted");
// mutate
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.mutate(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isChanged(obj), fieldName + " not mutated");
// update to null
env.beginTransaction(em);
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
verify(obj.postUpdateWasCalled(), "postUpdate was not called");
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(id));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(id));
verify(validator.isNull(obj), fieldName + " is not null");
} finally {
closeEntityManager(em);
@@ -392,11 +392,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperByte() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperByte(new Byte((byte) 17));
+ obj.setWrapperByte(Byte.valueOf((byte) 17));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperByte(new Byte((byte) 18));
+ obj.setWrapperByte(Byte.valueOf((byte) 18));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -408,7 +408,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperByte().equals(new Byte((byte) 17));
+ return !obj.getWrapperByte().equals(Byte.valueOf((byte) 17));
}
};
validateReference(12, validator, "wrapperByte");
@@ -418,11 +418,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperCharacter() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperCharacter(new Character('A'));
+ obj.setWrapperCharacter(Character.valueOf('A'));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperCharacter(new Character('B'));
+ obj.setWrapperCharacter(Character.valueOf('B'));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -434,7 +434,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperCharacter().equals(new Character('A'));
+ return !obj.getWrapperCharacter().equals(Character.valueOf('A'));
}
};
validateReference(13, validator, "wrapperCharacter");
@@ -444,11 +444,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperShort() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperShort(new Short((short) 1));
+ obj.setWrapperShort(Short.valueOf((short) 1));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperShort(new Short((short) 2));
+ obj.setWrapperShort(Short.valueOf((short) 2));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -460,7 +460,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperShort().equals(new Short((short) 1));
+ return !obj.getWrapperShort().equals(Short.valueOf((short) 1));
}
};
validateReference(14, validator, "wrapperShort");
@@ -470,11 +470,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperInteger() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperInteger(new Integer(1));
+ obj.setWrapperInteger(Integer.valueOf(1));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperInteger(new Integer(2));
+ obj.setWrapperInteger(Integer.valueOf(2));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -486,7 +486,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperInteger().equals(new Integer(1));
+ return !obj.getWrapperInteger().equals(Integer.valueOf(1));
}
};
validateReference(15, validator, "wrapperInteger");
@@ -496,11 +496,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperLong() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperLong(new Long(1));
+ obj.setWrapperLong(Long.valueOf(1));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperLong(new Long(2));
+ obj.setWrapperLong(Long.valueOf(2));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -512,7 +512,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperLong().equals(new Long(1));
+ return !obj.getWrapperLong().equals(Long.valueOf(1));
}
};
validateReference(16, validator, "wrapperLong");
@@ -522,11 +522,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperDouble() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperDouble(new Double(1));
+ obj.setWrapperDouble(Double.valueOf(1));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperDouble(new Double(2));
+ obj.setWrapperDouble(Double.valueOf(2));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -538,7 +538,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperDouble().equals(new Double(1));
+ return !obj.getWrapperDouble().equals(Double.valueOf(1));
}
};
validateReference(18, validator, "wrapperDouble");
@@ -548,11 +548,11 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
public void testWrapperFloat() {
ReferenceValidator validator = new ReferenceValidator() {
public void set(BasicTypesPropertyAccess obj) {
- obj.setWrapperFloat(new Float(1));
+ obj.setWrapperFloat(Float.valueOf(1));
}
public void change(BasicTypesPropertyAccess obj) {
- obj.setWrapperFloat(new Float(2));
+ obj.setWrapperFloat(Float.valueOf(2));
}
public void setNull(BasicTypesPropertyAccess obj) {
@@ -564,7 +564,7 @@ public boolean isNull(BasicTypesPropertyAccess obj) {
}
public boolean isChanged(BasicTypesPropertyAccess obj) {
- return !obj.getWrapperFloat().equals(new Float(1));
+ return !obj.getWrapperFloat().equals(Float.valueOf(1));
}
};
validateReference(17, validator, "wrapperFloat");
@@ -1265,7 +1265,7 @@ public void testNullsPAshort() throws SQLException {
con.close();
}
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(8888));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(8888));
flop("missing exception");
} catch (PersistenceException iae) {
// $JL-EXC$ expected behavior
@@ -1303,7 +1303,7 @@ public void testNullsPAint() throws SQLException {
con.close();
}
- obj = em.find(BasicTypesPropertyAccess.class, new Integer(8889));
+ obj = em.find(BasicTypesPropertyAccess.class, Integer.valueOf(8889));
flop("missing exception");
} catch (PersistenceException iae) {
// $JL-EXC$ expected behavior
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestEmbeddedField.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestEmbeddedField.java
index ef8d10d..31e51e17 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestEmbeddedField.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestEmbeddedField.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -36,7 +36,7 @@ public void testSimple() {
final JPAEnvironment env = getEnvironment();
final EntityManager em = env.getEntityManager();
try {
- final Integer employeeId = new Integer(25);
+ final Integer employeeId = Integer.valueOf(25);
final Department department = new Department(9, "R&D");
final Employee employee = new Employee(employeeId.intValue(), "Emil", "Bahr", department);
final EmploymentPeriod period = new EmploymentPeriod();
@@ -70,7 +70,7 @@ public void testNullPeriod() {
final JPAEnvironment env = getEnvironment();
final EntityManager em = env.getEntityManager();
try {
- final Integer employeeId = new Integer(26);
+ final Integer employeeId = Integer.valueOf(26);
final Department department = new Department(10, "R&D");
final Employee employee = new Employee(employeeId.intValue(), "Emil", "Bahr", department);
env.beginTransaction(em);
@@ -108,7 +108,7 @@ public void testDirty() {
final JPAEnvironment env = getEnvironment();
final EntityManager em = env.getEntityManager();
try {
- final Integer employeeId = new Integer(27);
+ final Integer employeeId = Integer.valueOf(27);
final Department department = new Department(11, "R&D");
final Employee employee = new Employee(employeeId.intValue(), "Emil", "Bahr", department);
final EmploymentPeriod period = new EmploymentPeriod();
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java
index dc70852..cf639a8 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -47,60 +47,60 @@ private void validateMutable(final int id, MutableValidator validator, String fi
env.beginTransaction(em);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " is not null", validator.isNull(obj));
// delete the object again
env.beginTransaction(em);
- em.remove(em.find(BasicTypesFieldAccess.class, new Integer(id)));
+ em.remove(em.find(BasicTypesFieldAccess.class, Integer.valueOf(id)));
env.commitTransactionAndClear(em);
// insert object with non-null field
env.beginTransaction(em);
validator.set(obj);
em.persist(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " not persisted", !validator.isChanged(obj));
// update unchanged
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
env.commitTransactionAndClear(em);
Assert.assertTrue("postUpdate was not called", !obj.postUpdateWasCalled());
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " is changed", !validator.isChanged(obj));
// update changed
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
Assert.assertTrue("postUpdate was not called", obj.postUpdateWasCalled());
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " is not null", validator.isNull(obj));
// update original
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
validator.set(obj);
env.commitTransactionAndClear(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " not persisted", !validator.isChanged(obj));
// mutate
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.mutate(obj);
env.commitTransactionAndClear(em);
Assert.assertTrue("postUpdate was not called", obj.postUpdateWasCalled());
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " not mutated", validator.isChanged(obj));
// update to null
env.beginTransaction(em);
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
obj.clearPostUpdate();
validator.setNull(obj);
env.commitTransactionAndClear(em);
Assert.assertTrue("postUpdate was not called", obj.postUpdateWasCalled());
- obj = em.find(BasicTypesFieldAccess.class, new Integer(id));
+ obj = em.find(BasicTypesFieldAccess.class, Integer.valueOf(id));
Assert.assertTrue(fieldName + " is not null", validator.isNull(obj));
} finally {
closeEntityManager(em);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
index 0c37e90..3c4fe28 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -543,7 +543,7 @@ public void addSetterMethodForValueHolder(ClassDetails classDetails, AttributeDe
* _persistence_checkFetchedForSet("variableName");
* _persistence_initialize_variableName_vh();
* _persistence_propertyChange("variableName", this.variableName, argument);
- * // if change tracking enabled, wrapping primitives, i.e. new Long(item)
+ * // if change tracking enabled, wrapping primitives, i.e. Long.valueOf(item)
* this.variableName = argument;
* _persistence_variableName_vh.setValue(variableName); // if lazy enabled }
*/
@@ -591,7 +591,7 @@ public void addSetterMethodForFieldAccess(ClassDetails classDetails, AttributeDe
cv_set.visitLdcInsn(attribute);
// if the attribute is a primitive, wrap it
- // e.g. if it is an integer: new Integer(attribute)
+ // e.g. if it is an integer: Integer.valueOf(attribute)
// This is the first part of the wrapping
String wrapper = ClassWeaver.wrapperFor(attributeDetails.getReferenceClassType().getSort());
if (wrapper != null) {
@@ -605,11 +605,11 @@ public void addSetterMethodForFieldAccess(ClassDetails classDetails, AttributeDe
if (wrapper != null) {
// invoke the constructor for wrapping
- // e.g. new Integer(variableName)
+ // e.g. Integer.valueOf(variableName)
cv_set.visitMethodInsn(INVOKESPECIAL, wrapper, "<init>", "(" + attributeDetails.getReferenceClassType().getDescriptor() + ")V", false);
// wrap the method argument
- // e.g. new Integer(argument)
+ // e.g. Integer.valueOf(argument)
cv_set.visitTypeInsn(NEW, wrapper);
cv_set.visitInsn(DUP);
cv_set.visitVarInsn(opcode, 1);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
index ab78c48..2cd2ede 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -238,7 +238,7 @@ public void weaveAttributesIfRequired(int opcode, String owner, String name, Str
* AttributeType oldAttribute = getAttribute()
* // for primitives
* AttributeWrapperType oldAttribute = new AttributeWrapperType(getAttribute());
- * e.g. Double oldAttribute = new Double(getAttribute());
+ * e.g. Double oldAttribute = Double.valueOf(getAttribute());
* else
* _persistence_checkFetchedForSet("attributeName");
* _persistence_propertyChange("attributeName", oldAttribute, argument);
@@ -249,7 +249,7 @@ public void weaveAttributesIfRequired(int opcode, String owner, String name, Str
* AttributeType oldAttribute = getAttribute()
* // for primitives
* AttributeWrapperType oldAttribute = new AttributeWrapperType(getAttribute());
- * e.g. Double oldAttribute = new Double(getAttribute());
+ * e.g. Double oldAttribute = Double.valueOf(getAttribute());
* _persistence_propertyChange("attributeName", oldAttribute, argument);
*
* // if not weaving for change tracking, but for fetch groups only:
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
index fbf9b47..f9aa59f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -578,7 +578,7 @@ public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -618,7 +618,7 @@ public void testObjectToXMLStreamWriterRecord() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -660,7 +660,7 @@ public void testObjectToXMLEventWriter() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java
index 8413aca..7c05b4c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,7 +55,7 @@ public XmlPathsTestCases(String name) throws Exception {
*/
public Employee getControlObject() {
Employee emp = new Employee();
- emp.thing = new Integer(INT_VAL);
+ emp.thing = Integer.valueOf(INT_VAL);
return emp;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
index c9d87ed..784c020 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,7 @@ public Map getProperties(){
*/
public Employee getControlObject() {
Employee emp = new Employee();
- emp.thing = new Integer(INT_VAL);
+ emp.thing = Integer.valueOf(INT_VAL);
return emp;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlproperty/XmlPropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlproperty/XmlPropertyTestCases.java
index 13ef266..97b4327 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlproperty/XmlPropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlproperty/XmlPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@ public void testClassProperties() {
assertTrue("Incorrect value for property", property.equals("value1"));
property = properties.get(CLASS_PROPERTY_2_NAME);
assertNotNull(property);
- assertTrue("Incorrect value for property", property.equals(new Integer("121")));
+ assertTrue("Incorrect value for property", property.equals(Integer.valueOf("121")));
}
public void testXmlPropertyOnField() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java
index 281a00e..21f4845 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@ public Object onCycleDetected(Context arg0) {
if (id < 1000) {
// Return an object of a built-in Java type
- return new Integer(this.id);
+ return Integer.valueOf(this.id);
} else {
// Return an object of a diffenet type (one that is known to this context)
EmployeePointer p = new EmployeePointer();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java
index 37eb73e..b83da03 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -182,10 +182,10 @@ protected Object getControlObject() {
collRef.add(collRef2);
root.set("collRef", collRef);
- root.set("choice", new Integer(2112));
+ root.set("choice", Integer.valueOf(2112));
Vector choiceColl = new Vector(3);
- choiceColl.add(new Double(3.14159));
+ choiceColl.add(Double.valueOf(3.14159));
choiceColl.add("Pi");
choiceColl.add(Boolean.TRUE);
root.set("choiceColl", choiceColl);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBElementTestCases.java
index 15d7fdc..3234baf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,7 +54,7 @@ public void setUp() throws Exception {
}
private Object getControlObjectUnmapped() {
- return new JAXBElement<Integer>(new QName("year"), Integer.class, new Integer(1942));
+ return new JAXBElement<Integer>(new QName("year"), Integer.class, Integer.valueOf(1942));
}
private Object getControlObjectMapped() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java
index 4ba79f7..476e2fe 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,12 +20,12 @@
public class JAXBMarshalListenerImpl extends Marshaller.Listener {
- static Integer EMPLOYEE_BEFORE_MARSHAL = new Integer(0);
- static Integer ADDRESS_BEFORE_MARSHAL = new Integer(1);
- static Integer PHONE_BEFORE_MARSHAL = new Integer(2);
- static Integer EMPLOYEE_AFTER_MARSHAL = new Integer(3);
- static Integer ADDRESS_AFTER_MARSHAL = new Integer(4);
- static Integer PHONE_AFTER_MARSHAL = new Integer(5);
+ static Integer EMPLOYEE_BEFORE_MARSHAL = Integer.valueOf(0);
+ static Integer ADDRESS_BEFORE_MARSHAL = Integer.valueOf(1);
+ static Integer PHONE_BEFORE_MARSHAL = Integer.valueOf(2);
+ static Integer EMPLOYEE_AFTER_MARSHAL = Integer.valueOf(3);
+ static Integer ADDRESS_AFTER_MARSHAL = Integer.valueOf(4);
+ static Integer PHONE_AFTER_MARSHAL = Integer.valueOf(5);
public ArrayList events = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java
index c01c3c1..732c708 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,12 +19,12 @@
import jakarta.xml.bind.Unmarshaller;
public class JAXBUnmarshalListenerImpl extends Unmarshaller.Listener {
- static Integer EMPLOYEE_BEFORE_UNMARSHAL = new Integer(0);
- static Integer ADDRESS_BEFORE_UNMARSHAL = new Integer(1);
- static Integer PHONE_BEFORE_UNMARSHAL = new Integer(2);
- static Integer EMPLOYEE_AFTER_UNMARSHAL = new Integer(3);
- static Integer ADDRESS_AFTER_UNMARSHAL = new Integer(4);
- static Integer PHONE_AFTER_UNMARSHAL = new Integer(5);
+ static Integer EMPLOYEE_BEFORE_UNMARSHAL = Integer.valueOf(0);
+ static Integer ADDRESS_BEFORE_UNMARSHAL = Integer.valueOf(1);
+ static Integer PHONE_BEFORE_UNMARSHAL = Integer.valueOf(2);
+ static Integer EMPLOYEE_AFTER_UNMARSHAL = Integer.valueOf(3);
+ static Integer ADDRESS_AFTER_UNMARSHAL = Integer.valueOf(4);
+ static Integer PHONE_AFTER_UNMARSHAL = Integer.valueOf(5);
public ArrayList events = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java
index 960ff4f..e7fec0d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -137,7 +137,7 @@ public void testInvalidMapParameterTypeNullValue() {
public void testInvalidParameterTypeBadOxmXmlValue() {
Map<String, List<Integer>> properties = new HashMap<String, List<Integer>>();
ArrayList<Integer> ints = new ArrayList<Integer>();
- ints.add(new Integer(666));
+ ints.add(Integer.valueOf(666));
properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, ints);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
index f5cbf40..5f10f23 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,9 +49,9 @@ public ChoiceMappingEmployeeTestCases(String name) throws Exception {
public Object getWriteControlObject() {
if(ctrlObject ==null){
Employee emp = new Employee();
- emp.thing = new Integer(INT_VAL);
- emp.readOnlyThing = new Float(FLT_VAL);
- emp.writeOnlyThing = new Integer(INT_VAL);
+ emp.thing = Integer.valueOf(INT_VAL);
+ emp.readOnlyThing = Float.valueOf(FLT_VAL);
+ emp.writeOnlyThing = Integer.valueOf(INT_VAL);
ctrlObject = emp;
}
return ctrlObject;
@@ -60,8 +60,8 @@ public Object getWriteControlObject() {
public Object getControlObject() {
if(ctrlObject ==null){
Employee emp = new Employee();
- emp.thing = new Integer(INT_VAL);
- emp.readOnlyThing = new Float(FLT_VAL);
+ emp.thing = Integer.valueOf(INT_VAL);
+ emp.readOnlyThing = Float.valueOf(FLT_VAL);
ctrlObject = emp;
}
return ctrlObject;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
index 678fad2..118b525 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,14 +63,14 @@ public ChoiceCollectionMappingTestCases(String name) throws Exception {
public Object getWriteControlObject() {
if(writeCtrlObject == null){
List<Object> things = new ArrayList<Object>();
- things.add(new Integer(INT_VAL66));
- things.add(new Integer(INT_VAL99));
- things.add(new Float(FLOAT_VAL));
+ things.add(Integer.valueOf(INT_VAL66));
+ things.add(Integer.valueOf(INT_VAL99));
+ things.add(Float.valueOf(FLOAT_VAL));
List<Object> roThings = new ArrayList<Object>();
- roThings.add(new Integer(RO_INT_VAL));
- roThings.add(new Float(RO_FLOAT_VAL));
+ roThings.add(Integer.valueOf(RO_INT_VAL));
+ roThings.add(Float.valueOf(RO_FLOAT_VAL));
List<Object> woThings = new ArrayList<Object>();
- woThings.add(new Integer(WO_INT_VAL));
+ woThings.add(Integer.valueOf(WO_INT_VAL));
Employee emp = new Employee();
emp.things = things;
emp.readOnlyThings = roThings;
@@ -83,12 +83,12 @@ public Object getWriteControlObject() {
public Object getControlObject() {
List<Object> things = new ArrayList<Object>();
- things.add(new Integer(INT_VAL66));
- things.add(new Integer(INT_VAL99));
- things.add(new Float(FLOAT_VAL));
+ things.add(Integer.valueOf(INT_VAL66));
+ things.add(Integer.valueOf(INT_VAL99));
+ things.add(Float.valueOf(FLOAT_VAL));
List<Object> roThings = new ArrayList<Object>();
- roThings.add(new Integer(RO_INT_VAL));
- roThings.add(new Float(RO_FLOAT_VAL));
+ roThings.add(Integer.valueOf(RO_INT_VAL));
+ roThings.add(Float.valueOf(RO_FLOAT_VAL));
Employee emp = new Employee();
emp.things = things;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/ObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/ObjectFactory.java
index 6b2bed4..e4ce461 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/ObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/ObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,7 @@ public jakarta.xml.bind.JAXBElement<String> createRoot() {
@jakarta.xml.bind.annotation.XmlElementDecl(namespace="myns", name="integer-root")
public jakarta.xml.bind.JAXBElement<Integer> createIntegerRoot() {
- return new jakarta.xml.bind.JAXBElement<Integer>(new javax.xml.namespace.QName("myns", "integer-root"), Integer.class, new Integer(0));
+ return new jakarta.xml.bind.JAXBElement<Integer>(new javax.xml.namespace.QName("myns", "integer-root"), Integer.class, Integer.valueOf(0));
}
@jakarta.xml.bind.annotation.XmlElementDecl(name="a")
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
index 1164efc..b0202acc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,8 +75,8 @@ protected Object getControlObject() {
// setup control objects
Foo foo = new Foo();
List theItems = new ArrayList();
- theItems.add(new Float(2.5));
- theItems.add(new Integer(1));
+ theItems.add(Float.valueOf(2.5f));
+ theItems.add(Integer.valueOf(1));
foo.items = theItems;
return foo;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
index 6eca51d..8d79eb6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,8 +90,8 @@ protected Object getControlObject() {
// setup control objects
Foo foo = new Foo();
List theItems = new ArrayList();
- theItems.add(new Float(2.5));
- theItems.add(new Integer(1));
+ theItems.add(Float.valueOf(2.5f));
+ theItems.add(Integer.valueOf(1));
foo.items = theItems;
return foo;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
index 7c591f4..8f81444 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -73,7 +73,7 @@ protected Object getControlObject() {
//setup control Employee
GregorianCalendar calendar = new GregorianCalendar();
- Date theDate = new Date(new Long("1262840400000"));
+ Date theDate = new Date(Long.valueOf("1262840400000"));
calendar.setTime(theDate);
emp.hireDate = calendar;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
index 3c5be12..66e039c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,7 +65,7 @@ public Map getProperties(){
public Object getControlObject() {
MyValueClass mvc = new MyValueClass();
- mvc.blah = new Boolean("true");
+ mvc.blah = Boolean.valueOf("true");
return mvc;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java
index a2e74e6..0222a30 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,7 @@
public class MyValueAdapter extends XmlAdapter<String, Boolean> {
public Boolean unmarshal(String v) throws Exception {
- return new Boolean(v.equals("T") ? "true" : "false");
+ return Boolean.valueOf(v.equals("T") ? "true" : "false");
}
public String marshal(Boolean v) throws Exception {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java
index 371d0e0..3e332f6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,7 +58,7 @@ public void testObjectToXMLStreamWriterRecordJSON() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java
index 0afaa65..bcc476a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,8 +34,8 @@ public XmlElementsListOfElementTest(String name) throws Exception {
protected Object getControlObject() {
XmlElementsListOfElement example = new XmlElementsListOfElement();
example.items = new ArrayList();
- example.items.add(new Integer(1));
- example.items.add(new Float(2.5));
+ example.items.add(Integer.valueOf(1));
+ example.items.add(Float.valueOf(2.5f));
return example;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java
index cf08bcf..4132ef9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,8 +37,8 @@ public XmlElementsListOfElementWrappedTest(String name) throws Exception {
protected Object getControlObject() {
XmlElementsListOfElementWrapped example = new XmlElementsListOfElementWrapped();
example.items = new ArrayList();
- example.items.add(new Integer(1));
- example.items.add(new Float(2.5));
+ example.items.add(Integer.valueOf(1));
+ example.items.add(Float.valueOf(2.5f));
return example;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java
index 72f5612..8263767 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public Class getUnmarshalClass(){
}
protected Object getControlObject() {
- Character character = new Character('s');
+ Character character = Character.valueOf('s');
JAXBElement<Character> jbe = new JAXBElement<Character>(new QName("a", "b"),Character.class, character);
return jbe;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java
index 030cf83..33ca547 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,29 +34,29 @@ protected Object getControlObject() {
holder.stringValue = "a\"a\\a/a\ba\fa\na\ra\t\b\u0003\u001Caaa\\TESThttp://this/is/my/test";
List<Character> characters = new ArrayList<Character>();
- characters.add(new Character('a'));
- characters.add(new Character('"'));
- characters.add(new Character('a'));
- characters.add(new Character('\\'));
- characters.add(new Character('a'));
- characters.add(new Character('/'));
- characters.add(new Character('a'));
- characters.add(new Character('\b'));
- characters.add(new Character('a'));
- characters.add(new Character('\f'));
- characters.add(new Character('a'));
- characters.add(new Character('\n'));
- characters.add(new Character('a'));
- characters.add(new Character('\r'));
- characters.add(new Character('a'));
- characters.add(new Character('\t'));
- characters.add(new Character('\b'));
- characters.add(new Character('\u0003'));
- characters.add(new Character('\u001C'));
- characters.add(new Character('a'));
- characters.add(new Character('a'));
- characters.add(new Character('a'));
- characters.add(new Character('\\'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('"'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\\'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('/'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\b'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\f'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\n'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\r'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\t'));
+ characters.add(Character.valueOf('\b'));
+ characters.add(Character.valueOf('\u0003'));
+ characters.add(Character.valueOf('\u001C'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('a'));
+ characters.add(Character.valueOf('\\'));
holder.characters = characters;
return holder;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java
index 1e4a307..3782698 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,7 +70,7 @@ public void testJSONSchemaGeneration() throws Exception{
public Map<Object, Object> getProperties() {
HashMap m = new HashMap();
- m.put(JAXBContextProperties.JSON_INCLUDE_ROOT, new Boolean(false));
+ m.put(JAXBContextProperties.JSON_INCLUDE_ROOT, Boolean.valueOf(false));
return m;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java
index f0cce05..2c0e49a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,10 +91,10 @@ public List< InputStream> getControlSchemaFiles(){
protected Object getControlObject() {
List<Integer> integers = new ArrayList<Integer>();
- integers.add(new Integer("10"));
- integers.add(new Integer("20"));
- integers.add(new Integer("30"));
- integers.add(new Integer("40"));
+ integers.add(Integer.valueOf("10"));
+ integers.add(Integer.valueOf("20"));
+ integers.add(Integer.valueOf("30"));
+ integers.add(Integer.valueOf("40"));
QName qname = new QName("examplenamespace", "root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java
index 17817e1..79a52ab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,10 +59,10 @@ protected Type getTypeToUnmarshalTo() throws Exception {
protected Object getControlObject() {
LinkedList<Integer> integers = new LinkedList<Integer>();
- integers.add(new Integer("10"));
- integers.add(new Integer("20"));
- integers.add(new Integer("30"));
- integers.add(new Integer("40"));
+ integers.add(Integer.valueOf("10"));
+ integers.add(Integer.valueOf("20"));
+ integers.add(Integer.valueOf("30"));
+ integers.add(Integer.valueOf("40"));
QName qname = new QName("examplenamespace", "root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java
index 194d67f..62f5074 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,10 +58,10 @@ protected Type getTypeToUnmarshalTo() throws Exception {
protected Object getControlObject() {
ArrayList<Integer> integers = new ArrayList<Integer>();
- integers.add(new Integer("10"));
- integers.add(new Integer("20"));
- integers.add(new Integer("30"));
- integers.add(new Integer("40"));
+ integers.add(Integer.valueOf("10"));
+ integers.add(Integer.valueOf("20"));
+ integers.add(Integer.valueOf("30"));
+ integers.add(Integer.valueOf("40"));
QName qname = new QName("examplenamespace", "root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java
index b4f33b0..b77310c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,10 +61,10 @@ protected Type getTypeToUnmarshalTo() throws Exception {
protected Object getControlObject() {
MyList<Integer> integers = new MyList<Integer>();
- integers.add(new Integer("10"));
- integers.add(new Integer("20"));
- integers.add(new Integer("30"));
- integers.add(new Integer("40"));
+ integers.add(Integer.valueOf("10"));
+ integers.add(Integer.valueOf("20"));
+ integers.add(Integer.valueOf("30"));
+ integers.add(Integer.valueOf("40"));
QName qname = new QName("examplenamespace", "root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
index 8ab2b49..5b67121 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -266,7 +266,7 @@ public void testObjectToXMLStreamWriterWithTypeMappingInfo() throws Exception {
StringWriter writer = new StringWriter();
javax.xml.stream.XMLOutputFactory factory = javax.xml.stream.XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
javax.xml.stream.XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -289,7 +289,7 @@ public void testObjectToXMLEventWriterWithTypeMappingInfo() throws Exception {
StringWriter writer = new StringWriter();
javax.xml.stream.XMLOutputFactory factory = javax.xml.stream.XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
javax.xml.stream.XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java
index f3ff2ac..82842bd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,18 +81,18 @@ protected Object getControlObject() {
ListofObjects listofObjects = new ListofObjects();
Vector<Integer> integers = new Vector<Integer>();
- integers.add(new Integer("10"));
- integers.add(new Integer("20"));
- integers.add(new Integer("30"));
- integers.add(new Integer("40"));
+ integers.add(Integer.valueOf("10"));
+ integers.add(Integer.valueOf("20"));
+ integers.add(Integer.valueOf("30"));
+ integers.add(Integer.valueOf("40"));
listofObjects.setIntegerList(integers);
TreeSet<Integer> integerSet = new TreeSet<Integer>();
- integerSet.add(new Integer("20"));
- integerSet.add(new Integer("40"));
- integerSet.add(new Integer("60"));
+ integerSet.add(Integer.valueOf("20"));
+ integerSet.add(Integer.valueOf("40"));
+ integerSet.add(Integer.valueOf("60"));
listofObjects.setIntegerSet(integerSet);
Integer[] integerArray = new Integer[4];
@@ -125,21 +125,21 @@ protected Object getControlObject() {
listofObjects.setBooleanArray(booleans);
HashMap<String, Integer> stringIntegerMap = new HashMap<String, Integer>();
- stringIntegerMap.put("string1", new Integer(10));
- stringIntegerMap.put("string2", new Integer(20));
- stringIntegerMap.put("string3", new Integer(30));
+ stringIntegerMap.put("string1", Integer.valueOf(10));
+ stringIntegerMap.put("string2", Integer.valueOf(20));
+ stringIntegerMap.put("string3", Integer.valueOf(30));
listofObjects.setStringIntegerHashMap(stringIntegerMap);
ConcurrentHashMap<String, Integer> stringIntegerConcurrentMap = new ConcurrentHashMap<String, Integer>();
- stringIntegerConcurrentMap.put("string1", new Integer(10));
- stringIntegerConcurrentMap.put("string2", new Integer(20));
- stringIntegerConcurrentMap.put("string3", new Integer(30));
+ stringIntegerConcurrentMap.put("string1", Integer.valueOf(10));
+ stringIntegerConcurrentMap.put("string2", Integer.valueOf(20));
+ stringIntegerConcurrentMap.put("string3", Integer.valueOf(30));
listofObjects.setStringIntegerConcurrentMap(stringIntegerConcurrentMap);
LinkedList<Integer> integersLinkedList = new LinkedList<Integer>();
- integersLinkedList.add(new Integer(5));
- integersLinkedList.add(new Integer(15));
- integersLinkedList.add(new Integer(25));
+ integersLinkedList.add(Integer.valueOf(5));
+ integersLinkedList.add(Integer.valueOf(15));
+ integersLinkedList.add(Integer.valueOf(25));
listofObjects.setIntegerLinkedList(integersLinkedList);
Hashtable<String, Employee> stringEmployeeTable = new Hashtable<String, Employee>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
index e7716b1..be9f719 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -270,7 +270,7 @@ public void testObjectToXMLStreamWriterWithTypeMappingInfo() throws Exception {
StringWriter writer = new StringWriter();
javax.xml.stream.XMLOutputFactory factory = javax.xml.stream.XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
javax.xml.stream.XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -293,7 +293,7 @@ public void testObjectToXMLEventWriterWithTypeMappingInfo() throws Exception {
StringWriter writer = new StringWriter();
javax.xml.stream.XMLOutputFactory factory = javax.xml.stream.XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
javax.xml.stream.XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java
index f58aa8f..cf3e23a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,9 +62,9 @@ protected Type getTypeToUnmarshalTo() throws Exception {
protected Object getControlObject() {
HashMap<String, Integer> theMap = new HashMap<String, Integer>();
- theMap.put("thekey", new Integer(10));
- theMap.put("thekey2", new Integer(20));
- theMap.put("thekey3", new Integer(30));
+ theMap.put("thekey", Integer.valueOf(10));
+ theMap.put("thekey2", Integer.valueOf(20));
+ theMap.put("thekey3", Integer.valueOf(30));
QName qname = new QName("examplenamespace", "root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
index 6892b9b..50c424c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -112,8 +112,8 @@ public List<InputStream> getControlSchemaFiles() {
protected Object getControlObject() {
Map<String, Integer> theMap = new HashMap<String, Integer>();
- theMap.put("aaa", new Integer(1));
- theMap.put("bbb", new Integer(2));
+ theMap.put("aaa", Integer.valueOf(1));
+ theMap.put("bbb", Integer.valueOf(2));
QName qname = new QName("root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java
index b4470dd..cb5be3d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -110,8 +110,8 @@ public List<InputStream> getControlSchemaFiles() {
protected Object getControlObject() {
Map<String, Integer> theMap = new HashMap<String, Integer>();
- theMap.put("aaa", new Integer(1));
- theMap.put("bbb", new Integer(2));
+ theMap.put("aaa", Integer.valueOf(1));
+ theMap.put("bbb", Integer.valueOf(2));
QName qname = new QName("root");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java
index d233ce9..aa392eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,10 +61,10 @@ protected Object getControlObject() {
List choiceList = new ArrayList();
choiceList.add(new String("choice string test2"));
choiceList.add(anotherPackageSubType);
- choiceList.add(new Integer(400));
+ choiceList.add(Integer.valueOf(400));
choiceList.add(subTypeLevel2);
choiceList.add(new String("choice string test"));
- choiceList.add(new Integer(500));
+ choiceList.add(Integer.valueOf(500));
root.choiceList = choiceList;
return root;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java
index a93f76c..dd890eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
return root;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java
index 38bf66c..6f08eff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,7 +65,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
return root;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java
index 62afd4e..48f173f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,7 +48,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
return root;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java
index 04ebcbf..842a22d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,7 +61,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
List anyObjectList = new ArrayList(baseTypes);
@@ -71,7 +71,7 @@ protected Object getControlObject() {
choiceList.add(anotherPackageSubType);
choiceList.add(subTypeLevel2);
choiceList.add(new String("choice string test"));
- choiceList.add(new Integer(500));
+ choiceList.add(Integer.valueOf(500));
root.choiceList = choiceList;
return root;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java
index facfeb9..cbb12f6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -73,7 +73,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
List anyObjectList = new ArrayList(baseTypes);
@@ -83,7 +83,7 @@ protected Object getControlObject() {
choiceList.add(anotherPackageSubType);
choiceList.add(subTypeLevel2);
choiceList.add(new String("choice string test"));
- choiceList.add(new Integer(500));
+ choiceList.add(Integer.valueOf(500));
root.choiceList = choiceList;
return root;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java
index 36dfef2..234ed02 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,7 +67,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
List anyObjectList = new ArrayList(baseTypes);
@@ -77,7 +77,7 @@ protected Object getControlObject() {
choiceList.add(anotherPackageSubType);
choiceList.add(subTypeLevel2);
choiceList.add(new String("choice string test"));
- choiceList.add(new Integer(500));
+ choiceList.add(Integer.valueOf(500));
root.choiceList = choiceList;
return root;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java
index 3cfae26..0e61b74 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,7 +50,7 @@ protected Object getControlObject() {
List objectList = new ArrayList(baseTypes);
objectList.add(new String("string test"));
- objectList.add(new Integer(500));
+ objectList.add(Integer.valueOf(500));
root.objectList = objectList;
List anyObjectList = new ArrayList(baseTypes);
@@ -60,7 +60,7 @@ protected Object getControlObject() {
choiceList.add(anotherPackageSubType);
choiceList.add(subTypeLevel2);
choiceList.add(new String("choice string test"));
- choiceList.add(new Integer(500));
+ choiceList.add(Integer.valueOf(500));
root.choiceList = choiceList;
return root;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java
index 46b7281..54a0c2e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,7 +43,7 @@ public void testMarshalWithContextualNamespaces() throws Exception {
JAXBContext ctx = JAXBContextFactory.createContext(new Class[]{EmployeeContext.class}, null);
Marshaller m = ctx.createMarshaller();
m.setProperty(MarshallerProperties.NAMESPACE_PREFIX_MAPPER, new ContextPrefixMapper());
- m.setProperty(XMLConstants.JAXB_FRAGMENT, new Boolean(true));
+ m.setProperty(XMLConstants.JAXB_FRAGMENT, Boolean.valueOf(true));
EmployeeContext emp = new EmployeeContext();
emp.firstName = "Jon";
emp.lastName = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java
index b9ac1b5..f9780cf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,7 +39,7 @@ public SimpleDocumentByteArrayTestCases(String name) throws Exception {
protected Object getControlObject() {
JAXBElement value = new ByteArrayObjectFactory().createBase64Root();
- value.setValue(new Byte[]{new Byte((byte)1), new Byte((byte)2), new Byte((byte)3), new Byte((byte)4), new Byte((byte)5), new Byte((byte)6), new Byte((byte)7)});
+ value.setValue(new Byte[]{Byte.valueOf((byte)1), Byte.valueOf((byte)2), Byte.valueOf((byte)3), Byte.valueOf((byte)4), Byte.valueOf((byte)5), Byte.valueOf((byte)6), Byte.valueOf((byte)7)});
return value;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java
index e11fa7d..1bc8a70 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,7 +42,7 @@ public SimpleDocumentIntegerTestCases(String name) throws Exception {
protected Object getControlObject() {
JAXBElement value = new IntegerObjectFactory().createIntegerRoot();
- value.setValue(new Integer(27));
+ value.setValue(Integer.valueOf(27));
return value;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java
index 743f722..080a8e5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ public void testDefaultNamespaceOverride() throws Exception {
streamWriter.writeStartElement("", "root", "someNamespace");
streamWriter.writeDefaultNamespace("someNamespace");
Marshaller marshaller = ctx.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FRAGMENT, new Boolean(true));
+ marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.valueOf(true));
marshaller.marshal(new JAXBElement(new QName("employee"), Employee.class, new Employee()), streamWriter);
streamWriter.writeEndElement();
@@ -74,7 +74,7 @@ public void testDuplicateDefaultNamespace() throws Exception {
XMLOutputFactory factory = XMLOutputFactory.newInstance();
// Set IS_REPAIRING_NAMESPACES to true.
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(true));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
XMLStreamWriter streamWriter = factory.createXMLStreamWriter(writer);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java
index 3ae8ef0..1bdb3e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,7 +66,7 @@ public Object getReadControlObject() {
protected Object getControlObject() {
HashMap<String, Integer> theMap = new HashMap<String, Integer>();
- theMap.put("thekey", new Integer(10));
+ theMap.put("thekey", Integer.valueOf(10));
return theMap;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java
index eaf791c..a6fc829 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -79,7 +79,7 @@ protected TypeMappingInfo getTypeMappingInfo2()throws Exception {
protected Object getControlObject() {
HashMap<String, Integer> theMap = new HashMap<String, Integer>();
- theMap.put("thekey", new Integer(10));
+ theMap.put("thekey", Integer.valueOf(10));
return theMap;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
index 72e13a8..87a9fbd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -200,7 +200,7 @@ public void testObjectToXMLStreamWriterWithTypeMappingInfo() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -233,7 +233,7 @@ public void testObjectToXMLEventWriterWithTypeMappingInfo() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java
index db18bb5..ab6bcea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,11 +52,11 @@ public AutoDetectMediaTypeTestCases(String name) throws Exception {
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
ArrayList choices = new ArrayList();
- choices.add(new JAXBElement(new QName("integer-root"), Integer.class, new Integer(21)));
+ choices.add(new JAXBElement(new QName("integer-root"), Integer.class, Integer.valueOf(21)));
choices.add(new JAXBElement(new QName("root"), String.class, "Value1"));
EmployeeCollection nestedEmployee = new EmployeeCollection();
nestedEmployee.refs = new ArrayList();
- nestedEmployee.refs.add(new JAXBElement(new QName("integer-root"), Integer.class, new Integer(29)));
+ nestedEmployee.refs.add(new JAXBElement(new QName("integer-root"), Integer.class, Integer.valueOf(29)));
choices.add(nestedEmployee);
choices.add(new JAXBElement(new QName("root"), String.class, "Value2"));
employee.refs = choices;
@@ -68,13 +68,13 @@ protected Object getJSONReadControlObject(){
//same as getReadControl Except order is different
EmployeeCollection employee = new EmployeeCollection();
ArrayList choices = new ArrayList();
- choices.add(new JAXBElement(new QName("integer-root"), Integer.class, new Integer(21)));
+ choices.add(new JAXBElement(new QName("integer-root"), Integer.class, Integer.valueOf(21)));
choices.add(new JAXBElement(new QName("root"), String.class, "Value1"));
choices.add(new JAXBElement(new QName("root"), String.class, "Value2"));
EmployeeCollection nestedEmployee = new EmployeeCollection();
nestedEmployee.refs = new ArrayList();
- nestedEmployee.refs.add(new JAXBElement(new QName("integer-root"), Integer.class, new Integer(29)));
+ nestedEmployee.refs.add(new JAXBElement(new QName("integer-root"), Integer.class, Integer.valueOf(29)));
choices.add(nestedEmployee);
employee.refs = choices;
return employee;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/TestObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/TestObjectFactory.java
index 430d8f9..384e567 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/TestObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/TestObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public JAXBElement<String> createRoot() {
@XmlElementDecl(name="integer-root")
public JAXBElement<Integer> createIntegerRoot() {
- return new JAXBElement<Integer>(new QName("integer-root"), Integer.class, new Integer(0));
+ return new JAXBElement<Integer>(new QName("integer-root"), Integer.class, Integer.valueOf(0));
}
public EmployeeCollection createEmployeeCollection() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java
index 9013282..f5a3037 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,7 +43,7 @@ protected Object getControlObject() {
barC.a = "a";
barC.b = "b";
foo.collectionChoice.add(barC);
- foo.collectionChoice.add(new Integer(123));
+ foo.collectionChoice.add(Integer.valueOf(123));
return foo;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java
index c62ecfc..e9f7574 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,6 @@ public ExampleEnum marshal(Byte v) throws Exception {
}
public Byte unmarshal(ExampleEnum v) throws Exception {
- return new Byte((byte)v.getValue());
+ return Byte.valueOf((byte)v.getValue());
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java
index a09baeb..77c8fc1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@ public void testObjectToXMLStreamWriterRepairing() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(true));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -128,7 +128,7 @@ public void testObjectToXMLStreamWriterRepairingRecord() throws Exception {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(true));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java
index d30ec30..bee3de9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,13 +38,13 @@ protected Object getJSONReadControlObject(){
//same as getReadControl Except order is different
EmployeeCollection employee = new EmployeeCollection();
ArrayList choices = new ArrayList();
- choices.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, new Integer(21)));
+ choices.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(21)));
choices.add(new JAXBElement(new QName("root"), String.class, "Value1"));
choices.add(new JAXBElement(new QName("root"), String.class, "Value2"));
EmployeeCollection nestedEmployee = new EmployeeCollection();
nestedEmployee.refs = new ArrayList();
- nestedEmployee.refs.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, new Integer(29)));
+ nestedEmployee.refs.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(29)));
choices.add(nestedEmployee);
employee.refs = choices;
return employee;
@@ -53,11 +53,11 @@ protected Object getJSONReadControlObject(){
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
ArrayList choices = new ArrayList();
- choices.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, new Integer(21)));
+ choices.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(21)));
choices.add(new JAXBElement(new QName("root"), String.class, "Value1"));
EmployeeCollection nestedEmployee = new EmployeeCollection();
nestedEmployee.refs = new ArrayList();
- nestedEmployee.refs.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, new Integer(29)));
+ nestedEmployee.refs.add(new JAXBElement(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(29)));
choices.add(nestedEmployee);
choices.add(new JAXBElement(new QName("root"), String.class, "Value2"));
employee.refs = choices;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java
index 60d82ec..05e94b1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public EmployeeSingleTestCases(String name) throws Exception {
protected Object getControlObject() {
EmployeeSingle employee = new EmployeeSingle();
- employee.intRoot = new JAXBElement(new QName("myns", "integer-root"), Integer.class, new Integer(21));
+ employee.intRoot = new JAXBElement(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(21));
return employee;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/TestObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/TestObjectFactory.java
index 55f477a..23b5304 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/TestObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/TestObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public JAXBElement<String> createRoot() {
@XmlElementDecl(namespace="myns", name="integer-root")
public JAXBElement<Integer> createIntegerRoot() {
- return new JAXBElement<Integer>(new QName("myns", "integer-root"), Integer.class, new Integer(0));
+ return new JAXBElement<Integer>(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(0));
}
public EmployeeSingle createEmployeeSingle() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/ObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/ObjectFactory.java
index 1bab91c..af5e56d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/ObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/ObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ public BeanB createBeanB() {
@XmlElementDecl(name="value", scope=BeanB.class)
public JAXBElement<Integer> createBeanBValue() {
- return new JAXBElement<Integer>(new QName("value"), Integer.class, new Integer(12));
+ return new JAXBElement<Integer>(new QName("value"), Integer.class, Integer.valueOf(12));
}
@XmlElementDecl(name="value")
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java
index 16f1659..b094e1d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,13 +42,13 @@ protected Object getControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.id = CONTROL_ID;
Object[] choices =new Object[5];
- choices[0]= new Integer(12);
+ choices[0]= Integer.valueOf(12);
choices[1]="String Value";
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "123 Fake Street";
choices[2]=addr;
- choices[3]=new Integer(5);
+ choices[3]=Integer.valueOf(5);
choices[4] = "";
employee.choice = choices;
return employee;
@@ -58,8 +58,8 @@ protected Object getJSONReadControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.id = CONTROL_ID;
Object[] choices =new Object[5];
- choices[0]= new Integer(12);
- choices[1]=new Integer(5);
+ choices[0]= Integer.valueOf(12);
+ choices[1]=Integer.valueOf(5);
choices[2]="String Value";
choices[3] = "";
Address addr = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java
index 374ce75..d769da6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,13 +39,13 @@ protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
ArrayList choices = new ArrayList();
- choices.add(new Integer(12));
+ choices.add(Integer.valueOf(12));
choices.add("String Value");
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "123 Fake Street";
choices.add(addr);
- choices.add(new Integer(5));
+ choices.add(Integer.valueOf(5));
choices.add("");
employee.choice = choices;
return employee;
@@ -55,8 +55,8 @@ protected Object getJSONReadControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
ArrayList choices = new ArrayList();
- choices.add(new Integer(12));
- choices.add(new Integer(5));
+ choices.add(Integer.valueOf(12));
+ choices.add(Integer.valueOf(5));
choices.add("String Value");
choices.add("");
Address addr = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java
index e68cd31..f2de5ec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,14 +45,14 @@ protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
ArrayList choices = new ArrayList();
- choices.add(new Integer(12));
+ choices.add(Integer.valueOf(12));
choices.add("String Value");
CanadianAddress addr = new CanadianAddress();
addr.city = "Ottawa";
addr.street = "123 Fake Street";
addr.postalCode = "A1A 1A1";
choices.add(addr);
- choices.add(new Integer(5));
+ choices.add(Integer.valueOf(5));
employee.choice = choices;
return employee;
}
@@ -61,8 +61,8 @@ protected Object getJSONReadControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
ArrayList choices = new ArrayList();
- choices.add(new Integer(12));
- choices.add(new Integer(5));
+ choices.add(Integer.valueOf(12));
+ choices.add(Integer.valueOf(5));
choices.add("String Value");
CanadianAddress addr = new CanadianAddress();
addr.city = "Ottawa";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java
index fe9e72f..fe87c81 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ public XmlElementsIntegerTestCases(String name) throws Exception {
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
- employee.choice = new Integer(12);
+ employee.choice = Integer.valueOf(12);
return employee;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java
index 4b93d60..7172a0d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,7 +63,7 @@ public void setUp() throws Exception {
originalEncoding = (String)marshaller.getProperty(Marshaller.JAXB_ENCODING);
originalFormatting = (Boolean)marshaller.getProperty(Marshaller.JAXB_FORMATTED_OUTPUT);
marshaller.setProperty(Marshaller.JAXB_ENCODING, encoding);
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, new Boolean(false));
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.valueOf(false));
controlObject = setupControlObject();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java
index af08cc0..0903cb0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,7 +71,7 @@ public void testFormattingTrue() throws Exception {
public void testInvalidFormatting() throws Exception {
try {
- Object value = new Integer(10);
+ Object value = Integer.valueOf(10);
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, value);
} catch (PropertyException e) {
this.assertTrue(true);
@@ -87,7 +87,7 @@ private void formatTest(boolean isFormatted, String controlString) throws Except
StringWriter writer = new StringWriter();
Boolean originalSetting = (Boolean) marshaller.getProperty(Marshaller.JAXB_FORMATTED_OUTPUT);
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, new Boolean(isFormatted));
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.valueOf(isFormatted));
marshaller.marshal(controlObject, writer);
log("Expected:" + controlString);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java
index 01a21b4..420341c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,7 +48,7 @@ public void setUp() throws Exception {
marshaller = jaxbContext.createMarshaller();
originalSetting = (Boolean)marshaller.getProperty(XMLConstants.JAXB_FRAGMENT);
- marshaller.setProperty(XMLConstants.JAXB_FRAGMENT, new Boolean(true));
+ marshaller.setProperty(XMLConstants.JAXB_FRAGMENT, Boolean.valueOf(true));
//set up controlObject
controlObject = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java
index 3ffee40..b2bac90 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,12 +25,12 @@
*/
public class MarshalListenerImpl implements XMLMarshalListener {
- static Integer EMPLOYEE_BEFORE_MARSHAL = new Integer(0);
- static Integer ADDRESS_BEFORE_MARSHAL = new Integer(1);
- static Integer PHONE_BEFORE_MARSHAL = new Integer(2);
- static Integer EMPLOYEE_AFTER_MARSHAL = new Integer(3);
- static Integer ADDRESS_AFTER_MARSHAL = new Integer(4);
- static Integer PHONE_AFTER_MARSHAL = new Integer(5);
+ static Integer EMPLOYEE_BEFORE_MARSHAL = Integer.valueOf(0);
+ static Integer ADDRESS_BEFORE_MARSHAL = Integer.valueOf(1);
+ static Integer PHONE_BEFORE_MARSHAL = Integer.valueOf(2);
+ static Integer EMPLOYEE_AFTER_MARSHAL = Integer.valueOf(3);
+ static Integer ADDRESS_AFTER_MARSHAL = Integer.valueOf(4);
+ static Integer PHONE_AFTER_MARSHAL = Integer.valueOf(5);
public ArrayList events = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java
index 55a6493..de1270e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,12 +25,12 @@
*/
public class UnmarshalListenerImpl implements XMLUnmarshalListener {
- static Integer EMPLOYEE_BEFORE_UNMARSHAL = new Integer(0);
- static Integer ADDRESS_BEFORE_UNMARSHAL = new Integer(1);
- static Integer PHONE_BEFORE_UNMARSHAL = new Integer(2);
- static Integer EMPLOYEE_AFTER_UNMARSHAL = new Integer(3);
- static Integer ADDRESS_AFTER_UNMARSHAL = new Integer(4);
- static Integer PHONE_AFTER_UNMARSHAL = new Integer(5);
+ static Integer EMPLOYEE_BEFORE_UNMARSHAL = Integer.valueOf(0);
+ static Integer ADDRESS_BEFORE_UNMARSHAL = Integer.valueOf(1);
+ static Integer PHONE_BEFORE_UNMARSHAL = Integer.valueOf(2);
+ static Integer EMPLOYEE_AFTER_UNMARSHAL = Integer.valueOf(3);
+ static Integer ADDRESS_AFTER_UNMARSHAL = Integer.valueOf(4);
+ static Integer PHONE_AFTER_UNMARSHAL = Integer.valueOf(5);
public ArrayList events = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java
index 79de391..b364a6d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,8 +24,8 @@
import org.w3c.dom.Document;
public class PostBuildEventTestCases extends XMLMappingTestCases {
- static Integer EMPLOYEE_POST_BUILD = new Integer(0);
- static Integer ADDRESS_POST_BUILD = new Integer(1);
+ static Integer EMPLOYEE_POST_BUILD = Integer.valueOf(0);
+ static Integer ADDRESS_POST_BUILD = Integer.valueOf(1);
EmployeeProject project;
public PostBuildEventTestCases(String name) throws Exception {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java
index 0c89470..6c14c22 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -487,7 +487,7 @@ public void testObjectToXMLStreamWriter() throws Exception {
if(XML_OUTPUT_FACTORY != null && staxResultClass != null) {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -532,7 +532,7 @@ public void testObjectToXMLEventWriter() throws Exception {
if(XML_OUTPUT_FACTORY != null && staxResultClass != null) {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, new Boolean(false));
+ factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java
index c2ca703..c2631a4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,7 +76,7 @@ public Object getControlObject() {
XMLRoot xmlroot2 = new XMLRoot();
- xmlroot2.setObject(new Integer(15));
+ xmlroot2.setObject(Integer.valueOf(15));
//xmlroot2.setObject("15");
xmlroot2.setLocalName("myns:theInteger");
xmlroot2.setNamespaceURI("www.example.com/some-dir/some.xsd");
@@ -149,7 +149,7 @@ public Object getJSONReadControlObject(){
XMLRoot xmlroot2 = new XMLRoot();
- xmlroot2.setObject(new Integer(15));
+ xmlroot2.setObject(Integer.valueOf(15));
//xmlroot2.setObject("15");
xmlroot2.setLocalName("theInteger");
xmlroot2.setNamespaceURI("www.example.com/some-dir/some.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java
index 605c25a..156f0c1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,7 +58,7 @@ public Object getControlObject() {
XMLRoot xmlroot2 = new XMLRoot();
- xmlroot2.setObject(new Integer(15));
+ xmlroot2.setObject(Integer.valueOf(15));
xmlroot2.setLocalName("theInteger");
xmlroot2.setSchemaType(XMLConstants.INT_QNAME);
any.addElement(xmlroot2);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java
index 57c8778..878f03c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,7 +51,7 @@ protected Object getControlObject() {
Byte[] objectBytes = new Byte[bytes.length];
for (int index = 0; index < bytes.length; index++) {
- objectBytes[index] = new Byte(bytes[index]);
+ objectBytes[index] = Byte.valueOf(bytes[index]);
}
emp.setPhoto(objectBytes);
emp.setData(new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text"));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/EmployeeWithByteObjectArray.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/EmployeeWithByteObjectArray.java
index 014d10d..15327a2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/EmployeeWithByteObjectArray.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/EmployeeWithByteObjectArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ public static EmployeeWithByteObjectArray example1() {
byte[] bytes = MyAttachmentUnmarshaller.PHOTO_BASE64.getBytes();
Byte[] objectBytes = new Byte[bytes.length];
for (int index = 0; index < bytes.length; index++) {
- objectBytes[index] = new Byte(bytes[index]);
+ objectBytes[index] = Byte.valueOf(bytes[index]);
}
return new EmployeeWithByteObjectArray(DEFAULT_ID, objectBytes);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/EmployeeWithByteArrayObject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/EmployeeWithByteArrayObject.java
index ef0ed06..1a6b4ef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/EmployeeWithByteArrayObject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/EmployeeWithByteArrayObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ public static Employee example1() {
byte[] bytes = MyAttachmentUnmarshaller.PHOTO_BASE64.getBytes();
Byte[] objectBytes = new Byte[bytes.length];
for (int index = 0; index < bytes.length; index++) {
- objectBytes[index] = new Byte(bytes[index]);
+ objectBytes[index] = Byte.valueOf(bytes[index]);
}
photos.addElement(objectBytes);
photos.addElement(objectBytes);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java
index 60b0b47..cea1185 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,7 +50,7 @@ protected Object getControlObject() {
Byte[] objectBytes = new Byte[bytes.length];
for (int index = 0; index < bytes.length; index++) {
- objectBytes[index] = new Byte(bytes[index]);
+ objectBytes[index] = Byte.valueOf(bytes[index]);
}
photos.addElement(objectBytes);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java
index 29b95fe..f1b096c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
- employee.choice = new Integer(12);
+ employee.choice = Integer.valueOf(12);
employee.phone = "123-4567";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java
index 1b8c4cd..51be6fb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,12 +45,12 @@ public Object getReadControlObject() {
employee.choice = new java.util.Vector<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
+ employee.choice.add(Integer.valueOf(12));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
employee.choice.add(addr);
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(14));
employee.choice.add("addressString");
@@ -65,12 +65,12 @@ protected Object getControlObject() {
employee.choice = new java.util.Vector<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
+ employee.choice.add(Integer.valueOf(12));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
employee.choice.add(addr);
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(14));
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName("simpleAddress");
@@ -88,8 +88,8 @@ public Object getJSONReadControlObject() {
employee.choice = new java.util.Vector<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(12));
+ employee.choice.add(Integer.valueOf(14));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java
index 80a48c3..2efc5ef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,12 +43,12 @@ protected Object getControlObject() {
employee.choice = new java.util.Vector<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
+ employee.choice.add(Integer.valueOf(12));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
employee.choice.add(addr);
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(14));
employee.phone = "123-4567";
@@ -62,8 +62,8 @@ public Object getJSONReadControlObject() {
employee.choice = new java.util.Vector<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(12));
+ employee.choice.add(Integer.valueOf(14));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java
index a055123..a8feddd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,12 @@ public Object getReadControlObject() {
employee.choice = new LinkedList<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
+ employee.choice.add(Integer.valueOf(12));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
employee.choice.add(addr);
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(14));
employee.choice.add("addressString");
@@ -58,12 +58,12 @@ protected Object getControlObject() {
employee.choice = new LinkedList<Object>();
employee.choice.add("123 Fake Street");
- employee.choice.add(new Integer(12));
+ employee.choice.add(Integer.valueOf(12));
Address addr = new Address();
addr.city = "Ottawa";
addr.street = "45 O'Connor";
employee.choice.add(addr);
- employee.choice.add(new Integer(14));
+ employee.choice.add(Integer.valueOf(14));
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName("simpleAddress");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java
index 13512c3..8de3307 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,7 +70,7 @@ protected Object getControlObject() {
mailingAddress2.setPostalCode(CONTROL_MAILING_ADDRESS_2_POSTAL_CODE);
employee.getMailingAddresses().add(mailingAddress2);
- employee.getMailingAddresses().add(new Integer(5));
+ employee.getMailingAddresses().add(Integer.valueOf(5));
return employee;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java
index b48d837..f3f43f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,9 +24,9 @@ public class DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerIdentifiedByName.xml";
private final static int CONTROL_ID = 123;
- private final static Integer CONTROL_RESPONSIBILITY1 = new Integer(100);
- private final static Integer CONTROL_RESPONSIBILITY2 = new Integer(200);
- private final static Integer CONTROL_RESPONSIBILITY3 = new Integer(300);
+ private final static Integer CONTROL_RESPONSIBILITY1 = Integer.valueOf(100);
+ private final static Integer CONTROL_RESPONSIBILITY2 = Integer.valueOf(200);
+ private final static Integer CONTROL_RESPONSIBILITY3 = Integer.valueOf(300);
public DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java
index 944c91e..bc7beba 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,9 +23,9 @@
public class DirectCollectionWithGroupingElementIntegerSingleNodeTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNode.xml";
private final static int CONTROL_ID = 123;
- private final static Integer CONTROL_RESPONSIBILITY1 = new Integer(100);
- private final static Integer CONTROL_RESPONSIBILITY2 = new Integer(200);
- private final static Integer CONTROL_RESPONSIBILITY3 = new Integer(300);
+ private final static Integer CONTROL_RESPONSIBILITY1 = Integer.valueOf(100);
+ private final static Integer CONTROL_RESPONSIBILITY2 = Integer.valueOf(200);
+ private final static Integer CONTROL_RESPONSIBILITY3 = Integer.valueOf(300);
public DirectCollectionWithGroupingElementIntegerSingleNodeTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java
index 38a8c09..3c59acb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,9 +23,9 @@ public class DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCa
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerIdentifiedByName.xml";
private final static int CONTROL_ID = 123;
- private final static Integer CONTROL_RESPONSIBILITY1 = new Integer(100);
- private final static Integer CONTROL_RESPONSIBILITY2 = new Integer(200);
- private final static Integer CONTROL_RESPONSIBILITY3 = new Integer(300);
+ private final static Integer CONTROL_RESPONSIBILITY1 = Integer.valueOf(100);
+ private final static Integer CONTROL_RESPONSIBILITY2 = Integer.valueOf(200);
+ private final static Integer CONTROL_RESPONSIBILITY3 = Integer.valueOf(300);
public DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java
index f5f47b1..f1f27d9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,9 +27,9 @@
public class DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithComment.xml";
private final static int CONTROL_ID = 123;
- private final static Integer CONTROL_RESPONSIBILITY1 = new Integer(100);
- private final static Integer CONTROL_RESPONSIBILITY2 = new Integer(200);
- private final static Integer CONTROL_RESPONSIBILITY3 = new Integer(300);
+ private final static Integer CONTROL_RESPONSIBILITY1 = Integer.valueOf(100);
+ private final static Integer CONTROL_RESPONSIBILITY2 = Integer.valueOf(200);
+ private final static Integer CONTROL_RESPONSIBILITY3 = Integer.valueOf(300);
public DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java
index 57aded4..7809c5c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,9 +24,9 @@ public class WithGroupingElementIdentifiedByNameIntegerTestCases extends XMLMapp
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIntegerIdentifiedByName.xml";
private final static int CONTROL_ID = 123;
- private final static Integer CONTROL_RESPONSIBILITY1 = new Integer(100);
- private final static Integer CONTROL_RESPONSIBILITY2 = new Integer(200);
- private final static Integer CONTROL_RESPONSIBILITY3 = new Integer(300);
+ private final static Integer CONTROL_RESPONSIBILITY1 = Integer.valueOf(100);
+ private final static Integer CONTROL_RESPONSIBILITY2 = Integer.valueOf(200);
+ private final static Integer CONTROL_RESPONSIBILITY3 = Integer.valueOf(300);
public WithGroupingElementIdentifiedByNameIntegerTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java
index e70d56b..2eaa123 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,9 +23,9 @@ public class WithoutGroupingElementIdentifiedByNameIntegerTestCases extends XMLM
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIntegerIdentifiedByName.xml";
private final static int CONTROL_ID = 123;
- private final static Integer CONTROL_RESPONSIBILITY1 = new Integer(100);
- private final static Integer CONTROL_RESPONSIBILITY2 = new Integer(200);
- private final static Integer CONTROL_RESPONSIBILITY3 = new Integer(300);
+ private final static Integer CONTROL_RESPONSIBILITY1 = Integer.valueOf(100);
+ private final static Integer CONTROL_RESPONSIBILITY2 = Integer.valueOf(200);
+ private final static Integer CONTROL_RESPONSIBILITY3 = Integer.valueOf(300);
public WithoutGroupingElementIdentifiedByNameIntegerTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java
index b807cca..945ecca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,7 @@
public class UnionWithTypeAttributeTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttribute.xml";
- protected final static Integer CONTROL_ITEM = new Integer(10);
+ protected final static Integer CONTROL_ITEM = Integer.valueOf(10);
protected final static String CONTROL_FIRST_NAME = "Jane";
protected final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/DefaultNullValueAttributeProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/DefaultNullValueAttributeProject.java
index 477ecf3..6182efb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/DefaultNullValueAttributeProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/DefaultNullValueAttributeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@ private XMLDescriptor getEmployeeDescriptor() {
idMapping.setAttributeName("id");
idMapping.getAttributeName();
idMapping.setXPath("@id");
- idMapping.setNullValue(new Integer(CONTROL_ID));
+ idMapping.setNullValue(Integer.valueOf(CONTROL_ID));
xmlDescriptor.addMapping(idMapping);
//XMLDirectMapping firstNameMapping = new XMLDirectMapping();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/DefaultNullValueElementProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/DefaultNullValueElementProject.java
index 3edc7ca..dd60419 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/DefaultNullValueElementProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/DefaultNullValueElementProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,13 +36,13 @@ private XMLDescriptor getEmployeeDescriptor() {
XMLDirectMapping idMapping = new XMLDirectMapping();
idMapping.setAttributeName("id");
idMapping.setXPath("id/text()");
- idMapping.setNullValue(new Integer(CONTROL_ID));
+ idMapping.setNullValue(Integer.valueOf(CONTROL_ID));
xmlDescriptor.addMapping(idMapping);
XMLDirectMapping numericNoNullValueMapping = new XMLDirectMapping();
numericNoNullValueMapping.setAttributeName("numericNoNullValue");
numericNoNullValueMapping.setXPath("numeric-no-null-value/text()");
- //numericNoNullValueMapping.setNullValue(new Integer(CONTROL_ID));
+ //numericNoNullValueMapping.setNullValue(Integer.valueOf(CONTROL_ID));
xmlDescriptor.addMapping(numericNoNullValueMapping);
XMLDirectMapping firstNameMapping = new XMLDirectMapping();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java
index b877fa8..9c4e1d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,7 +22,7 @@ public class DirectToFieldDoubleTestCases extends XMLMappingTestCases {
private final static int CONTROL_ID = 123;
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
- private final static Double CONTROL_SALARY = new Double(100000.0);
+ private final static Double CONTROL_SALARY = Double.valueOf(100000.0);
public DirectToFieldDoubleTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java
index d73dc2f..3c054f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,7 +22,7 @@ public class DirectToFieldFloatTestCases extends XMLMappingTestCases {
private final static int CONTROL_ID = 123;
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
- private final static Float CONTROL_SALARY = new Float(100000.0);
+ private final static Float CONTROL_SALARY = Float.valueOf(100000.0f);
public DirectToFieldFloatTestCases(String name) throws Exception {
super(name);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameProject.java
index 99387b5..03c8d20 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,7 +46,7 @@ private XMLDescriptor getEmployeeDescriptor() {
XMLDirectMapping marriedMapping = new XMLDirectMapping();
marriedMapping.setAttributeName("married");
- marriedMapping.setNullValue(new Boolean(false));
+ marriedMapping.setNullValue(Boolean.valueOf(false));
marriedMapping.setXPath("married/text()");
descriptor.addMapping(marriedMapping);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java
index fb8ca77..17976ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,7 +46,7 @@ public DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases(Str
// TODO: verify EMPTY_STRING behavior
//Object[] isSetParameters = {"x","y", false, (int)1, (short)1, (long)1, (double)1.0, (float)1.0, (byte)1};
- Object[] isSetParameters = {"x","y", new Boolean(true), new Integer(255), new Short((short)32767), new Long(1), new Double(1.0), new Float(-1.0), new Byte((byte)32), new Character('C')};
+ Object[] isSetParameters = {"x","y", Boolean.valueOf(true), Integer.valueOf(255), Short.valueOf((short)32767), Long.valueOf(1), Double.valueOf(1.0), Float.valueOf(-1.0f), Byte.valueOf((byte)32), Character.valueOf('C')};
//Object[] isSetParameters = {"x","y"};
((IsSetNullPolicy)aNullPolicy).setIsSetMethodName("isSetFirstName");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java
index 06f7a27..c1df0e8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@ protected Object getControlObject() {
Byte[] byteObjects = new Byte[bytes.length];
for (int i = 0; i < bytes.length; i++) {
- byteObjects[i] = new Byte(bytes[i]);
+ byteObjects[i] = Byte.valueOf(bytes[i]);
}
byteHolder.setBytes(byteObjects);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java
index f21c37d..aa0fae5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ protected Object getControlObject() {
Byte[] byteObjects = new Byte[bytes.length];
for (int i = 0; i < bytes.length; i++) {
- byteObjects[i] = new Byte(bytes[i]);
+ byteObjects[i] = Byte.valueOf(bytes[i]);
}
byteHolder.setBytes(byteObjects);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/Employee.java
index 5815ff8..09eefdd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public int getID() {
}
public void setID(int newID) {
- id = new Integer(newID);
+ id = Integer.valueOf(newID);
}
public Integer getIntegerId() {
return id;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java
index eb68df2..8b67974 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeCustomAddTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAdd.xml";
- private final static Integer CONTROL_ID = new Integer(123);
+ private final static Integer CONTROL_ID = Integer.valueOf(123);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java
index 77c0988..95c9433 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeDoubleTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDouble.xml";
- private final static Double CONTROL_ID = new Double(123.0);
+ private final static Double CONTROL_ID = Double.valueOf(123.0);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java
index def4d1f..fa78bf3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeFloatTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloat.xml";
- private final static Float CONTROL_ID = new Float(123.0);
+ private final static Float CONTROL_ID = Float.valueOf(123.0f);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java
index 3f60f2a..3c9357d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeIntegerTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeInteger.xml";
- private final static Integer CONTROL_ID = new Integer(123);
+ private final static Integer CONTROL_ID = Integer.valueOf(123);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java
index 4569017..0295d29 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeNonXsiPrefixTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefix.xml";
- private final static Integer CONTROL_ID = new Integer(123);
+ private final static Integer CONTROL_ID = Integer.valueOf(123);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java
index 19cdab8..059f5e6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,7 @@ protected Object getControlObject() {
Employee employee = new Employee();
Identifier id = new Identifier();
id.setInitials("AAA");
- id.setSinNumber(new Integer(123));
+ id.setSinNumber(Integer.valueOf(123));
employee.setIdentifier(id);
employee.setFirstName(CONTROL_FIRST_NAME);
employee.setLastName(CONTROL_LAST_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java
index f48776e..c90b7d8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeUserTypeNamespaceOnChildTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserType1.xml";
- private final static Integer CONTROL_ID = new Integer(123);
+ private final static Integer CONTROL_ID = Integer.valueOf(123);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java
index 5195f75..b98b408 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
public class TypeAttributeUserTypeNamespaceOnParentTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserType2.xml";
- private final static Integer CONTROL_ID = new Integer(123);
+ private final static Integer CONTROL_ID = Integer.valueOf(123);
private final static String CONTROL_FIRST_NAME = "Jane";
private final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java
index 951e8df..6a3038f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,7 @@
public class UnionWithTypeAttributeTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttribute.xml";
- protected final static Integer CONTROL_AGE = new Integer(10);
+ protected final static Integer CONTROL_AGE = Integer.valueOf(10);
protected final static String CONTROL_FIRST_NAME = "Jane";
protected final static String CONTROL_LAST_NAME = "Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java
index 20e7c04..af2ddc0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,7 @@
public class TypeTranslatorTestCases extends XMLMappingTestCases {
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/TypeTranslatorTest.xml";
private final static String CONTROL_EMPLOYEE_NAME = "Jane Doh";
- private final static Integer CONTROL_EMPLOYEE_PHONE = new Integer(4441234);
+ private final static Integer CONTROL_EMPLOYEE_PHONE = Integer.valueOf(4441234);
private XMLMarshaller xmlMarshaller;
public TypeTranslatorTestCases(String name) throws Exception {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java
index dbba032..5618e75 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,7 +41,7 @@ protected Object getControlObject() {
Byte[] byteObjects = new Byte[bytes.length];
for(int i=0; i<bytes.length; i++){
- byteObjects[i] = new Byte(bytes[i]);
+ byteObjects[i] = Byte.valueOf(bytes[i]);
}
byteHolder.setBytes(byteObjects);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java
index 62be251..6d7de5b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public void setUp() {
public void testIntegerToString_base64() {
try {
- Integer integer = new Integer(1);
+ Integer integer = Integer.valueOf(1);
xcm.convertObject(integer, ClassConstants.ABYTE, XMLConstants.BASE_64_BINARY_QNAME);
} catch (ConversionException e) {
assertTrue("The incorrect exception was thrown", e.getErrorCode() == ConversionException.COULD_NOT_BE_CONVERTED);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java
index ac32b31..4bc580d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,7 +32,7 @@ public DoubleToBigDecimalTestCases(String name) {
public void testConvertDoubleToBigDecimal1() {
String controlString = "1.1";
- Double controlDouble = new Double(controlString);
+ Double controlDouble = Double.valueOf(controlString);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals(controlString, testString);
@@ -40,7 +40,7 @@ public void testConvertDoubleToBigDecimal1() {
public void testConvertDoubleToBigDecimal2a() {
String controlString = "1";
- Double controlDouble = new Double(1);
+ Double controlDouble = Double.valueOf(1);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals(controlString, testString);
@@ -48,7 +48,7 @@ public void testConvertDoubleToBigDecimal2a() {
public void testConvertDoubleToBigDecimal2b() {
String controlString = "1";
- Double controlDouble = new Double(1.0);
+ Double controlDouble = Double.valueOf(1.0);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals(controlString, testString);
@@ -56,7 +56,7 @@ public void testConvertDoubleToBigDecimal2b() {
public void testConvertDoubleToBigDecimal3a() {
String controlString = "1.0E-10";
- Double controlDouble = new Double(controlString);
+ Double controlDouble = Double.valueOf(controlString);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals(controlString, testString);
@@ -64,7 +64,7 @@ public void testConvertDoubleToBigDecimal3a() {
public void testConvertDoubleToBigDecimal3b() {
String controlString = "0.00000000010";
- Double controlDouble = new Double(controlString);
+ Double controlDouble = Double.valueOf(controlString);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals("1.0E-10", testString);
@@ -72,7 +72,7 @@ public void testConvertDoubleToBigDecimal3b() {
public void testConvertDoubleToBigDecimal4a() {
String controlString = "1000000000";
- Double controlDouble = new Double(1000000000);
+ Double controlDouble = Double.valueOf(1000000000);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals("1.0E+9", testString);
@@ -80,7 +80,7 @@ public void testConvertDoubleToBigDecimal4a() {
public void testConvertDoubleToBigDecimal4b() {
String controlString = "1000000000";
- Double controlDouble = new Double(1000000000.0);
+ Double controlDouble = Double.valueOf(1000000000.0);
BigDecimal testBigDecimal = (BigDecimal) xmlConversionManager.convertObject(controlDouble, BigDecimal.class);
String testString = String.valueOf(testBigDecimal);
assertEquals("1.0E+9", testString);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java
index 55cdd2c..6617993 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@ public NumberTestCases(String name) {
}
public void testConvertWithPlusToByte() {
- Byte controlByte = new Byte("1");
+ Byte controlByte = Byte.valueOf("1");
Byte testByte = (Byte) xmlConversionManager.convertObject("+1", Byte.class);
String testString = String.valueOf(testByte);
String controlString = String.valueOf(controlByte);
@@ -44,7 +44,7 @@ public void testConvertWithPlusToByte() {
}
public void testConvertWithPlusToInteger() {
- Integer controlInteger = new Integer("1");
+ Integer controlInteger = Integer.valueOf("1");
Integer testInteger = (Integer) xmlConversionManager.convertObject("+1", Integer.class);
String testString = String.valueOf(testInteger);
String controlString = String.valueOf(controlInteger);
@@ -52,7 +52,7 @@ public void testConvertWithPlusToInteger() {
}
public void testConvertWithMinuToByte() {
- Byte controlByte = new Byte("-1");
+ Byte controlByte = Byte.valueOf("-1");
Byte testByte = (Byte) xmlConversionManager.convertObject("-1", Byte.class);
String testString = String.valueOf(testByte);
String controlString = String.valueOf(controlByte);
@@ -60,7 +60,7 @@ public void testConvertWithMinuToByte() {
}
public void testConvertWithMinusToInteger() {
- Integer controlInteger = new Integer("-1");
+ Integer controlInteger = Integer.valueOf("-1");
Integer testInteger = (Integer) xmlConversionManager.convertObject("-1", Integer.class);
String testString = String.valueOf(testInteger);
String controlString = String.valueOf(controlInteger);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java
index f05a3ed..5fcc756 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -115,7 +115,7 @@ public void testStringToQName_qname_ns() {
public void testIntegerToQName_default() {
try {
- Integer integer = new Integer(1);
+ Integer integer = Integer.valueOf(1);
xcm.convertObject(integer, QName.class);
} catch (ConversionException e) {
assertTrue("The incorrect exception was thrown", e.getErrorCode() == ConversionException.COULD_NOT_BE_CONVERTED);
@@ -124,7 +124,7 @@ public void testIntegerToQName_default() {
public void testIntegerToQName_qname() {
try {
- Integer integer = new Integer(1);
+ Integer integer = Integer.valueOf(1);
xcm.convertObject(integer, QName.class, XMLConstants.QNAME_QNAME);
} catch (ConversionException e) {
assertTrue("The incorrect exception was thrown", e.getErrorCode() == ConversionException.COULD_NOT_BE_CONVERTED);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/XMLRootComplexInheritanceProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/XMLRootComplexInheritanceProject.java
index 8523458..84bca12 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/XMLRootComplexInheritanceProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/XMLRootComplexInheritanceProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -73,7 +73,7 @@ private XMLDescriptor getEmployeeDescriptor() {
nameMapping.setAttributeName("empId");
nameMapping.setGetMethodName("getEmpId");
nameMapping.setSetMethodName("setEmpId");
- //nameMapping.setNullValue(new Integer(0));
+ //nameMapping.setNullValue(Integer.valueOf(0));
nameMapping.setXPath("id/text()");
descriptor.addMapping(nameMapping);
diff --git a/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java b/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java
index cdb8086..9d55253 100644
--- a/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java
+++ b/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@ public DeptImpl() {
}
public java.lang.Integer getDeptno() {
- return new Integer(getInt(START_PROPERTY_INDEX + 0));
+ return Integer.valueOf(getInt(START_PROPERTY_INDEX + 0));
}
public void setDeptno(java.lang.Integer value) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java
index 6b54f6a..14fb1f2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@ public DataHelperConvertFromStringTest(String name) {
public void testConverFromString() {
String b = "10";
- Integer B = new Integer(b);
+ Integer B = Integer.valueOf(b);
this.assertEquals(B, (Integer)dataHelper.convertFromStringValue(b, Integer.class, null));
}
@@ -58,7 +58,7 @@ public void testConverFromString_Calendar() {
public void testConverFromString_NoQname() {
String b = "10";
- Integer B = new Integer(b);
+ Integer B = Integer.valueOf(b);
this.assertEquals(B, (Integer)dataHelper.convertFromStringValue(b, Integer.class));
}
@@ -82,7 +82,7 @@ public void testConverFromString_Calendar_NoQname() {
public void testConverFromString_Type() {
String b = "10";
- Integer B = new Integer(b);
+ Integer B = Integer.valueOf(b);
this.assertEquals(B, (Integer)dataHelper.convertFromStringValue(b, Integer.class));
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java
index c4313e3..51801b2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,7 @@ public DataHelperConvertValueTest(String name) {
public void testToCalendarWithGYearMonth() {
String b = "true";
- Boolean B = new Boolean(b);
+ Boolean B = Boolean.valueOf(b);
this.assertEquals(B, (Boolean)dataHelper.convertValue(b, Boolean.class, null));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestCases.java
index dbe2119..3a577f3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,7 +22,7 @@ public class SDOXMLHelperTestCases extends SDOTestCase {
protected static final String CONTROL_ROOT_URI = "http://www.example.org";
protected static final String CONTROL_FIRST_NAME = "Jane";
protected static final String CONTROL_LAST_NAME = "Smith";
- protected static final Integer CONTROL_CUSTOMERID = new Integer("111");
+ protected static final Integer CONTROL_CUSTOMERID = Integer.valueOf("111");
protected static final String CONTROL_SIN = "123 456 789";
protected static final String SIN = "sin";
protected static final String CUSTOMERID = "customerID";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java
index 1701b29..29e8c43 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,7 +60,7 @@ protected void verifyAfterLoad(XMLDocument document) {
assertNotNull(prop);
assertEquals(SDOConstants.SDO_INT, prop.getType());
assertTrue(value instanceof Integer);
- assertEquals(new Integer(10), ((Integer)value));
+ assertEquals(Integer.valueOf(10), ((Integer)value));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/XSDHelperAttributeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/XSDHelperAttributeTestCases.java
index 8c745ae..2eab211 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/XSDHelperAttributeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/XSDHelperAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -232,7 +232,7 @@ public void testAttributeWithReference() {
assertEquals(myTestType, p.getContainingType());
// check default value !! it is propbably good to also test string !!
// !! reason: getDefault() returns Obj, but actual xml default value can be int or float which is not Obj !!
- assertEquals(p.getDefault(), new Integer(3));
+ assertEquals(p.getDefault(), Integer.valueOf(3));
// check opposite Property
assertNull(p.getOpposite());
@@ -337,7 +337,7 @@ public void testAttributeWithSDO_PropertyType() {
// check default value
//TODO:should defaultValue be null - 20070703: since propertyType is now complex - we expect a null Object reference for default
assertNull(p.getDefault());
- //assertEquals(new Integer(0), p.getDefault());
+ //assertEquals(Integer.valueOf(0), p.getDefault());
// check opposite Property
assertNull(p.getOpposite());
@@ -399,7 +399,7 @@ public void testAttributeWithSDO_OppositeProperty() {
// check default value
//TODO:should defaultValue be null - 20070703: since propertyType is now complex - we expect a null Object reference for default
assertNull(p.getDefault());
- //assertEquals(new Integer(0), p.getDefault());
+ //assertEquals(Integer.valueOf(0), p.getDefault());
// check opposite Property
Property op_pro = p.getOpposite();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java
index 85e8ccb..a63f682 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -241,7 +241,7 @@ public void testElementWithReference() {
this.assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! facing same problem as attribute's test !!
- this.assertEquals((Integer)p.getDefault(), new Integer(3));
+ this.assertEquals((Integer)p.getDefault(), Integer.valueOf(3));
// check opposite Property
this.assertNull(p.getOpposite());
@@ -488,7 +488,7 @@ public void testElementWithDefault_Simple() {
this.assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertEquals((Integer)p.getDefault(), new Integer(3));
+ this.assertEquals((Integer)p.getDefault(), Integer.valueOf(3));
// check opposite Property
this.assertNull(p.getOpposite());
@@ -534,7 +534,7 @@ public void testElementWithFixed_Simple() {
this.assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertEquals((Integer)p.getDefault(), new Integer(3));
+ this.assertEquals((Integer)p.getDefault(), Integer.valueOf(3));
// check opposite Property
this.assertNull(p.getOpposite());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java
index b46abaf..828f57f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,7 +56,7 @@ public List<Type> getControlTypes() {
//prop.setAttribute(true);
//prop.setElement(false);
prop.setXsd(true);
- prop.setDefault(new Integer(0));
+ prop.setDefault(Integer.valueOf(0));
prop.setXsdLocalName("myAttr");
customerSDOType.addDeclaredProperty(prop);
@@ -67,7 +67,7 @@ public List<Type> getControlTypes() {
//prop2.setElement(true);
prop2.setInstanceProperty(SDOConstants.XMLELEMENT_PROPERTY, Boolean.TRUE);
prop2.setXsd(true);
- prop2.setDefault(new Integer(0));
+ prop2.setDefault(Integer.valueOf(0));
prop2.setXsdLocalName("myNonSpecified");
prop2.setXsdType(XMLConstants.INT_QNAME);
@@ -86,7 +86,7 @@ public List<Type> getControlTypes() {
prop3.setXsdLocalName("myNonNillable");
prop3.setContainment(true);
- prop3.setDefault(new Integer(0));
+ prop3.setDefault(Integer.valueOf(0));
customerSDOType.addDeclaredProperty(prop3);
@@ -95,7 +95,7 @@ public List<Type> getControlTypes() {
prop4.setType(intType);
//prop4.setAttribute(false);
prop4.setXsd(true);
- prop4.setDefault(new Integer(0));
+ prop4.setDefault(Integer.valueOf(0));
prop4.setContainment(true);
//prop4.setElement(true);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java
index c566a29..48506fe 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,7 +39,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPos
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
//b.add(bb);
@@ -57,7 +57,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositio
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -74,7 +74,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositio
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
- Boolean b = new Boolean(true);
+ Boolean b = Boolean.valueOf(true);
dataObject_a.setBoolean(property1, true);// c dataobject's a property has value boolean 'true'
@@ -89,7 +89,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInP
type_c.addDeclaredProperty(property_c);
dataObject_c.setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -225,7 +225,7 @@ public void testGetBooleanConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "true";
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject_c.setString(property_c, str);// add it to instance list
this.assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean(property));
@@ -238,7 +238,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanStringBracketPosit
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
String str = "true";
- Boolean bb = new Boolean(str);
+ Boolean bb = Boolean.valueOf(str);
List b = new ArrayList();
//b.add(bb);
@@ -258,7 +258,7 @@ public void testGetBooleanConversionWithPathFromDefinedStringPropertyDotPosition
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
String str = "true";
- Boolean bb = new Boolean(str);
+ Boolean bb = Boolean.valueOf(str);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -274,7 +274,7 @@ public void testGetBooleanConversionWithPathFromDefinedStringPropertyBracketInPa
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
String str = "true";
- Boolean b = new Boolean(str);
+ Boolean b = Boolean.valueOf(str);
dataObject_a.set(property1, b);// c dataobject's a property has value boolean 'true'
@@ -290,7 +290,7 @@ public void testGetBooleanConversionWithPathFromDefinedStringPropertyBracketInPa
dataObject_c.setType(type_c);
String str = "true";
- Boolean bb = new Boolean(str);
+ Boolean bb = Boolean.valueOf(str);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java
index cddbae0..04770ff 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,7 +80,7 @@ public void testGetBooleanFromCharacter() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_CHARACTER);
- Character b = new Character('1');
+ Character b = Character.valueOf('1');
dataObject.setChar(property, b.charValue());// add it to instance list
@@ -102,7 +102,7 @@ public void testGetBooleanFromDouble() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_DOUBLE);
- Double b = new Double(0);
+ Double b = Double.valueOf(0);
dataObject.setDouble(property, b.doubleValue());// add it to instance list
@@ -124,7 +124,7 @@ public void testGetBooleanFromFloat() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_FLOAT);
- Float b = new Float(1.20);
+ Float b = Float.valueOf(1.20f);
dataObject.setFloat(property, b.floatValue());// add it to instance list
@@ -146,7 +146,7 @@ public void testGetBooleanFromInt() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_INT);
- Integer b = new Integer(0);
+ Integer b = Integer.valueOf(0);
dataObject.setInt(property, b.intValue());// add it to instance list
@@ -168,7 +168,7 @@ public void testGetBooleanFromLong() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_LONG);
- Double b = new Double(0);
+ Double b = Double.valueOf(0);
dataObject.setDouble(property, b.doubleValue());// add it to instance list
@@ -191,7 +191,7 @@ public void testGetBooleanFromShort() {
property.setType(SDOConstants.SDO_SHORT);
short s = 12;
- Short b = new Short(s);
+ Short b = Short.valueOf(s);
dataObject.setShort(property, b.shortValue());// add it to instance list
@@ -215,7 +215,7 @@ public void testGetBooleanConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "true";
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject.setString(property, str);// add it to instance list
assertEquals(B_STR.booleanValue(), dataObject.getBoolean(property));
@@ -315,7 +315,7 @@ public void testGetBooleanConversionFromDefinedBooleanObjectProperty() {
public void testGetBooleanFromByteObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
- Byte theValue = new Byte("10");
+ Byte theValue = Byte.valueOf("10");
dataObject.set(property, theValue);
try {
boolean value = dataObject.getBoolean(property);
@@ -332,7 +332,7 @@ public void testGetBooleanFromCharacterObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
- Character b = new Character('1');
+ Character b = Character.valueOf('1');
dataObject.setChar(property, b.charValue());// add it to instance list
@@ -354,7 +354,7 @@ public void testGetBooleanFromDoubleObject() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
- Double b = new Double(0);
+ Double b = Double.valueOf(0);
dataObject.setDouble(property, b.doubleValue());// add it to instance list
@@ -375,7 +375,7 @@ public void testGetBooleanFromFloatObject() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_FLOATOBJECT);
- Float b = new Float(1.20);
+ Float b = Float.valueOf(1.20f);
dataObject.setFloat(property, b.floatValue());// add it to instance list
@@ -397,7 +397,7 @@ public void testGetBooleanFromIntObject() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_INTOBJECT);
- Integer b = new Integer(0);
+ Integer b = Integer.valueOf(0);
dataObject.setInt(property, b.intValue());// add it to instance list
@@ -419,7 +419,7 @@ public void testGetBooleanFromShortObject() {
property.setType(SDOConstants.SDO_SHORTOBJECT);
short s = 12;
- Short b = new Short(s);
+ Short b = Short.valueOf(s);
dataObject.setShort(property, b.shortValue());// add it to instance list
@@ -441,7 +441,7 @@ public void testGetBooleanFromCharacterT() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
- Character b = new Character('t');
+ Character b = Character.valueOf('t');
dataObject.setChar(property, b.charValue());// add it to instance list
@@ -460,7 +460,7 @@ public void testGetBooleanFromCharacterF() {
SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
- Character b = new Character('f');
+ Character b = Character.valueOf('f');
dataObject.setChar(property, b.charValue());// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java
index 7aa7861..220ccba 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -94,7 +94,7 @@ public void testGetBooleanFromCharacterT() {
char s = 't';
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setChar(property, s);// c dataobject's a property has value boolean 'true'
try {
@@ -128,7 +128,7 @@ public void testGetBooleanFromCharacterF() {
char s = 'f';
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setChar(property, s);// c dataobject's a property has value boolean 'true'
try {
@@ -151,7 +151,7 @@ public void testGetBooleanFromDouble() {
double s = 0;
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setDouble(property, s);// c dataobject's a property has value boolean 'true'
this.assertEquals(false, dataObject_a.getBoolean(property));
@@ -177,9 +177,9 @@ public void testGetBooleanFromFloat() {
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Float s = new Float(0);
+ Float s = Float.valueOf(0);
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setFloat(property, s.floatValue());// c dataobject's a property has value boolean 'true'
this.assertEquals(false, dataObject_a.getBoolean(property));
@@ -207,7 +207,7 @@ public void testGetBooleanFromInt() {
int s = 1;
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setInt(property, s);// c dataobject's a property has value boolean 'true'
this.assertEquals(true, dataObject_a.getBoolean(property));
@@ -235,7 +235,7 @@ public void testGetBooleanFromLong() {
long s = 0;
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setLong(property, s);// c dataobject's a property has value boolean 'true'
this.assertEquals(false, dataObject_a.getBoolean(property));
@@ -263,7 +263,7 @@ public void testGetBooleanFromShort() {
short s = 0;
- //Short c = new Short(s);
+ //Short c = Short.valueOf(s);
dataObject_a.setShort(property, s);// c dataobject's a property has value boolean 'true'
this.assertEquals(false, dataObject_a.getBoolean(property));
@@ -290,7 +290,7 @@ public void testGetBooleanConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "true";
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setString(property, str);// add it to instance list
this.assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean("PName-a/PName-b/PName-c"));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java
index b0c9179..2942d3b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -79,7 +79,7 @@ public void testGetBooleanFromCharacter() {
SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_CHARACTER);
- Character b = new Character('0');
+ Character b = Character.valueOf('0');
dataObject.setChar(PROPERTY_INDEX, b.charValue());// add it to instance list
@@ -102,7 +102,7 @@ public void testGetBooleanFromDouble() {
SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_DOUBLE);
- Double b = new Double(0);
+ Double b = Double.valueOf(0);
dataObject.setDouble(PROPERTY_INDEX, b.doubleValue());// add it to instance list
@@ -125,7 +125,7 @@ public void testGetBooleanFromFloat() {
SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_FLOAT);
- Float b = new Float(1.01);
+ Float b = Float.valueOf(1.01f);
dataObject.setFloat(PROPERTY_INDEX, b.floatValue());// add it to instance list
@@ -148,7 +148,7 @@ public void testGetBooleanFromInt() {
SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_INT);
- Integer b = new Integer(1);
+ Integer b = Integer.valueOf(1);
dataObject.setLong(PROPERTY_INDEX, b.intValue());// add it to instance list
@@ -171,7 +171,7 @@ public void testGetBooleanFromLong() {
SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_LONG);
- Long b = new Long(1);
+ Long b = Long.valueOf(1);
dataObject.setLong(PROPERTY_INDEX, b.longValue());// add it to instance list
@@ -211,7 +211,7 @@ public void testGetBooleanConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "true";
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
this.assertEquals(B_STR.booleanValue(), dataObject.getBoolean(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java
index d669901..dd03d41 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -206,7 +206,7 @@ public void testGetByteConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "12";
- Byte s_d = new Byte(str);
+ Byte s_d = Byte.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java
index a5bd901..a0b06a4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -215,7 +215,7 @@ public void testGetByteConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Byte s_d = new Byte(str);
+ Byte s_d = Byte.valueOf(str);
dataObject.setString(property, str);// add it to instance list
this.assertEquals(s_d.byteValue(), dataObject.getByte(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java
index 6780922..de07efb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -246,7 +246,7 @@ public void testGetByteConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Byte s_d = new Byte(str);
+ Byte s_d = Byte.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java
index a92fe8b..8c45f21 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -155,7 +155,7 @@ public void testGetByteConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Byte s_d = new Byte(str);
+ Byte s_d = Byte.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
this.assertEquals(s_d.byteValue(), dataObject.getByte(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java
index 37c1e4f..bb36023 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -230,7 +230,7 @@ public void testGetCharacterConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
char str = 'c';
- Character B_STR = new Character(str);
+ Character B_STR = Character.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, B_STR.toString());// add it to instance list
this.assertEquals(str, dataObject_a.getChar(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java
index 250786e..57a36ed 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -168,7 +168,7 @@ public void testGetCharacterConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
char str = 'c';
- Character B_STR = new Character(str);
+ Character B_STR = Character.valueOf(str);
dataObject.setString(property, B_STR.toString());// add it to instance list
this.assertEquals(str, dataObject.getChar(property));
@@ -268,7 +268,7 @@ public void testGetCharacterObjectFromBoolean() {
public void testGetCharacterFromByteObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
- Byte theValue = new Byte("10");
+ Byte theValue = Byte.valueOf("10");
dataObject.set(property, theValue);
try {
char value = dataObject.getChar(property);
@@ -292,7 +292,7 @@ public void testGetCharacterConversionFromDefinedCharacterObject() {
public void testGetCharacterFromDoubleObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
- Double theValue = new Double("1");
+ Double theValue = Double.valueOf("1");
dataObject.set(property, theValue);
try {
char value = dataObject.getChar(property);
@@ -306,7 +306,7 @@ public void testGetCharacterFromDoubleObject() {
public void testGetCharacterFromFloatObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
- Float theValue = new Float("1");
+ Float theValue = Float.valueOf("1");
dataObject.set(property, theValue);
try {
@@ -322,7 +322,7 @@ public void testGetCharacterFromFloatObject() {
public void testGetCharacterFromIntObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
- Integer theValue = new Integer("1");
+ Integer theValue = Integer.valueOf("1");
dataObject.set(property, theValue);
try {
@@ -338,7 +338,7 @@ public void testGetCharacterFromIntObject() {
public void testGetCharacterFromLongObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
- Long theValue = new Long("1");
+ Long theValue = Long.valueOf("1");
dataObject.set(property, theValue);
try {
@@ -354,7 +354,7 @@ public void testGetCharacterFromLongObject() {
public void testGetCharacterFromShortObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
- Short theValue = new Short("1");
+ Short theValue = Short.valueOf("1");
dataObject.set(property, theValue);
try {
char value = dataObject.getChar(property);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java
index 168cde0..73a12d8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -201,7 +201,7 @@ public void testGetCharacterConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
char str = 'c';
- Character B_STR = new Character(str);
+ Character B_STR = Character.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, B_STR.toString());// add it to instance list
this.assertEquals(str, dataObject_a.getChar(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java
index af9604b..27c9c2e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -173,7 +173,7 @@ public void testGetCharacterConversionFromDefinedStringProperty() {
type.addDeclaredProperty(property);
char str = 'c';
- Character B_STR = new Character(str);
+ Character B_STR = Character.valueOf(str);
dataObject.setString(PROPERTY_INDEX, B_STR.toString());// add it to instance list
this.assertEquals(str, dataObject.getChar(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java
index 932d46b..79d75f8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -125,7 +125,7 @@ public void testGetDataObjectConversionFromUndefinedProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
boolean c = true;
- Boolean C = new Boolean(c);
+ Boolean C = Boolean.valueOf(c);
dataObject_c.set(property_c, C);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java
index d029b7b..368c141 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,7 +62,7 @@ public void testGetDataObjectConversionFromUndefinedProperty() {
dataObject_c._setType(type_c);
boolean c = true;
- Boolean C = new Boolean(c);
+ Boolean C = Boolean.valueOf(c);
dataObject_c.set(property_c, C);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java
index f8c1c06..6f6f166 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -211,7 +211,7 @@ public void testGetDateFromDecimal() {
public void testGetDateFromInteger() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
- dataObject.set(property, new Integer(2));
+ dataObject.set(property, Integer.valueOf(2));
try {
dataObject.getDate(property);
fail("ClassCastException should be thrown.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java
index 3d01178..4f6ea62 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -252,7 +252,7 @@ public void testGetDateFromInteger() {
property_c.setType(SDOConstants.SDO_INTEGER);
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Integer value = new Integer(3);
+ Integer value = Integer.valueOf(3);
dataObject_c.set(property_c, value);
try {
dataObject_a.getDate(propertyPath_a_b_c);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java
index 7f1efad..0134610 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -202,7 +202,7 @@ public void testGetDateFromDecimal() {
public void testGetDateFromInteger() {
SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
property.setType(SDOConstants.SDO_INTEGER);
- dataObject.set(property, new Integer(2));
+ dataObject.set(property, Integer.valueOf(2));
try {
dataObject.getDate(PROPERTY_INDEX);
fail("ClassCastException should be thrown.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java
index e25dad0..f6433d5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,7 +64,7 @@ public void testGetDecimalFromByte() {
public void testGetDecimalFromCharacter() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
- dataObject.set(property, new Character('y'));
+ dataObject.set(property, Character.valueOf('y'));
try {
dataObject.getBigDecimal(property);
fail("ClassCastException should be thrown.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java
index cf33572..2531118 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,7 +92,7 @@ public void testGetIntConversionFromDefinedFloatProperty() {
property.setName(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
- Float fl = new Float(12);
+ Float fl = Float.valueOf(12);
BigDecimal bd = new BigDecimal(fl);
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java
index 1214c17..1234f8c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -218,7 +218,7 @@ public void testGetDoubleConversionFromDefinedStringProperty() {
// dataObject's type add int property
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "12";
- Double s_d = new Double(str);
+ Double s_d = Double.valueOf(str);
double delta = 0.0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java
index b95bd42..5e1aa3b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -222,7 +222,7 @@ public void testGetDoubleConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Double s_d = new Double(str);
+ Double s_d = Double.valueOf(str);
double delta = 0.0;
dataObject.setString(property, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java
index 97d73c8..776f0dc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -260,7 +260,7 @@ public void testGetDoubleConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Double s_d = new Double(str);
+ Double s_d = Double.valueOf(str);
double delta = 0.0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java
index b17c562..9e75353 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -155,7 +155,7 @@ public void testGetDoubleConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Double s_d = new Double(str);
+ Double s_d = Double.valueOf(str);
double delta = 0.0;
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java
index 0ca4d8c..0bfc06c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -219,7 +219,7 @@ public void testGetFloatConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "12";
- Float s_d = new Float(str);
+ Float s_d = Float.valueOf(str);
float delta = 0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java
index d267ca4..501bc02 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -220,7 +220,7 @@ public void testGetFloatConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Float s_d = new Float(str);
+ Float s_d = Float.valueOf(str);
float delta = 0;
dataObject.setString(property, str);// add it to instance list
@@ -356,7 +356,7 @@ public void testGetFloatConversionFromDefinedByteObject() {
public void testGetFloatFromCharacterObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
- dataObject.set(property, new Character('y'));
+ dataObject.set(property, Character.valueOf('y'));
try {
dataObject.getFloat(property);
fail("ClassCastException should be thrown.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java
index 8dee736..cbe67df 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -262,7 +262,7 @@ public void testGetFloatConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Float s_d = new Float(str);
+ Float s_d = Float.valueOf(str);
float delta = 0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java
index 1fe2900..4381ae5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -168,7 +168,7 @@ public void testGetFloatConversionFromDefinedStringProperty() {
type.addDeclaredProperty(property);
String str = "12";
- Float s_d = new Float(str);
+ Float s_d = Float.valueOf(str);
float delta = 0;
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java
index a98b46f..96b8422 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -205,7 +205,7 @@ public void testGetIntConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "12";
- Integer s_d = new Integer(str);
+ Integer s_d = Integer.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java
index 8a1d38b..1b16bd5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -227,7 +227,7 @@ public void testGetIntConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Integer s_d = new Integer(str);
+ Integer s_d = Integer.valueOf(str);
dataObject.setString(property, str);// add it to instance list
this.assertEquals(s_d.intValue(), dataObject.getInt(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java
index a3bbe8e..4fa8102 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -254,7 +254,7 @@ public void testGetIntConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Integer s_d = new Integer(str);
+ Integer s_d = Integer.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java
index a439716..f81a42a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -153,7 +153,7 @@ public void testGetIntConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Integer s_d = new Integer(str);
+ Integer s_d = Integer.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
this.assertEquals(s_d.intValue(), dataObject.getInt(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java
index 8e2e790..3bf9914 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPos
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
//b.add(bb);
@@ -65,7 +65,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositio
type_c.addDeclaredProperty(property_c);
dataObject_c.setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
dataObject_a.setList("PName-a/PName-b[number=1]/PName-c", b);// c dataobject's a property has value boolean 'true'
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java
index fafbea7..b9394f0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -201,7 +201,7 @@ public void testGetLongConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "12";
- Long s_d = new Long(str);
+ Long s_d = Long.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java
index 7069da0..1d60c8d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -214,7 +214,7 @@ public void testGetLongConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Long s_d = new Long(str);
+ Long s_d = Long.valueOf(str);
dataObject.setString(property, str);// add it to instance list
this.assertEquals(s_d.longValue(), dataObject.getLong(property));
@@ -360,7 +360,7 @@ public void testGetLongConversionFromDefinedByteObject() {
public void testGetLongFromCharacterObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
- dataObject.set(property, new Character('v'));
+ dataObject.set(property, Character.valueOf('v'));
try {
dataObject.getLong(property);
fail("ClassCastException should be thrown.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java
index d425db0..6c09885 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -254,7 +254,7 @@ public void testGetLongConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Long s_d = new Long(str);
+ Long s_d = Long.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java
index f9dfa67..1a77689 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -153,7 +153,7 @@ public void testGetLongConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Long s_d = new Long(str);
+ Long s_d = Long.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
this.assertEquals(s_d.longValue(), dataObject.getLong(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java
index b21b7c2..7a42884 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -214,7 +214,7 @@ public void testGetShortConversionFromDefinedStringProperty() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
String str = "12";
- Short s_d = new Short(str);
+ Short s_d = Short.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java
index 4185e96..dec9b54 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -215,7 +215,7 @@ public void testGetShortConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Short s_d = new Short(str);
+ Short s_d = Short.valueOf(str);
dataObject.setString(property, str);// add it to instance list
this.assertEquals(s_d.shortValue(), dataObject.getShort(property));
@@ -265,7 +265,7 @@ public void testGetShortFromDecimal() {
public void testGetShortFromInteger() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
- dataObject.set(property, new Integer("123"));
+ dataObject.set(property, Integer.valueOf("123"));
try {
short value = dataObject.getShort(property);
//TODO: conversion not supported by sdo spec but is supported by TopLink
@@ -324,7 +324,7 @@ public void testGetShortConversionFromDefinedBytePbject() {
public void testGetShortFromCharacterObject() {
SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
- dataObject.set(property,new Character('a'));
+ dataObject.set(property,Character.valueOf('a'));
try {
dataObject.getShort(property);
fail("ClassCastException should be thrown.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java
index 3d2dadc..56e9994 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -254,7 +254,7 @@ public void testGetShortConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Short s_d = new Short(str);
+ Short s_d = Short.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java
index 4f8b691..bde9a44 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -148,7 +148,7 @@ public void testGetShortConversionFromDefinedStringProperty() {
property.setType(SDOConstants.SDO_STRING);
String str = "12";
- Short s_d = new Short(str);
+ Short s_d = Short.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
this.assertEquals(s_d.shortValue(), dataObject.getShort(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java
index e008321..95e299d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,7 +43,7 @@ public void testGetStringConversionFromDefinedBoolean() {
((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
boolean str = true;
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setBoolean(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java
index a4c7ff1..a5089dd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void testGetStringConversionFromDefinedBoolean() {
property.setType(SDOConstants.SDO_BOOLEAN);
boolean str = true;
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject.setBoolean(property, str);// add it to instance list
this.assertEquals(B_STR.toString(), dataObject.getString(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java
index 9882715..f1f5915 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void testGetStringConversionFromDefinedBoolean() {
dataObject_c._setType(type_c);
boolean str = true;
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setBoolean(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java
index 7d4aefa..e34d513 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public void testGetStringConversionFromDefinedBoolean() {
property.setType(SDOConstants.SDO_BOOLEAN);
boolean str = true;
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject.setBoolean(PROPERTY_INDEX, str);// add it to instance list
this.assertEquals(B_STR.toString(), dataObject.getString(PROPERTY_INDEX));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetWithPathTest.java
index 416cc7a..b46c710 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public void testGetConversionWithFullPath() {
dataObject_c._setType(type_c);
boolean c = true;
- Boolean C = new Boolean(c);
+ Boolean C = Boolean.valueOf(c);
//dataObject_a.setBoolean("PName-a/PName-b/PName-c", c);// c dataobject's a property has value boolean 'true'
dataObject_a.set("PName-a/PName-b/PName-c", C);
@@ -51,7 +51,7 @@ public void testGetBooleanConversionWithFullPath() {
dataObject_c._setType(type_c);
boolean c = true;
- Boolean C = new Boolean(c);
+ Boolean C = Boolean.valueOf(c);
dataObject_a.setBoolean("PName-a/PName-b/PName-c", c);// c dataobject's a property has value boolean 'true'
//dataObject_a.set("PName-a/PName-b/PName-c", C);
@@ -68,7 +68,7 @@ public void testSetConversionFromWrongPath() {
dataObject_c_bNotSDODataOject._setType(type_c_bNotSDODataOject);
boolean c = true;
- Boolean C = new Boolean(c);
+ Boolean C = Boolean.valueOf(c);
//dataObject_c_bNotSDODataOject.setBoolean(property_c_bNotSDODataOject, c);// c dataobject's a property has value boolean 'true'
try {
@@ -90,7 +90,7 @@ public void testSetBooleanConversionFromWrongPath() {
dataObject_c_bNotSDODataOject._setType(type_c_bNotSDODataOject);
boolean c = true;
- //Boolean C = new Boolean(c);
+ //Boolean C = Boolean.valueOf(c);
//dataObject_c_bNotSDODataOject.setBoolean(property_c_bNotSDODataOject, c);// c dataobject's a property has value boolean 'true'
try {
@@ -112,7 +112,7 @@ public void testGetBooleanConversionFromWrongPath() {
dataObject_c_bNotSDODataOject._setType(type_c_bNotSDODataOject);
boolean c = true;
- //Boolean C = new Boolean(c);
+ //Boolean C = Boolean.valueOf(c);
dataObject_c_bNotSDODataOject.setBoolean(property_c_bNotSDODataOject, c);// c dataobject's a property has value boolean 'true'
assertNull(dataObject_a_bNotSDODataOject.get("PName-a/PName-b/PName-c"));
@@ -123,7 +123,7 @@ public void testGetBooleanConversionFromWrongPath() {
public void testGetBooleanConversionFromPathWithLength_1() {
property_a_pathLength_1.setType(SDOConstants.SDO_BOOLEAN);
boolean b = true;
- Boolean B = new Boolean(b);
+ Boolean B = Boolean.valueOf(b);
dataObject_a_pathLength_1.setBoolean("PName-a-length-1", b);
@@ -175,7 +175,7 @@ public void testGetConversionWithNullValueInPath() {
aDataObject_a.set(aProperty_a, aDataObject_b);// a dataobject's a property has value b dataobject
aDataObject_b.set(aProperty_b, null);// b dataobject's b property has value c dataobject
- //Boolean C = new Boolean(true);
+ //Boolean C = Boolean.valueOf(true);
//dataObject_a.setBoolean("PName-a/PName-b/PName-c", true);// c dataobject's a property has value boolean 'true'
// null pointer is not handled yet
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java
index be77c07..7c6e1c6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -116,7 +116,7 @@ public void testSetDefineOpenContentManyPropertyContainmentChild() throws Except
public void testSetDefineOpenContentManySimpleProperty() throws Exception {
List value = new ArrayList();
- value.add(new Integer(4));
+ value.add(Integer.valueOf(4));
rootDataObject.set("addressOpenContent", value);
Property openProp = rootDataObject.getInstanceProperty("addressOpenContent");
assertNotNull(openProp);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyTestCases.java
index 61b1d03..95d2da6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@ public void testMyBigDecimalProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBigDecimal");
myProp.set("type", SDOConstants.SDO_DECIMAL);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myBigDecimal");
double db = 12;
@@ -75,7 +75,7 @@ public void testMyBigIntegerProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBigInteger");
myProp.set("type", SDOConstants.SDO_INTEGER);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myBigInteger");
double db = 12;
@@ -97,10 +97,10 @@ public void testMyBooleanProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBoolean");
myProp.set("type", SDOConstants.SDO_BOOLEAN);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myBoolean");
- boolean b = new Boolean("true").booleanValue();
+ boolean b = Boolean.valueOf("true").booleanValue();
myDO.setBoolean(prop, b);
boolean myboolean = myDO.getBoolean(prop);
assertTrue("Expected Boolean [" + b + "], but was [" + myboolean + "]", myboolean == b);
@@ -117,10 +117,10 @@ public void testMyByteProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myByte");
myProp.set("type", SDOConstants.SDO_BYTE);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myByte");
- byte b = new Byte("8").byteValue();
+ byte b = Byte.valueOf("8").byteValue();
myDO.setByte(prop, b);
byte mybyte = myDO.getByte(prop);
assertTrue("Expected byte [" + b + "], but was [" + mybyte + "]", mybyte == b);
@@ -138,11 +138,11 @@ public void testMyBytesProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBytes");
myProp.set("type", SDOConstants.SDO_BYTES);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myBytes");
- byte b1 = new Byte("16").byteValue();
- byte b2 = new Byte("8").byteValue();
+ byte b1 = Byte.valueOf("16").byteValue();
+ byte b2 = Byte.valueOf("8").byteValue();
byte[] bytes = new byte[] {b1, b2};
myDO.setBytes(prop, bytes);
@@ -162,7 +162,7 @@ public void testMyCharProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myChar");
myProp.set("type", SDOConstants.SDO_CHARACTER);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myChar");
char c = 'x';
@@ -182,7 +182,7 @@ public void testMyDateProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myDate");
myProp.set("type", SDOConstants.SDO_DATE);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
Calendar controlCalendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
controlCalendar.clear();
@@ -208,7 +208,7 @@ public void testMyDoubleProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myDouble");
myProp.set("type", SDOConstants.SDO_DOUBLE);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myDouble");
double db = 12;
@@ -228,7 +228,7 @@ public void testMyFloatProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myFloat");
myProp.set("type", SDOConstants.SDO_FLOAT);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myFloat");
float fl = 12;
@@ -248,7 +248,7 @@ public void testMyIntProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myInt");
myProp.set("type", SDOConstants.SDO_INT);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myInt");
int i = 69;
@@ -270,7 +270,7 @@ public void testMyLongProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myLong");
myProp.set("type", SDOConstants.SDO_LONG);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myLong");
long l = 666L;
@@ -290,10 +290,10 @@ public void testMyShortProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myShort");
myProp.set("type", SDOConstants.SDO_SHORT);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myShort");
- short s = new Short("66").shortValue();
+ short s = Short.valueOf("66").shortValue();
myDO.setShort(prop, s);
short myshort = myDO.getShort(prop);
assertTrue("Expected short [" + s + "], but was [" + myshort + "]", myshort == s);
@@ -310,7 +310,7 @@ public void testMyStringProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myString");
myProp.set("type", SDOConstants.SDO_STRING);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
SDOProperty prop = (SDOProperty) myDOType.getProperty("myString");
String s = new String("This is my string.");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyViaPathTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyViaPathTestCases.java
index 957cf65..dd3aec9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyViaPathTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SetAndGetWithManyPropertyViaPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@ public void testMyBigDecimalProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBigDecimal");
myProp.set("type", SDOConstants.SDO_DECIMAL);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
double db = 12;
BigDecimal bd = new BigDecimal(db);
@@ -71,7 +71,7 @@ public void testMyBigIntegerProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBigInteger");
myProp.set("type", SDOConstants.SDO_INTEGER);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
double db = 12;
BigInteger bi = new BigInteger(String.valueOf((int)db));
@@ -92,9 +92,9 @@ public void testMyBooleanProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBoolean");
myProp.set("type", SDOConstants.SDO_BOOLEAN);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
- boolean b = new Boolean("true").booleanValue();
+ boolean b = Boolean.valueOf("true").booleanValue();
myDO.setBoolean("myBoolean", b);
boolean myboolean = myDO.getBoolean("myBoolean");
assertTrue("Expected Boolean [" + b + "], but was [" + myboolean + "]", myboolean == b);
@@ -111,9 +111,9 @@ public void testMyByteProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myByte");
myProp.set("type", SDOConstants.SDO_BYTE);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
- byte b = new Byte("8").byteValue();
+ byte b = Byte.valueOf("8").byteValue();
myDO.setByte("myByte", b);
byte mybyte = myDO.getByte("myByte");
assertTrue("Expected byte [" + b + "], but was [" + mybyte + "]", mybyte == b);
@@ -131,10 +131,10 @@ public void testMyBytesProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myBytes");
myProp.set("type", SDOConstants.SDO_BYTES);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
- byte b1 = new Byte("16").byteValue();
- byte b2 = new Byte("8").byteValue();
+ byte b1 = Byte.valueOf("16").byteValue();
+ byte b2 = Byte.valueOf("8").byteValue();
byte[] bytes = new byte[] {b1, b2};
myDO.setBytes("myBytes", bytes);
@@ -154,7 +154,7 @@ public void testMyCharProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myChar");
myProp.set("type", SDOConstants.SDO_CHARACTER);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
char c = 'x';
myDO.setChar("myCharDO", c);
@@ -173,7 +173,7 @@ public void testMyDateProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myDate");
myProp.set("type", SDOConstants.SDO_DATE);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
Calendar controlCalendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
controlCalendar.clear();
@@ -198,7 +198,7 @@ public void testMyDoubleProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myDouble");
myProp.set("type", SDOConstants.SDO_DOUBLE);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
double db = 12;
myDO.setDouble("myDouble", db);
@@ -217,7 +217,7 @@ public void testMyFloatProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myFloat");
myProp.set("type", SDOConstants.SDO_FLOAT);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
float fl = 12;
myDO.setFloat("myFloat", fl);
@@ -236,7 +236,7 @@ public void testMyIntProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myInt");
myProp.set("type", SDOConstants.SDO_INT);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
int i = 69;
myDO.setInt("myInt", i);
@@ -257,7 +257,7 @@ public void testMyLongProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myLong");
myProp.set("type", SDOConstants.SDO_LONG);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
long l = 666L;
myDO.setLong("myLong", l);
@@ -276,9 +276,9 @@ public void testMyShortProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myShort");
myProp.set("type", SDOConstants.SDO_SHORT);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
- short s = new Short("66").shortValue();
+ short s = Short.valueOf("66").shortValue();
myDO.setShort("myShort", s);
short myshort = myDO.getShort("myShort");
assertTrue("Expected short [" + s + "], but was [" + myshort + "]", myshort == s);
@@ -295,7 +295,7 @@ public void testMyStringProperty() {
DataObject myProp = myDO.createDataObject("property");
myProp.set("name", "myString");
myProp.set("type", SDOConstants.SDO_STRING);
- myProp.set("many", new Boolean("true"));
+ myProp.set("many", Boolean.valueOf("true"));
Type myDOType = typeHelper.define(myDO);
String s = new String("This is my string.");
myDO.setString("myString", s);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java
index a920c49..0afd261 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -153,13 +153,13 @@ public void testGetCDNPricedItem() {
// 20070618: an unset value with an IsSetNodeNullPolicy will return the default value increasing the list size to 4
assertTrue(returnValue != null && returnValue.size() == 4);
Float price = (Float) returnValue.get(0);
- assertEquals(new Float("0.00"), price);
+ assertEquals(Float.valueOf("0.00"), price);
price = (Float) returnValue.get(1);
- assertEquals(new Float("39.98"), price);
+ assertEquals(Float.valueOf("39.98"), price);
price = (Float) returnValue.get(2);
- assertEquals(new Float("2.98"), price);
+ assertEquals(Float.valueOf("2.98"), price);
price = (Float) returnValue.get(3);
- assertEquals(new Float("12.98"), price);
+ assertEquals(Float.valueOf("12.98"), price);
}
public void testMultipleBracketExpression() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java
index dec7b79..7859ec5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,7 +42,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPos
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
//b.add(bb);
@@ -63,7 +63,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositio
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -81,7 +81,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInP
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Boolean b = new Boolean(true);
+ Boolean b = Boolean.valueOf(true);
dataObject_a.setBoolean(property1, true);// c dataobject's a property has value boolean 'true'
@@ -96,7 +96,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInP
type_c.addDeclaredProperty(property_c);
dataObject_c.setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -148,7 +148,7 @@ public void testGetBooleanFromCharacter() {
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Character bb = new Character('1');
+ Character bb = Character.valueOf('1');
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -178,7 +178,7 @@ public void testGetBooleanFromDouble() {
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Double bb = new Double(1);
+ Double bb = Double.valueOf(1);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -208,7 +208,7 @@ public void testGetBooleanFromFloat() {
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Float bb = new Float(1);
+ Float bb = Float.valueOf(1);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -239,7 +239,7 @@ public void testGetBooleanFromInt() {
dataObject_c._setType(type_c);
//short s = 1;
- Integer bb = new Integer(1);
+ Integer bb = Integer.valueOf(1);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -270,7 +270,7 @@ public void testGetBooleanFromLong() {
dataObject_c._setType(type_c);
long s = 1;
- Long bb = new Long(s);
+ Long bb = Long.valueOf(s);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -301,7 +301,7 @@ public void testGetBooleanFromShort() {
dataObject_c._setType(type_c);
short s = 1;
- Short bb = new Short(s);
+ Short bb = Short.valueOf(s);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -331,7 +331,7 @@ public void testGetBooleanConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "true";
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject_c.setString(property_c, str);// add it to instance list
this.assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean(property));
@@ -348,7 +348,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanStringBracketPosit
dataObject_c._setType(type_c);
String str = "true";
- Boolean bb = new Boolean(str);
+ Boolean bb = Boolean.valueOf(str);
List b = new ArrayList();
//b.add(bb);
@@ -370,7 +370,7 @@ public void testGetBooleanConversionWithPathFromDefinedStringPropertyDotPosition
dataObject_c._setType(type_c);
String str = "true";
- Boolean bb = new Boolean(str);
+ Boolean bb = Boolean.valueOf(str);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -389,7 +389,7 @@ public void testGetBooleanConversionWithPathFromDefinedStringPropertyBracketInPa
dataObject_c._setType(type_c);
String str = "true";
- Boolean b = new Boolean(str);
+ Boolean b = Boolean.valueOf(str);
dataObject_a.set(property1, b);// c dataobject's a property has value boolean 'true'
@@ -405,7 +405,7 @@ public void testGetBooleanConversionWithPathFromDefinedStringPropertyBracketInPa
dataObject_c.setType(type_c);
String str = "true";
- Boolean bb = new Boolean(str);
+ Boolean bb = Boolean.valueOf(str);
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java
index b90ca74..5b671db 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -321,7 +321,7 @@ public void testGetByteConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Byte s_d = new Byte(str);
+ Byte s_d = Byte.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java
index 8967fce..77632d3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -272,7 +272,7 @@ public void testGetCharacterConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
char str = 'c';
- Character B_STR = new Character(str);
+ Character B_STR = Character.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, B_STR.toString());// add it to instance list
this.assertEquals(str, dataObject_a.getChar(property));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java
index 677229a..0a8b9d5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -135,7 +135,7 @@ public void testGetDataObjectConversionFromUndefinedProperty() {
dataObject_c._setType(type_c);
boolean c = true;
- Boolean C = new Boolean(c);
+ Boolean C = Boolean.valueOf(c);
dataObject_c.set(property_c, C);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java
index bddb4a8..4c2c34b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -340,7 +340,7 @@ public void testGetDoubleConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Double s_d = new Double(str);
+ Double s_d = Double.valueOf(str);
double delta = 0.0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java
index cc97e87..6bc3980 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -338,7 +338,7 @@ public void testGetFloatConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Float s_d = new Float(str);
+ Float s_d = Float.valueOf(str);
float delta = 0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java
index 1bbe818..7bc89cf 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -321,7 +321,7 @@ public void testGetIntConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Integer s_d = new Integer(str);
+ Integer s_d = Integer.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java
index 7b62e8e..6543abc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPos
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
//b.add(bb);
@@ -73,7 +73,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositio
type_c.addDeclaredProperty(property_c);
dataObject_c.setType(type_c);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
dataObject_a.setList("PName-a/PName-b[number=1]/PName-c", b);// c dataobject's a property has value boolean 'true'
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java
index 2adbb55..448710c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -330,7 +330,7 @@ public void testGetLongConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Long s_d = new Long(str);
+ Long s_d = Long.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java
index f881672..c2aac3a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -328,7 +328,7 @@ public void testGetShortConversionFromDefinedStringProperty() {
dataObject_c._setType(type_c);
String str = "12";
- Short s_d = new Short(str);
+ Short s_d = Short.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java
index 96b142f..dd26440 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ public void testGetStringConversionFromDefinedBoolean() {
dataObject_c._setType(type_c);
boolean str = true;
- Boolean B_STR = new Boolean(str);
+ Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setBoolean(propertyPath_a_b_c, str);// add it to instance list
this.assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java
index 8298f7c..52600dd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
type_c0.addDeclaredProperty(p);
dataObject_c._setType(type_c);
- //Boolean bb = new Boolean(true);
+ //Boolean bb = Boolean.valueOf(true);
//List b = new ArrayList();
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean("schema:" + propertyTest + "test", true);
@@ -65,7 +65,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
type_c0.addDeclaredProperty(p);
dataObject_c._setType(type_c);
- //Boolean bb = new Boolean(true);
+ //Boolean bb = Boolean.valueOf(true);
//List b = new ArrayList();
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean("PName-a0/@alias2[number='123']/test", true);
@@ -83,8 +83,8 @@ public void testGetBooleanConversionFromDefinedPropertyWithPath() {
//type_c0.addDeclaredProperty(property_c1_object);
List objects = new ArrayList();
- Boolean b = new Boolean(true);
- Boolean bb = new Boolean(false);
+ Boolean b = Boolean.valueOf(true);
+ Boolean bb = Boolean.valueOf(false);
objects.add(b);
objects.add(bb);
@@ -141,7 +141,7 @@ public void testSetGetDataObjectWithQueryPath() {
// type_c0.addDeclaredProperty(property_c1_object);
- Boolean b = new Boolean(true);
+ Boolean b = Boolean.valueOf(true);
dataObject_a.setBoolean("PName-a0/PName-b0[number='1']/PName-c1.0", true);
@@ -157,7 +157,7 @@ public void testSetGetDataObjectWithQueryPath_ShortPath() {
type_c0.addDeclaredProperty(property_c1_object);
- Boolean b = new Boolean(true);
+ Boolean b = Boolean.valueOf(true);
dataObject_c0.setBoolean("PName-c1.0", true);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java
index 19ec475..a020476 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -225,10 +225,10 @@ public void setUp() {// set up as a/b/c
List d_list0 = new ArrayList();
List d_list1 = new ArrayList();
- d_list0.add(new Double("1.11"));
- d_list0.add(new Double("2.22"));
- d_list1.add(new Double("3.33"));
- d_list1.add(new Double("5.55"));
+ d_list0.add(Double.valueOf("1.11"));
+ d_list0.add(Double.valueOf("2.22"));
+ d_list1.add(Double.valueOf("3.33"));
+ d_list1.add(Double.valueOf("5.55"));
dataObject_d0.set(property_d_number1, d_list0);// set a/b.0/c[numbet=123]
dataObject_d1.set(property_d_number1, d_list1);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java
index 9639e46..61b901c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,8 +48,8 @@ public void testGetByteConversionFromDefinedPropertyWithPath() {
List objects = new ArrayList();
byte by = 12;
byte by1 = 1;
- Byte b = new Byte(by);
- Byte bb = new Byte(by1);
+ Byte b = Byte.valueOf(by);
+ Byte bb = Byte.valueOf(by1);
objects.add(b);
objects.add(bb);
@@ -107,7 +107,7 @@ public void testSetGetDataObjectWithQueryPath() {
type_c0.addDeclaredProperty(property_c1_object);
byte by = 12;
- Byte b = new Byte(by);
+ Byte b = Byte.valueOf(by);
dataObject_a.set("PName-a0/PName-b0[number='1']/PName-c1.0", b);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java
index 3682558..89830c2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,8 +46,8 @@ public void testGetBooleanConversionFromDefinedPropertyWithPath() {
List objects = new ArrayList();
char c = 'c';
char c1 = 'a';
- Character b = new Character(c);
- Character bb = new Character(c1);
+ Character b = Character.valueOf(c);
+ Character bb = Character.valueOf(c1);
objects.add(b);
objects.add(bb);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java
index 786745d..b65c16f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,7 +75,7 @@ public void testGetDataObjectConversionFromUndefinedProperty() {
DataObject sampleDataObject = dataFactory.create(theType);
Property prop = sampleDataObject.getInstanceProperty("testProp");
- sampleDataObject.set(prop,new Boolean(true));
+ sampleDataObject.set(prop,Boolean.valueOf(true));
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java
index 2515f46..dade357 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_DATE);
- //Boolean bb = new Boolean(true);
+ //Boolean bb = Boolean.valueOf(true);
//List b = new ArrayList();
long l = 12000;
Date d = new Date(l);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java
index 91b9c6a..32841e2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,8 +44,8 @@ public void testGetBooleanConversionFromDefinedPropertyWithPath() {
SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
property_c1_object.setType(SDOConstants.SDO_DOUBLE);
List objects = new ArrayList();
- Double b = new Double(12);
- Double bb = new Double(11);
+ Double b = Double.valueOf(12);
+ Double bb = Double.valueOf(11);
objects.add(b);
objects.add(bb);
dataObject_c1.set(property_c1_object, objects);
@@ -100,7 +100,7 @@ public void testSetGetDataObjectWithQueryPath() {
property_c1_object.setType(SDOConstants.SDO_DOUBLE);
type_c0.addDeclaredProperty(property_c1_object);*/
- Double b = new Double(12);
+ Double b = Double.valueOf(12);
dataObject_a.setDouble("PName-a0/PName-b0[number='1']/PName-c1.0", b.doubleValue());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java
index a63463d..65844af 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_FLOAT);
- Float bb = new Float(1.2);
+ Float bb = Float.valueOf(1.2f);
//List b = new ArrayList();
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -44,8 +44,8 @@ public void testGetFloatConversionFromDefinedPropertyWithPath() {
SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
property_c1_object.setType(SDOConstants.SDO_FLOAT);
List objects = new ArrayList();
- Float b = new Float(2);
- Float bb = new Float(12);
+ Float b = Float.valueOf(2f);
+ Float bb = Float.valueOf(12f);
objects.add(b);
objects.add(bb);
@@ -100,7 +100,7 @@ public void testSetGetDataObjectWithQueryPath() {
type_c0.addDeclaredProperty(property_c1_object);
- Float b = new Float(12);
+ Float b = Float.valueOf(12);
dataObject_a.setFloat("PName-a0/PName-b0[number='1']/PName-c1.0", b.floatValue());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java
index 4a3d175..182398a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +29,7 @@ public SDODataObjectGetIntConversionByXPathQueryTest(String name) {
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_INT);
- Integer bb = new Integer(12);
+ Integer bb = Integer.valueOf(12);
//List b = new ArrayList();
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -45,8 +45,8 @@ public void testGetIntConversionFromDefinedPropertyWithPath() {
//type_c0.addDeclaredProperty(property_c1_object);
List objects = new ArrayList();
- Integer b = new Integer(12);
- Integer bb = new Integer(2);
+ Integer b = Integer.valueOf(12);
+ Integer bb = Integer.valueOf(2);
objects.add(b);
objects.add(bb);
@@ -101,7 +101,7 @@ public void testSetGetDataObjectWithQueryPath() {
type_c0.addDeclaredProperty(property_c1_object);
- Integer b = new Integer(12);
+ Integer b = Integer.valueOf(12);
dataObject_a.setInt("PName-a0/PName-b0[number='1']/PName-c1.0", b.intValue());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java
index 0ac558d..997708b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,7 +32,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
prop.setType(SDOConstants.SDO_BOOLEAN);
prop.setMany(true);
- Boolean bb = new Boolean(true);
+ Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
b.add(bb);
@@ -86,7 +86,7 @@ public void testGetDataObjectConversionWithNullArgument() {
type_c0.addDeclaredProperty(property_c1_object);
- Boolean b = new Boolean(true);
+ Boolean b = Boolean.valueOf(true);
dataObject_a.setBoolean("PName-a0/PName-b0[number='1']/PName-c1.0", true);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java
index fa05ced..4e14a1b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_LONG);
- Long bb = new Long(12);
+ Long bb = Long.valueOf(12);
//List b = new ArrayList();
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -44,8 +44,8 @@ public void testGetLongConversionFromDefinedPropertyWithPath() {
SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
property_c1_object.setType(SDOConstants.SDO_LONG);
List objects = new ArrayList();
- Long b = new Long(12);
- Long bb = new Long(2);
+ Long b = Long.valueOf(12);
+ Long bb = Long.valueOf(2);
objects.add(b);
objects.add(bb);
@@ -100,7 +100,7 @@ public void testSetGetDataObjectWithQueryPath() {
type_c0.addDeclaredProperty(property_c1_object);
- Long bb = new Long(12);
+ Long bb = Long.valueOf(12);
dataObject_a.setLong("PName-a0/PName-b0[number='1']/PName-c1.0", bb.longValue());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java
index 0200aad..78eb901 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,7 @@ public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignB
prop.setType(SDOConstants.SDO_SHORT);
short s = 12;
- Short bb = new Short(s);
+ Short bb = Short.valueOf(s);
//List b = new ArrayList();
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
@@ -47,9 +47,9 @@ public void testGetShortConversionFromDefinedPropertyWithPath() {
List objects = new ArrayList();
short s = 12;
- Short b = new Short(s);
+ Short b = Short.valueOf(s);
short s1 = 12;
- Short bb = new Short(s1);
+ Short bb = Short.valueOf(s1);
objects.add(b);
objects.add(bb);
@@ -100,7 +100,7 @@ public void testSetGetDataObjectWithQueryPath() {
property_c1_object.setType(SDOConstants.SDO_SHORT);
short s = 12;
- Short bb = new Short(s);
+ Short bb = Short.valueOf(s);
dataObject_a.setShort("PName-a0/PName-b0[number='1']/PName-c1.0", bb.shortValue());
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java
index ae14278..c6de66f 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@ public DMLMethod(String name, int modifiers, String sqlStmt, boolean isBatched,
if (isBatched) {
TypeClass[] batchParamTypes = new TypeClass[m_paramTypes.length];
for (int i = 0; i < m_paramTypes.length; i++) {
- batchParamTypes[i] = new JavaArrayType((SqlType)m_paramTypes[i], m_reflector, null);
+ batchParamTypes[i] = new JavaArrayType(m_paramTypes[i], m_reflector, null);
}
m_paramTypes = batchParamTypes;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java
index 19c5559..dd3764c 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,7 +46,7 @@ private String writeTypeName2(TypeClass type, boolean itfIfPossible) {
}
String sql = (sqlType.getSqlName() == null) ? null : sqlType.getSqlName().toString();
if (sql != null && m_reflector.getTypeMap().get(sql) != null) {
- predefinedName = ((SqlType)m_reflector.getTypeMap().get(sql)).getSqlName().getUseClass(
+ predefinedName = m_reflector.getTypeMap().get(sql).getSqlName().getUseClass(
m_package);
}
else {
@@ -89,7 +89,7 @@ public String getMemberName(String sqlName, boolean wordBoundary, boolean onlyIf
Name name) {
String s = null;
- if (m_field_map != null && (s = (String)m_field_map.get(sqlName)) != null) {
+ if (m_field_map != null && (s = m_field_map.get(sqlName)) != null) {
if (s.equals("null")) {
return null;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SequencedInfo.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SequencedInfo.java
index aa0cd2b..403277b 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SequencedInfo.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SequencedInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,7 +46,7 @@ else if (seqCur > 2 && p[i].sequence() == (seqCur + 1)) {
v.add(p[i]);
}
for (int i = 0; i < vLen; i++) {
- p[i] = (SequencedInfo)v.get(vLen - i - 1);
+ p[i] = v.get(vLen - i - 1);
}
}
return p;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java
index 0085b6d..8bacb69 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,9 +55,9 @@ public String getTypeName() {
public String getFullDeclClass() {
// MySerializableObject
- String pkg = ((SqlName)m_name).getDeclPackage();
+ String pkg = m_name.getDeclPackage();
pkg = (pkg == null || pkg.equals("")) ? "" : pkg + ".";
- return pkg + ((SqlName)m_name).getDeclClass();
+ return pkg + m_name.getDeclClass();
}
public String getJdbcType(Typemap map) {
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java
index c4d864b..0b1dacd 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -288,17 +288,17 @@ public String getFullTargetTypeName(int schemaName) {
*/
@Override
public String getUseClass(String currPackage) {
- return ((JavaName)getLangName()).getUseClass(currPackage);
+ return getLangName().getUseClass(currPackage);
}
@Override
public String getUseClass() {
- return ((JavaName)getLangName()).getUseClass();
+ return getLangName().getUseClass();
}
@Override
public String getUseClass(boolean full) {
- return ((JavaName)getLangName()).getUseClass(full);
+ return getLangName().getUseClass(full);
}
/**
@@ -306,7 +306,7 @@ public String getUseClass(boolean full) {
*/
@Override
public String getUsePackage() {
- return ((JavaName)getLangName()).getUsePackage();
+ return getLangName().getUsePackage();
}
/**
@@ -314,7 +314,7 @@ public String getUsePackage() {
*/
@Override
public boolean hasUseClass() {
- return ((JavaName)getLangName()).hasUseClass();
+ return getLangName().hasUseClass();
}
/**
@@ -322,7 +322,7 @@ public boolean hasUseClass() {
*/
@Override
public String getUseItf() {
- return ((JavaName)getLangName()).getUseItf();
+ return getLangName().getUseItf();
}
/**
@@ -337,7 +337,7 @@ public String getUseItf(String currPackage) {
*/
@Override
public String getUseItfPackage() {
- return ((JavaName)getLangName()).getUseItfPackage();
+ return getLangName().getUseItfPackage();
}
/**
@@ -430,7 +430,7 @@ public String getDeclClass(String currPackage) {
*/
@Override
public String getDeclItf() {
- return ((JavaName)getLangName()).getDeclItf();
+ return getLangName().getDeclItf();
}
/**
@@ -445,7 +445,7 @@ public String getDeclItf(String currPackage) {
*/
@Override
public String getDeclItfPackage() {
- return ((JavaName)getLangName()).getDeclItfPackage();
+ return getLangName().getDeclItfPackage();
}
/**
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java
index 292bdd1..f8adc82 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ public String getName() {
public String getTargetTypeName() {
if (m_refeeType instanceof SqlType) {
- return "REF " + ((SqlType)m_refeeType).getTargetTypeName();
+ return "REF " + m_refeeType.getTargetTypeName();
}
else {
return getName();
@@ -53,7 +53,7 @@ public String getTargetTypeName() {
public String getTypeName() {
if (m_refeeType instanceof SqlType) {
- return "REF " + ((SqlType)m_refeeType).getTypeName();
+ return "REF " + m_refeeType.getTypeName();
}
else {
return getName();
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtMethod.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtMethod.java
index ca3e814..35d2dd0 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtMethod.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -145,18 +145,18 @@ public SqlStmtMethod(String name, int modifiers, String sqlStmt, SqlReflector re
m_sqlStmtParamModes = new int[sqlStmtParamNamesV.size()];
for (int j = 0; j < sqlStmtParamNamesV.size(); j++) {
int jj = sqlStmtParamNamesV.size() - j - 1;
- m_sqlStmtParamNames[jj] = (String)sqlStmtParamNamesV.get(j);
- m_sqlStmtParamTypes[jj] = (TypeClass)sqlStmtParamTypesV.get(j);
- m_sqlStmtParamModes[jj] = ((Integer)(sqlStmtParamModesV.get(j))).intValue();
+ m_sqlStmtParamNames[jj] = sqlStmtParamNamesV.get(j);
+ m_sqlStmtParamTypes[jj] = sqlStmtParamTypesV.get(j);
+ m_sqlStmtParamModes[jj] = sqlStmtParamModesV.get(j).intValue();
}
m_paramNames = new String[uniqueParamNamesV.size()];
m_paramTypes = new TypeClass[uniqueParamNamesV.size()];
m_paramModes = new int[uniqueParamNamesV.size()];
for (int j = 0; j < uniqueParamNamesV.size(); j++) {
int jj = uniqueParamNamesV.size() - j - 1;
- m_paramNames[jj] = (String)uniqueParamNamesV.get(j);
- m_paramTypes[jj] = (TypeClass)uniqueParamTypesV.get(j);
- m_paramModes[jj] = ((Integer)(uniqueParamModesV.get(j))).intValue();
+ m_paramNames[jj] = uniqueParamNamesV.get(j);
+ m_paramTypes[jj] = uniqueParamTypesV.get(j);
+ m_paramModes[jj] = uniqueParamModesV.get(j).intValue();
}
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java
index cc91280..34200c3 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -322,7 +322,7 @@ public String getSqlTypeDecl() throws SQLException, PublisherException {
String sqlTypeDecl = "";
if (isPlsqlRecord() && !getSqlName().isReused()) {
sqlTypeDecl += "CREATE OR REPLACE TYPE " + getTargetTypeName() + " AS OBJECT (\n";
- List<AttributeField> fields = ((PlsqlRecordType)this).getFields(true);
+ List<AttributeField> fields = this.getFields(true);
for (int i = 0; i < fields.size(); i++) {
if (i != 0) {
sqlTypeDecl += ",\n";
@@ -372,7 +372,7 @@ public String getConversionFunDecl() throws PublisherException, SQLException {
sqlConvPkgDecl += "\t-- Redefine a PL/SQL RECORD type originally defined via CURSOR%ROWTYPE"
+ "\n";
sqlConvPkgDecl += "\tTYPE " + getTypeName() + " IS RECORD (\n";
- List<AttributeField> fields = ((PlsqlRecordType)this).getFields(true);
+ List<AttributeField> fields = this.getFields(true);
for (int i = 0; i < fields.size(); i++) {
if (i != 0) {
sqlConvPkgDecl += ",\n";
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/Util.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/Util.java
index 1a3f8cf..7a87732 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/Util.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/Util.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -111,7 +111,7 @@ public class Util {
}
public static String getDefaultTypeLen(String type) {
- return (String)m_defaultTypeLen.get(type.toUpperCase().replace(' ', '_'));
+ return m_defaultTypeLen.get(type.toUpperCase().replace(' ', '_'));
}
public static String printTypeWithLength(String type, int length, int precision, int scale) {
@@ -266,7 +266,7 @@ public static String getType(String schema, String type) {
}
public static String unreserveSql(String word) {
- String unreserve = (String)m_sqlReservedMap.get(word.toUpperCase());
+ String unreserve = m_sqlReservedMap.get(word.toUpperCase());
if (unreserve == null) {
unreserve = word;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java
index 7177241..8426b95 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -304,11 +304,11 @@ else if ("NOT NULL".equals(values[i])) {
stmt += " IS NOT NULL";
}
else if (values[i] instanceof java.lang.String) {
- stmt += "='" + ((java.lang.String)values[i]) + "'";
+ stmt += "='" + values[i] + "'";
}
else if ((values[i] instanceof java.lang.String)
&& ((String)values[i]).indexOf("%") > -1) {
- stmt += " like '" + ((java.lang.String)values[i]) + "'";
+ stmt += " like '" + values[i] + "'";
}
else {
stmt += "=" + values[i];
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCacheManager.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCacheManager.java
index 2349381..1ed2d45 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCacheManager.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCacheManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@ public void add(ViewCache viewCache) {
}
public ViewCache get(String schema) {
- return (ViewCache)m_viewCachePool.get(schema);
+ return m_viewCachePool.get(schema);
}
/**
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java
index e7f6bbe..d22ce7d 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -133,7 +133,7 @@ public boolean equals(String key, Object value) {
if (m_fieldCache == null) {
m_fieldCache = new HashMap<String, Field>();
}
- Field field = (Field)m_fieldCache.get(key);
+ Field field = m_fieldCache.get(key);
if (field == null) {
Class<?> cls = getClass();
Field[] fields = cls.getFields();
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/tabletype/TableTypeTestSuite.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/tabletype/TableTypeTestSuite.java
index 6e2dad3..0a6c3b2 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/tabletype/TableTypeTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/tabletype/TableTypeTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -441,7 +441,7 @@ public void testUpdateSQL() {
// verify that 'sal' and 'c' fields were updated successfully
XRDynamicEntity tableTypeEntity = (XRDynamicEntity) result;
- assertTrue("Expected [sal] '112000.99' but was '" + tableTypeEntity.get("sal") + "'", Float.compare(((Float) tableTypeEntity.get("sal")), new Float(112000.99)) == 0);
+ assertTrue("Expected [sal] '112000.99' but was '" + tableTypeEntity.get("sal") + "'", Float.compare(tableTypeEntity.get("sal"), Float.valueOf(112000.99f)) == 0);
Character[] chars = tableTypeEntity.get("c");
StringBuilder sb = new StringBuilder(chars.length);
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/types/TypesTestSuite.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/types/TypesTestSuite.java
index 41695e4..32d79c6 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/types/TypesTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/types/TypesTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -731,7 +731,7 @@ public void echoChar() {
@Test
public void echoReal() {
Invocation invocation = new Invocation("echoReal");
- invocation.setParameter("PREAL", new Float("3.14159"));
+ invocation.setParameter("PREAL", Float.valueOf("3.14159"));
Operation op = xrService.getOperation(invocation.getName());
Object result = op.invoke(xrService, invocation);
assertNotNull("result is null", result);
@@ -753,7 +753,7 @@ public void echoReal() {
@Test
public void echoFloat() {
Invocation invocation = new Invocation("echoFloat");
- invocation.setParameter("PINPUTFLOAT", new Float("31415.926"));
+ invocation.setParameter("PINPUTFLOAT", Float.valueOf("31415.926"));
Operation op = xrService.getOperation(invocation.getName());
Object result = op.invoke(xrService, invocation);
assertNotNull("result is null", result);
@@ -775,7 +775,7 @@ public void echoFloat() {
@Test
public void echoDouble() {
Invocation invocation = new Invocation("echoDouble");
- invocation.setParameter("PDOUBLE", new Double("314.15926"));
+ invocation.setParameter("PDOUBLE", Double.valueOf("314.15926"));
Operation op = xrService.getOperation(invocation.getName());
Object result = op.invoke(xrService, invocation);
assertNotNull("result is null", result);
