This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new e0c4b5cca Fix Java 9 compilation warnings.
e0c4b5cca is described below
commit e0c4b5ccab930680231eddd301a115114eb20878
Author: JamesBognar <[email protected]>
AuthorDate: Mon Nov 21 12:59:04 2022 -0500
Fix Java 9 compilation warnings.
---
.../main/java/org/apache/juneau/BeanContext.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMap.java | 4 +-
.../main/java/org/apache/juneau/BeanSession.java | 8 +--
.../main/java/org/apache/juneau/MediaRanges.java | 2 +-
.../main/java/org/apache/juneau/StringRanges.java | 2 +-
.../juneau/collections/ControlledArrayList.java | 4 +-
.../org/apache/juneau/collections/JsonList.java | 4 +-
.../org/apache/juneau/collections/JsonMap.java | 6 +-
.../java/org/apache/juneau/html/HtmlClassMeta.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../org/apache/juneau/internal/ArrayUtils.java | 4 +-
.../org/apache/juneau/internal/ClassUtils.java | 6 +-
.../java/org/apache/juneau/internal/DateUtils.java | 2 +-
.../org/apache/juneau/internal/FilteredMap.java | 2 +-
.../java/org/apache/juneau/internal/MultiSet.java | 2 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 2 +-
.../org/apache/juneau/reflect/AnnotationList.java | 2 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 6 +-
.../org/apache/juneau/reflect/ExecutableInfo.java | 2 +-
.../java/org/apache/juneau/reflect/FieldInfo.java | 2 +-
.../java/org/apache/juneau/reflect/Mutaters.java | 2 +-
.../org/apache/juneau/svl/VarResolverSession.java | 4 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 2 +-
.../apache/juneau/microservice/Microservice.java | 6 +-
.../microservice/jetty/JettyMicroservice.java | 8 +--
.../juneau/rest/client/remote/RemoteMeta.java | 2 +-
.../apache/juneau/rest/mock/MockRestClient.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../java/org/apache/juneau/BeanConfigTest.java | 78 ++++++++++-----------
.../test/java/org/apache/juneau/BeanMapTest.java | 80 +++++++++++-----------
.../test/java/org/apache/juneau/JsonMapTest.java | 14 ++--
.../a/rttests/RoundTripSimpleObjectsTest.java | 38 +++++-----
.../juneau/assertions/AnyAssertion_Test.java | 1 +
.../juneau/assertions/BooleanAssertion_Test.java | 1 +
.../assertions/ComparableAssertion_Test.java | 5 +-
.../juneau/assertions/IntegerAssertion_Test.java | 1 +
.../juneau/assertions/ObjectAssertion_Test.java | 1 +
.../httppart/OpenApiPartSerializer_Test.java | 46 ++++++-------
.../test/java/org/apache/juneau/json/JsonTest.java | 2 +-
.../apache/juneau/objecttools/ObjectRest_Test.java | 8 +--
.../apache/juneau/rest/testutils/TestUtils.java | 2 +-
41 files changed, 188 insertions(+), 183 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index dc73f900c..582ea7b33 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -3617,7 +3617,7 @@ public class BeanContext extends Context {
notBeanPackagePrefixes = Stream.of(_notBeanPackages).filter(x
-> x.endsWith(".*")).map(x -> x.substring(0,
x.length()-2)).toArray(String[]::new);
try {
- propertyNamerBean = propertyNamer.newInstance();
+ propertyNamerBean =
propertyNamer.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index f0e12b12f..3f9be1241 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -611,7 +611,7 @@ public class BeanMap<T> extends AbstractMap<String,Object>
implements Delegate<T
}
// Construct our own anonymous set to implement this function.
- Set<Entry<String,Object>> s = new
AbstractSet<Entry<String,Object>>() {
+ Set<Entry<String,Object>> s = new AbstractSet<>() {
// Get the list of properties from the meta object.
// Note that the HashMap.values() method caches
results, so this collection
@@ -625,7 +625,7 @@ public class BeanMap<T> extends AbstractMap<String,Object>
implements Delegate<T
// Construct our own anonymous iterator that
uses iterators against the meta.properties
// map to maintain position. This prevents us
from having to construct any of our own
// collection objects.
- return new Iterator<Entry<String,Object>>() {
+ return new Iterator<>() {
final Iterator<BeanPropertyMeta>
pIterator = pSet.iterator();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 183508a96..4b0310dcf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -588,9 +588,9 @@ public class BeanSession extends ContextSession {
if (tc == Long.TYPE)
return
(T)Long.valueOf(s);
if (tc == Float.TYPE)
- return (T)new
Float(s);
+ return
(T)Float.valueOf(s);
if (tc == Double.TYPE)
- return (T)new
Double(s);
+ return
(T)Double.valueOf(s);
if (tc == Byte.TYPE)
return
(T)Byte.valueOf(s);
}
@@ -671,9 +671,9 @@ public class BeanSession extends ContextSession {
if (tc == Long.class)
return
(T)Long.valueOf(s);
if (tc == Float.class)
- return (T)new Float(s);
+ return
(T)Float.valueOf(s);
if (tc == Double.class)
- return (T)new Double(s);
+ return
(T)Double.valueOf(s);
if (tc == Byte.class)
return
(T)Byte.valueOf(s);
if (tc == AtomicInteger.class)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
index 71ae96323..d2a4ef2cb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
@@ -116,7 +116,7 @@ public class MediaRanges {
* <c>MediaRanges</c> with the same types but with extensions are
promoted over those same types with no
* extensions.
*/
- private static final Comparator<MediaRange> RANGE_COMPARATOR = new
Comparator<MediaRange>() {
+ private static final Comparator<MediaRange> RANGE_COMPARATOR = new
Comparator<>() {
@Override
public int compare(MediaRange o1, MediaRange o2) {
// Compare q-values.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
index 25eca6724..286909caf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
@@ -139,7 +139,7 @@ public class StringRanges {
* Should those values be equal, the <c>type</c> is then
lexicographically compared (case-insensitive) in
* ascending order, with the <js>"*"</js> type demoted last in that
order.
*/
- private static final Comparator<StringRange> RANGE_COMPARATOR = new
Comparator<StringRange>() {
+ private static final Comparator<StringRange> RANGE_COMPARATOR = new
Comparator<>() {
@Override
public int compare(StringRange o1, StringRange o2) {
// Compare q-values.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
index fe416ce98..24319a7af 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
@@ -309,7 +309,7 @@ public class ControlledArrayList<E> extends ArrayList<E> {
if (! unmodifiable)
return overrideListIterator(index);
- return new ListIterator<E>() {
+ return new ListIterator<>() {
private final ListIterator<? extends E> i =
overrideListIterator(index);
@Override
@@ -379,7 +379,7 @@ public class ControlledArrayList<E> extends ArrayList<E> {
if (! unmodifiable)
return overrideIterator();
- return new Iterator<E>() {
+ return new Iterator<>() {
private final Iterator<? extends E> i =
overrideIterator();
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index d3c6d049d..0f4081ff9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -884,11 +884,11 @@ public class JsonList extends LinkedList<Object> {
*/
public <E> Iterable<E> elements(final Class<E> childType) {
final Iterator<?> i = iterator();
- return new Iterable<E>() {
+ return new Iterable<>() {
@Override /* Iterable */
public Iterator<E> iterator() {
- return new Iterator<E>() {
+ return new Iterator<>() {
@Override /* Iterator */
public boolean hasNext() {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index 6aac77982..0116c18d8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1844,12 +1844,12 @@ public class JsonMap extends
LinkedHashMap<String,Object> {
final Set<String> keySet = keySet();
final Iterator<String> keys = keySet.iterator();
- return new AbstractSet<Map.Entry<String,Object>>() {
+ return new AbstractSet<>() {
@Override /* Iterable */
public Iterator<Map.Entry<String,Object>> iterator() {
- return new Iterator<Map.Entry<String,Object>>()
{
+ return new Iterator<>() {
@Override /* Iterator */
public boolean hasNext() {
@@ -1858,7 +1858,7 @@ public class JsonMap extends LinkedHashMap<String,Object>
{
@Override /* Iterator */
public Map.Entry<String,Object> next() {
- return new
Map.Entry<String,Object>() {
+ return new Map.Entry<>() {
String key =
keys.next();
@Override /* Map.Entry
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
index 17ed2cd8e..77a21d2d8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
@@ -55,7 +55,7 @@ public class HtmlClassMeta extends ExtendedClassMeta {
format.set(x.format());
if (x.render() != HtmlRender.class) {
try {
- render.set(x.render().newInstance());
+
render.set(x.render().getDeclaredConstructor().newInstance());
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 8b53e0488..17a079d06 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -1872,7 +1872,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
private <T> T newInstance(Class<T> c) {
try {
- return c.newInstance();
+ return c.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index f2595befb..adbf71541 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -90,11 +90,11 @@ public final class ArrayUtils {
*/
public static <T> Set<T> asSet(final T[] array) {
assertArgNotNull("array", array);
- return new AbstractSet<T>() {
+ return new AbstractSet<>() {
@Override /* Set */
public Iterator<T> iterator() {
- return new Iterator<T>() {
+ return new Iterator<>() {
int i = 0;
@Override /* Iterator */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index 01c171c92..11ddbc47d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -87,7 +87,7 @@ public final class ClassUtils {
*/
public static boolean setAccessible(Constructor<?> x) {
try {
- if (! (x == null || x.isAccessible()))
+ if (x != null)
x.setAccessible(true);
return true;
} catch (SecurityException e) {
@@ -103,7 +103,7 @@ public final class ClassUtils {
*/
public static boolean setAccessible(Method x) {
try {
- if (! (x == null || x.isAccessible()))
+ if (x != null)
x.setAccessible(true);
return true;
} catch (SecurityException e) {
@@ -119,7 +119,7 @@ public final class ClassUtils {
*/
public static boolean setAccessible(Field x) {
try {
- if (! (x == null || x.isAccessible()))
+ if (x != null)
x.setAccessible(true);
return true;
} catch (SecurityException e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
index 17231a452..60c43ce79 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
@@ -105,7 +105,7 @@ public final class DateUtils {
*/
static final class DateFormatHolder {
private static final
ThreadLocal<SoftReference<Map<String,SimpleDateFormat>>> THREADLOCAL_FORMATS =
- new
ThreadLocal<SoftReference<Map<String,SimpleDateFormat>>>() {
+ new ThreadLocal<>() {
@Override
protected SoftReference<Map<String,SimpleDateFormat>>
initialValue() {
Map<String,SimpleDateFormat> m = new
HashMap<>();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
index 535793e7f..bb67c309c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
@@ -54,7 +54,7 @@ public final class FilteredMap<K,V> extends AbstractMap<K,V>
implements Delegate
}
private Map.Entry<K,V> createEntry(final K key) {
- return new Map.Entry<K,V>() {
+ return new Map.Entry<>() {
@Override /* Map.Entry */
public K getKey() {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
index 883e9e457..a9bdb393c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
@@ -47,7 +47,7 @@ public class MultiSet<E> extends AbstractSet<E> {
*/
@Override /* Set */
public Iterator<E> iterator() {
- return new Iterator<E>() {
+ return new Iterator<>() {
int i = 0;
Iterator<E> i2 = (l.length > 0 ? l[i++].iterator() :
null);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index b2412f1ea..aa1776d99 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -883,7 +883,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
this.ignoreTypePatterns = ignoreTypePatterns.toArray(new
Pattern[ignoreTypePatterns.size()]);
try {
- beanDefMapperBean = beanDefMapper.newInstance();
+ beanDefMapperBean =
beanDefMapper.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
index 651a63190..27e3c8ce1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
@@ -29,7 +29,7 @@ import java.util.function.*;
public final class AnnotationList extends ArrayList<AnnotationInfo<?>> {
private static final long serialVersionUID = 1L;
- private static final Comparator<AnnotationInfo<?>> RANK_COMPARATOR =
new Comparator<AnnotationInfo<?>>() {
+ private static final Comparator<AnnotationInfo<?>> RANK_COMPARATOR =
new Comparator<>() {
@Override
public int compare(AnnotationInfo<?> o1, AnnotationInfo<?> o2) {
return o1.rank - o2.rank;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index c57bbda27..678078f02 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -2325,7 +2325,7 @@ public final class ClassInfo {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Shortcut for calling {@link Class#newInstance()} on the underlying
class.
+ * Shortcut for calling
<c>Class.getDeclaredConstructor().newInstance()</c> on the underlying class.
*
* @return A new instance of the underlying class
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
@@ -2334,8 +2334,8 @@ public final class ClassInfo {
if (c == null)
throw new ExecutableException("Type ''{0}'' cannot be
instantiated", getFullName());
try {
- return c.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ return c.getDeclaredConstructor().newInstance();
+ } catch (InvocationTargetException | NoSuchMethodException |
InstantiationException | IllegalAccessException e) {
throw new ExecutableException(e);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
index cbf205c90..40f2c17b2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
@@ -832,7 +832,7 @@ public abstract class ExecutableInfo {
*/
public final boolean setAccessible() {
try {
- if (! (e.isAccessible()))
+ if (e != null)
e.setAccessible(true);
return true;
} catch (SecurityException e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
index dcaf8302a..5d485e7d5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
@@ -382,7 +382,7 @@ public final class FieldInfo implements
Comparable<FieldInfo> {
*/
public boolean setAccessible() {
try {
- if (! (f.isAccessible()))
+ if (f != null)
f.setAccessible(true);
return true;
} catch (SecurityException e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
index 8e85aaf68..79f80e5fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
@@ -32,7 +32,7 @@ public class Mutaters {
/**
* Represents a non-existent transform.
*/
- public static final Mutater<Object,Object> NULL = new
Mutater<Object,Object>() {
+ public static final Mutater<Object,Object> NULL = new Mutater<>() {
@Override
public Object mutate(Object outer, Object in) {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index ea3689220..47130031b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -148,7 +148,7 @@ public class VarResolverSession {
Collection c = (Collection)o;
if (! containsVars(c))
return o;
- Collection c2 = c.getClass().newInstance();
+ Collection c2 =
c.getClass().getDeclaredConstructor().newInstance();
c.forEach(x -> c2.add(resolve(x)));
return (T)c2;
} catch (VarResolverException e) {
@@ -162,7 +162,7 @@ public class VarResolverSession {
Map m = (Map)o;
if (! containsVars(m))
return o;
- Map m2 = m.getClass().newInstance();
+ Map m2 =
m.getClass().getDeclaredConstructor().newInstance();
m.forEach((k,v) -> m2.put(k, resolve(v)));
return (T)m2;
} catch (VarResolverException e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 78e5184c5..abd1bef4d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -922,7 +922,7 @@ public class XmlParser extends ReaderParser implements
XmlMetaProvider {
private <T> T newInstance(Class<T> c) {
try {
- return c.newInstance();
+ return c.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index cec748404..279cc67d4 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -414,8 +414,8 @@ public class Microservice implements ConfigEventListener {
public Builder consoleCommands(Class<? extends
ConsoleCommand>...consoleCommands) throws ExecutableException {
try {
for (Class<? extends ConsoleCommand> cc :
consoleCommands)
-
this.consoleCommands.add(cc.newInstance());
- } catch (InstantiationException |
IllegalAccessException e) {
+
this.consoleCommands.add(cc.getDeclaredConstructor().newInstance());
+ } catch (Exception e) {
throw new ExecutableException(e);
}
return this;
@@ -662,7 +662,7 @@ public class Microservice implements ConfigEventListener {
for (String s :
config.get("Console/commands").asStringArray().orElse(new String[0])) {
ConsoleCommand cc;
try {
- cc =
(ConsoleCommand)Class.forName(s).newInstance();
+ cc =
(ConsoleCommand)Class.forName(s).getDeclaredConstructor().newInstance();
consoleCommandMap.put(cc.getName(), cc);
} catch (Exception e) {
getConsoleWriter().println("Could not
create console command '"+s+"', " + e.getLocalizedMessage());
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index d642ea81d..659c15cd4 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -248,8 +248,8 @@ public class JettyMicroservice extends Microservice {
public Builder servlet(Class<? extends RestServlet> c) throws
ExecutableException {
RestServlet rs;
try {
- rs = c.newInstance();
- } catch (InstantiationException |
IllegalAccessException e) {
+ rs = c.getDeclaredConstructor().newInstance();
+ } catch (Exception e) {
throw new ExecutableException(e);
}
return servlet(rs, '/' + rs.getPath());
@@ -268,8 +268,8 @@ public class JettyMicroservice extends Microservice {
*/
public Builder servlet(Class<? extends Servlet> c, String path)
throws ExecutableException {
try {
- return servlet(c.newInstance(), path);
- } catch (InstantiationException |
IllegalAccessException e) {
+ return
servlet(c.getDeclaredConstructor().newInstance(), path);
+ } catch (Exception e) {
throw new ExecutableException(e);
}
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index ee1b67e62..08409465f 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -68,7 +68,7 @@ public class RemoteMeta {
versionHeader = resolve(r.versionHeader());
if (isNotVoid(r.headerList())) {
try {
-
headers.append(r.headerList().newInstance().getAll());
+
headers.append(r.headerList().getDeclaredConstructor().newInstance().getAll());
} catch (Exception e) {
throw new BasicRuntimeException(e,
"Could not instantiate HeaderSupplier class");
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index df9f0ba4d..b0ee347b5 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -1866,7 +1866,7 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
Class<?> c = restBean instanceof Class ?
(Class<?>)restBean : restBean.getClass();
if (! REST_CONTEXTS.containsKey(c)) {
boolean isClass = restBean instanceof Class;
- Object o = isClass ?
((Class<?>)restBean).newInstance() : restBean;
+ Object o = isClass ?
((Class<?>)restBean).getDeclaredConstructor().newInstance() : restBean;
RestContext rc = RestContext
.create(o.getClass(), null, null)
.defaultClasses(BasicTestCallLogger.class)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 797dfcd6e..5b3dda641 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -5562,7 +5562,7 @@ public class RestContext extends Context {
}
private Set<String> newCaseInsensitiveSet(String value) {
- Set<String> s = new
TreeSet<String>(String.CASE_INSENSITIVE_ORDER) {
+ Set<String> s = new TreeSet<>(String.CASE_INSENSITIVE_ORDER) {
private static final long serialVersionUID = 1L;
@Override
public boolean contains(Object v) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
index 2e4bd29ed..8f6ead9c2 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
@@ -53,7 +53,7 @@ public class BeanConfigTest {
// setup the reference results
Map m1 = new LinkedHashMap();
m1.put("name", p1.getName());
- m1.put("age", new Integer(p1.getAge()));
+ m1.put("age", Integer.valueOf(p1.getAge()));
Map m2 = new LinkedHashMap();
m2.put("street", a.getStreet());
@@ -63,7 +63,7 @@ public class BeanConfigTest {
Map m3 = new LinkedHashMap();
m3.put("name", p2.getName());
- m3.put("age", new Integer(p2.getAge()));
+ m3.put("age", Integer.valueOf(p2.getAge()));
m3.put("address", p2.getAddress());
Map pm1 = bc.toBeanMap(p1);
@@ -286,47 +286,47 @@ public class BeanConfigTest {
// Primitive nulls.
o = null;
- assertEquals(new Integer(0), bc.convertToType(o, Integer.TYPE));
- assertEquals(new Short((short) 0), bc.convertToType(o,
Short.TYPE));
- assertEquals(new Long(0), bc.convertToType(o, Long.TYPE));
- assertEquals(new Float(0), bc.convertToType(o, Float.TYPE));
- assertEquals(new Double(0), bc.convertToType(o, Double.TYPE));
- assertEquals(new Byte((byte) 0), bc.convertToType(o,
Byte.TYPE));
- assertEquals(new Character((char) 0), bc.convertToType(o,
Character.TYPE));
+ assertEquals(Integer.valueOf(0), bc.convertToType(o,
Integer.TYPE));
+ assertEquals(Short.valueOf((short) 0), bc.convertToType(o,
Short.TYPE));
+ assertEquals(Long.valueOf(0), bc.convertToType(o, Long.TYPE));
+ assertEquals(Float.valueOf(0), bc.convertToType(o, Float.TYPE));
+ assertEquals(Double.valueOf(0), bc.convertToType(o,
Double.TYPE));
+ assertEquals(Byte.valueOf((byte) 0), bc.convertToType(o,
Byte.TYPE));
+ assertEquals(Character.valueOf((char) 0), bc.convertToType(o,
Character.TYPE));
assertEquals(Boolean.FALSE, bc.convertToType(o, Boolean.TYPE));
o = "1";
- assertEquals(new Integer(1), bc.convertToType(o,
Integer.class));
- assertEquals(new Short((short) 1), bc.convertToType(o,
Short.class));
- assertEquals(new Long(1), bc.convertToType(o, Long.class));
- assertEquals(new Float(1), bc.convertToType(o, Float.class));
- assertEquals(new Double(1), bc.convertToType(o, Double.class));
- assertEquals(new Byte((byte) 1), bc.convertToType(o,
Byte.class));
- assertEquals(new Character('1'), bc.convertToType(o,
Character.class));
+ assertEquals(Integer.valueOf(1), bc.convertToType(o,
Integer.class));
+ assertEquals(Short.valueOf((short) 1), bc.convertToType(o,
Short.class));
+ assertEquals(Long.valueOf(1), bc.convertToType(o, Long.class));
+ assertEquals(Float.valueOf(1), bc.convertToType(o,
Float.class));
+ assertEquals(Double.valueOf(1), bc.convertToType(o,
Double.class));
+ assertEquals(Byte.valueOf((byte) 1), bc.convertToType(o,
Byte.class));
+ assertEquals(Character.valueOf('1'), bc.convertToType(o,
Character.class));
assertEquals(Boolean.FALSE, bc.convertToType(o, Boolean.class));
- assertEquals(new Integer(1), bc.convertToType(o, Integer.TYPE));
- assertEquals(new Short((short) 1), bc.convertToType(o,
Short.TYPE));
- assertEquals(new Long(1), bc.convertToType(o, Long.TYPE));
- assertEquals(new Float(1), bc.convertToType(o, Float.TYPE));
- assertEquals(new Double(1), bc.convertToType(o, Double.TYPE));
- assertEquals(new Byte((byte) 1), bc.convertToType(o,
Byte.TYPE));
- assertEquals(new Character('1'), bc.convertToType(o,
Character.TYPE));
+ assertEquals(Integer.valueOf(1), bc.convertToType(o,
Integer.TYPE));
+ assertEquals(Short.valueOf((short) 1), bc.convertToType(o,
Short.TYPE));
+ assertEquals(Long.valueOf(1), bc.convertToType(o, Long.TYPE));
+ assertEquals(Float.valueOf(1), bc.convertToType(o, Float.TYPE));
+ assertEquals(Double.valueOf(1), bc.convertToType(o,
Double.TYPE));
+ assertEquals(Byte.valueOf((byte) 1), bc.convertToType(o,
Byte.TYPE));
+ assertEquals(Character.valueOf('1'), bc.convertToType(o,
Character.TYPE));
assertEquals(Boolean.FALSE, bc.convertToType(o, Boolean.TYPE));
- o = new Integer(1);
+ o = Integer.valueOf(1);
- assertEquals(new Integer(1), bc.convertToType(o, Integer.TYPE));
- assertEquals(new Short((short) 1), bc.convertToType(o,
Short.TYPE));
- assertEquals(new Long(1), bc.convertToType(o, Long.TYPE));
- assertEquals(new Float(1), bc.convertToType(o, Float.TYPE));
- assertEquals(new Double(1), bc.convertToType(o, Double.TYPE));
- assertEquals(new Byte((byte) 1), bc.convertToType(o,
Byte.TYPE));
- assertEquals(new Character('1'), bc.convertToType(o,
Character.TYPE));
+ assertEquals(Integer.valueOf(1), bc.convertToType(o,
Integer.TYPE));
+ assertEquals(Short.valueOf((short) 1), bc.convertToType(o,
Short.TYPE));
+ assertEquals(Long.valueOf(1), bc.convertToType(o, Long.TYPE));
+ assertEquals(Float.valueOf(1), bc.convertToType(o, Float.TYPE));
+ assertEquals(Double.valueOf(1), bc.convertToType(o,
Double.TYPE));
+ assertEquals(Byte.valueOf((byte) 1), bc.convertToType(o,
Byte.TYPE));
+ assertEquals(Character.valueOf('1'), bc.convertToType(o,
Character.TYPE));
assertEquals(Boolean.TRUE, bc.convertToType(o, Boolean.TYPE));
- o = new Integer(0);
+ o = Integer.valueOf(0);
assertEquals(Boolean.FALSE, bc.convertToType(o, Boolean.TYPE));
// Bean
@@ -362,12 +362,12 @@ public class BeanConfigTest {
// Array of strings to array of ints
o = new String[] { "1", "2", "3" };
- assertEquals(new Integer(1), bc.convertToType(o,
Integer[].class)[0]);
+ assertEquals(Integer.valueOf(1), bc.convertToType(o,
Integer[].class)[0]);
assertEquals(1, bc.convertToType(o, int[].class)[0]);
// Array to list
o = new Integer[] { 1, 2, 3 };
- assertEquals(new Integer(1), bc.convertToType(o,
LinkedList.class).get(0));
+ assertEquals(Integer.valueOf(1), bc.convertToType(o,
LinkedList.class).get(0));
// HashMap to TreeMap
o = map(1, "foo");
@@ -523,14 +523,14 @@ public class BeanConfigTest {
return;
}
bm2.put("a", "Hello");
- bm2.put("b", new Integer(50));
+ bm2.put("b", Integer.valueOf(50));
f1.setA("Hello");
f1.setB(50);
if (!bm2.get("a").equals("Hello"))
fail("Failed to set string property 'a' on dynamic
proxy bean. " + bm2);
- if (!bm2.get("b").equals(new Integer(50)))
+ if (!bm2.get("b").equals(Integer.valueOf(50)))
fail("Failed to set string property 'b' on dynamic
proxy bean. " + bm2);
if (!bm1.equals(bm2))
@@ -556,7 +556,7 @@ public class BeanConfigTest {
public AHandler() {
this.map = new HashMap();
this.map.put("a", "");
- this.map.put("b", new Integer(0));
+ this.map.put("b", Integer.valueOf(0));
}
@Override /* InvocationHandler */
@@ -862,8 +862,8 @@ public class BeanConfigTest {
assertEquals(0, (int)bc.convertToType("", int.class));
assertNull(bc.convertToType("", Integer.class));
- // Booleans are handled different since 'new Boolean("")' is
valid and resolves to false
- // while 'new Integer("")' produces an exception.
+ // Booleans are handled different since 'Boolean.valueOf("")'
is valid and resolves to false
+ // while 'Integer.valueOf("")' produces an exception.
assertEquals(false, (boolean)bc.convertToType("",
boolean.class));
assertEquals(null, bc.convertToType("", Boolean.class));
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index d35187029..ff0bcb13b 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -74,12 +74,12 @@ public class BeanMapTest {
m.put("d1", null);
m.put("f1", null);
m.put("b1", null);
- assertEquals(new Integer(0), m.get("i1"));
- assertEquals(new Short((short)0), m.get("s1"));
- assertEquals(new Long(0l), m.get("l1"));
- assertEquals(new Double(0d), m.get("d1"));
- assertEquals(new Float(0f), m.get("f1"));
- assertEquals(new Boolean(false), m.get("b1"));
+ assertEquals(Integer.valueOf(0), m.get("i1"));
+ assertEquals(Short.valueOf((short)0), m.get("s1"));
+ assertEquals(Long.valueOf(0l), m.get("l1"));
+ assertEquals(Double.valueOf(0d), m.get("d1"));
+ assertEquals(Float.valueOf(0f), m.get("f1"));
+ assertEquals(Boolean.valueOf(false), m.get("b1"));
// Make sure setting non-primitive values to null causes them
to set to null.
m.put("i2", null);
@@ -106,21 +106,21 @@ public class BeanMapTest {
m.put("l2", 1);
m.put("d2", 1);
m.put("f2", 1);
- assertEquals(new Integer(1), m.get("i1"));
- assertEquals(new Integer(1), m.get("i2"));
- assertEquals(new Short((short)1), m.get("s1"));
- assertEquals(new Short((short)1), m.get("s2"));
- assertEquals(new Long(1), m.get("l1"));
- assertEquals(new Long(1), m.get("l2"));
- assertEquals(new Double(1), m.get("d1"));
- assertEquals(new Double(1), m.get("d2"));
- assertEquals(new Float(1), m.get("f1"));
- assertEquals(new Float(1), m.get("f2"));
+ assertEquals(Integer.valueOf(1), m.get("i1"));
+ assertEquals(Integer.valueOf(1), m.get("i2"));
+ assertEquals(Short.valueOf((short)1), m.get("s1"));
+ assertEquals(Short.valueOf((short)1), m.get("s2"));
+ assertEquals(Long.valueOf(1), m.get("l1"));
+ assertEquals(Long.valueOf(1), m.get("l2"));
+ assertEquals(Double.valueOf(1), m.get("d1"));
+ assertEquals(Double.valueOf(1), m.get("d2"));
+ assertEquals(Float.valueOf(1), m.get("f1"));
+ assertEquals(Float.valueOf(1), m.get("f2"));
m.put("b1", true);
- m.put("b2", new Boolean(true));
- assertEquals(new Boolean(true), m.get("b1"));
- assertEquals(new Boolean(true), m.get("b2"));
+ m.put("b2", Boolean.valueOf(true));
+ assertEquals(Boolean.valueOf(true), m.get("b1"));
+ assertEquals(Boolean.valueOf(true), m.get("b2"));
}
public static class A {
@@ -153,12 +153,12 @@ public class BeanMapTest {
m.put("d1", null);
m.put("f1", null);
m.put("b1", null);
- assertEquals(new Integer(0), m.get("i1"));
- assertEquals(new Short((short)0), m.get("s1"));
- assertEquals(new Long(0l), m.get("l1"));
- assertEquals(new Double(0d), m.get("d1"));
- assertEquals(new Float(0f), m.get("f1"));
- assertEquals(new Boolean(false), m.get("b1"));
+ assertEquals(Integer.valueOf(0), m.get("i1"));
+ assertEquals(Short.valueOf((short)0), m.get("s1"));
+ assertEquals(Long.valueOf(0l), m.get("l1"));
+ assertEquals(Double.valueOf(0d), m.get("d1"));
+ assertEquals(Float.valueOf(0f), m.get("f1"));
+ assertEquals(Boolean.valueOf(false), m.get("b1"));
// Make sure setting non-primitive values to null causes them
to set to null.
m.put("i2", null);
@@ -185,21 +185,21 @@ public class BeanMapTest {
m.put("l2", 1);
m.put("d2", 1);
m.put("f2", 1);
- assertEquals(new Integer(1), m.get("i1"));
- assertEquals(new Integer(1), m.get("i2"));
- assertEquals(new Short((short)1), m.get("s1"));
- assertEquals(new Short((short)1), m.get("s2"));
- assertEquals(new Long(1), m.get("l1"));
- assertEquals(new Long(1), m.get("l2"));
- assertEquals(new Double(1), m.get("d1"));
- assertEquals(new Double(1), m.get("d2"));
- assertEquals(new Float(1), m.get("f1"));
- assertEquals(new Float(1), m.get("f2"));
+ assertEquals(Integer.valueOf(1), m.get("i1"));
+ assertEquals(Integer.valueOf(1), m.get("i2"));
+ assertEquals(Short.valueOf((short)1), m.get("s1"));
+ assertEquals(Short.valueOf((short)1), m.get("s2"));
+ assertEquals(Long.valueOf(1), m.get("l1"));
+ assertEquals(Long.valueOf(1), m.get("l2"));
+ assertEquals(Double.valueOf(1), m.get("d1"));
+ assertEquals(Double.valueOf(1), m.get("d2"));
+ assertEquals(Float.valueOf(1), m.get("f1"));
+ assertEquals(Float.valueOf(1), m.get("f2"));
m.put("b1", true);
m.put("b2", true);
- assertEquals(new Boolean(true), m.get("b1"));
- assertEquals(new Boolean(true), m.get("b2"));
+ assertEquals(Boolean.valueOf(true), m.get("b1"));
+ assertEquals(Boolean.valueOf(true), m.get("b2"));
}
public static class B {
@@ -943,13 +943,13 @@ public class BeanMapTest {
public static class M4<T extends Number> extends M1<T> {
public M4() {
- this.x = (T)new Integer(3);
+ this.x = (T)Integer.valueOf(3);
}
}
public static class M5 extends M4<Integer> {
public M5() {
- this.x = new Integer(4);
+ this.x = Integer.valueOf(4);
}
}
@@ -1000,7 +1000,7 @@ public class BeanMapTest {
public static class N4<T extends Number> extends N1<T> {
public N4() {
- setX((T)new Integer(3));
+ setX((T)Integer.valueOf(3));
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
index 42fb9bf69..1bfd6e349 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
@@ -57,14 +57,14 @@ public class JsonMapTest {
checkStep(13, in, getDeepString(JsonMap.ofJson(in), "A/G"),
"asdf\"asdf");
in = "{A:123, B: 123}";
- checkStep(16, in, new
Integer(JsonMap.ofJson(in).getInt("A")).toString(), "123");
- checkStep(17, in, new
Integer(JsonMap.ofJson(in).getInt("B")).toString(), "123");
+ checkStep(16, in,
Integer.valueOf(JsonMap.ofJson(in).getInt("A")).toString(), "123");
+ checkStep(17, in,
Integer.valueOf(JsonMap.ofJson(in).getInt("B")).toString(), "123");
in = "{A:true, B: true, C:false, D: false}";
- checkStep(18, in, new
Boolean(JsonMap.ofJson(in).getBoolean("A")).toString(), "true");
- checkStep(19, in, new
Boolean(JsonMap.ofJson(in).getBoolean("B")).toString(), "true");
- checkStep(20, in, new
Boolean(JsonMap.ofJson(in).getBoolean("C")).toString(), "false");
- checkStep(21, in, new
Boolean(JsonMap.ofJson(in).getBoolean("D")).toString(), "false");
+ checkStep(18, in,
Boolean.valueOf(JsonMap.ofJson(in).getBoolean("A")).toString(), "true");
+ checkStep(19, in,
Boolean.valueOf(JsonMap.ofJson(in).getBoolean("B")).toString(), "true");
+ checkStep(20, in,
Boolean.valueOf(JsonMap.ofJson(in).getBoolean("C")).toString(), "false");
+ checkStep(21, in,
Boolean.valueOf(JsonMap.ofJson(in).getBoolean("D")).toString(), "false");
in = "{'AAA':{\"BBB\":\"CCC\",'DDD':false}}";
checkStep(31, in, getDeepString(JsonMap.ofJson(in), "AAA/BBB"),
"CCC");
@@ -273,7 +273,7 @@ public class JsonMapTest {
JsonMap m1 = JsonMap.ofJson("{a:1}");
JsonMap m2 = JsonMap.ofJson("{b:2}").inner(m1);
- assertEquals(new Integer(1), m2.getInt("a"));
+ assertEquals(Integer.valueOf(1), m2.getInt("a"));
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
index 035ff41bd..69dd550a3 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
@@ -359,7 +359,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testInteger() throws Exception {
Integer t = 123;
t = roundTrip(t, Integer.class);
- assertEquals(new Integer(123), t);
+ assertEquals(Integer.valueOf(123), t);
}
//====================================================================================================
@@ -369,7 +369,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testIntegerArray() throws Exception {
Integer[] t = {123, null};
t = roundTrip(t, Integer[].class);
- assertEquals(new Integer(123), t[0]);
+ assertEquals(Integer.valueOf(123), t[0]);
assertNull(t[1]);
}
@@ -380,7 +380,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testInteger2dArray() throws Exception {
Integer[][] t = {{123,null},null};
t = roundTrip(t, Integer[][].class);
- assertEquals(new Integer(123), t[0][0]);
+ assertEquals(Integer.valueOf(123), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
@@ -392,7 +392,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testInteger3dArray() throws Exception {
Integer[][][] t = {{{123,null},null},null};
t = roundTrip(t, Integer[][][].class);
- assertEquals(new Integer(123), t[0][0][0]);
+ assertEquals(Integer.valueOf(123), t[0][0][0]);
assertNull(t[0][0][1]);
assertNull(t[0][1]);
assertNull(t[1]);
@@ -443,7 +443,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testCharacter() throws Exception {
Character t = 'a';
t = roundTrip(t, Character.class);
- assertEquals(new Character('a'), t);
+ assertEquals(Character.valueOf('a'), t);
}
//====================================================================================================
@@ -453,7 +453,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testCharacterArray() throws Exception {
Character[] t = {'a',null};
t = roundTrip(t, Character[].class);
- assertEquals(new Character('a'), t[0]);
+ assertEquals(Character.valueOf('a'), t[0]);
assertNull(t[1]);
}
@@ -464,7 +464,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testCharacter2dArray() throws Exception {
Character[][] t = {{'a',null},null};
t = roundTrip(t, Character[][].class);
- assertEquals(new Character('a'), t[0][0]);
+ assertEquals(Character.valueOf('a'), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
@@ -476,7 +476,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testFloatObject() throws Exception {
Float t = 1f;
t = roundTrip(t, Float.class);
- assertEquals(new Float(1f), t);
+ assertEquals(Float.valueOf(1f), t);
}
//====================================================================================================
@@ -486,7 +486,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testFloatObjectArray() throws Exception {
Float[] t = {1f, null};
t = roundTrip(t, Float[].class);
- assertEquals(new Float(1f), t[0]);
+ assertEquals(Float.valueOf(1f), t[0]);
assertNull(t[1]);
}
@@ -497,7 +497,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testFloatObject2dArray() throws Exception {
Float[][] t = {{1f,null},null};
t = roundTrip(t, Float[][].class);
- assertEquals(new Float(1f), t[0][0]);
+ assertEquals(Float.valueOf(1f), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
@@ -509,7 +509,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testDoubleObject() throws Exception {
Double t = 1d;
t = roundTrip(t, Double.class);
- assertEquals(new Double(1d), t);
+ assertEquals(Double.valueOf(1d), t);
}
//====================================================================================================
@@ -519,7 +519,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testDoubleObjectArray() throws Exception {
Double[] t = {1d,null};
t = roundTrip(t, Double[].class);
- assertEquals(new Double(1d), t[0]);
+ assertEquals(Double.valueOf(1d), t[0]);
assertNull(t[1]);
}
@@ -530,7 +530,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testDoubleObject2dArray() throws Exception {
Double[][] t = {{1d,null},null};
t = roundTrip(t, Double[][].class);
- assertEquals(new Double(1d), t[0][0]);
+ assertEquals(Double.valueOf(1d), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
@@ -542,7 +542,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testLongObject() throws Exception {
Long t = 1l;
t = roundTrip(t, Long.class);
- assertEquals(new Long(1l), t);
+ assertEquals(Long.valueOf(1l), t);
}
//====================================================================================================
@@ -552,7 +552,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testLongObjectArray() throws Exception {
Long[] t = {1l, null};
t = roundTrip(t, Long[].class);
- assertEquals(new Long(1l), t[0]);
+ assertEquals(Long.valueOf(1l), t[0]);
assertNull(t[1]);
}
@@ -563,7 +563,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testLongObject2dArray() throws Exception {
Long[][] t = {{1l,null},null};
t = roundTrip(t, Long[][].class);
- assertEquals(new Long(1l), t[0][0]);
+ assertEquals(Long.valueOf(1l), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
@@ -575,7 +575,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testShortObject() throws Exception {
Short t = (short)1;
t = roundTrip(t, Short.class);
- assertEquals(new Short((short)1), t);
+ assertEquals(Short.valueOf((short)1), t);
}
//====================================================================================================
@@ -585,7 +585,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testShortObjectArray() throws Exception {
Short[] t = {(short)1,null};
t = roundTrip(t, Short[].class);
- assertEquals(new Short((short)1), t[0]);
+ assertEquals(Short.valueOf((short)1), t[0]);
assertNull(t[1]);
}
@@ -596,7 +596,7 @@ public class RoundTripSimpleObjectsTest extends
RoundTripTest {
public void testShortObject2dArray() throws Exception {
Short[][] t = {{(short)1,null},null};
t = roundTrip(t, Short[][].class);
- assertEquals(new Short((short)1), t[0][0]);
+ assertEquals(Short.valueOf((short)1), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
index a1f7fe13f..919dc36cc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
@@ -428,6 +428,7 @@ public class AnyAssertion_Test {
assertThrown(()->test(nil).isNotAny(nil)).asMessage().asOneLine().is("Unexpected
value found. Unexpected='null'. Actual='null'.");
}
+ @SuppressWarnings("deprecation")
@Test
public void ca08_isSame() throws Exception {
Integer x1 = new Integer(1), x1a = new Integer(1), nil = null;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
index dee2cbe05..ef2e56036 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
@@ -164,6 +164,7 @@ public class BooleanAssertion_Test {
assertThrown(()->test(nil).isNotAny(nil)).asMessage().asOneLine().is("Unexpected
value found. Unexpected='null'. Actual='null'.");
}
+ @SuppressWarnings("deprecation")
@Test
public void ca08_isSame() throws Exception {
Boolean x1 = new Boolean(true), x1a = new Boolean(true), nil =
null;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
index 78226461e..18471f519 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
@@ -164,6 +164,7 @@ public class ComparableAssertion_Test {
assertThrown(()->test(nil).isNotAny(nil)).asMessage().asOneLine().is("Unexpected
value found. Unexpected='null'. Actual='null'.");
}
+ @SuppressWarnings("deprecation")
@Test
public void ca08_isSame() throws Exception {
Integer x1 = new Integer(1), x1a = new Integer(1), nil = null;
@@ -257,7 +258,7 @@ public class ComparableAssertion_Test {
@Test
public void cb02_isGte() throws Exception {
- Integer x1 = 1, x1a = new Integer(1), x2 = 2, nil = null;
+ Integer x1 = 1, x1a = Integer.valueOf(1), x2 = 2, nil = null;
test(x2).isGte(x1);
test(x1).isGte(x1);
test(x1).isGte(x1a);
@@ -278,7 +279,7 @@ public class ComparableAssertion_Test {
@Test
public void cb04_isLte() throws Exception {
- Integer x1 = 1, x1a = new Integer(1), x2 = 2, nil = null;
+ Integer x1 = 1, x1a = Integer.valueOf(1), x2 = 2, nil = null;
test(x1).isLte(x2);
test(x1).isLte(x1);
test(x1).isLte(x1a);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
index d71d45713..4fb258b85 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
@@ -165,6 +165,7 @@ public class IntegerAssertion_Test {
assertThrown(()->test(nil).isNotAny(nil)).asMessage().asOneLine().is("Unexpected
value found. Unexpected='null'. Actual='null'.");
}
+ @SuppressWarnings("deprecation")
@Test
public void ca08_isSame() throws Exception {
Integer x1 = new Integer(1), x1a = new Integer(1), nil = null;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
index 05237735e..ecc8a93c8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
@@ -187,6 +187,7 @@ public class ObjectAssertion_Test {
assertThrown(()->test(nil).isNotAny(nil)).asMessage().asOneLine().is("Unexpected
value found. Unexpected='null'. Actual='null'.");
}
+ @SuppressWarnings("deprecation")
@Test
public void ca08_isSame() throws Exception {
Integer x1 = new Integer(1), x1a = new Integer(1), nil = null;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
index eb3b3eb50..47f62d75f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
@@ -526,11 +526,11 @@ public class OpenApiPartSerializer_Test {
public void f01_integerType_int32() throws Exception {
HttpPartSchema ps = T_INT32;
assertEquals("1", serialize(ps, 1));
- assertEquals("1", serialize(ps, new Integer(1)));
+ assertEquals("1", serialize(ps, Integer.valueOf(1)));
assertEquals("1", serialize(ps, (short)1));
- assertEquals("1", serialize(ps, new Short((short)1)));
+ assertEquals("1", serialize(ps, Short.valueOf((short)1)));
assertEquals("1", serialize(ps, 1l));
- assertEquals("1", serialize(ps, new Long(1)));
+ assertEquals("1", serialize(ps, Long.valueOf(1)));
assertEquals("1", serialize(ps, "1"));
assertEquals("1", serialize(ps, new F1(1)));
assertEquals("null", serialize(ps, null));
@@ -545,7 +545,7 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2,null", serialize(ps, list(1,2,null)));
assertEquals("1,2", serialize(ps, new short[]{1,2}));
assertEquals("1,2,null", serialize(ps, new Short[]{1,2,null}));
- assertEquals("1,2,null", serialize(ps, list(new
Short((short)1),new Short((short)2),null)));
+ assertEquals("1,2,null", serialize(ps,
list(Short.valueOf((short)1),Short.valueOf((short)2),null)));
assertEquals("1,2", serialize(ps, new long[]{1l,2l}));
assertEquals("1,2,null", serialize(ps, new Long[]{1l,2l,null}));
assertEquals("1,2,null", serialize(ps, list(1l,2l,null)));
@@ -570,12 +570,12 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2|3|null", serialize(ps, list(new
short[]{1,2},new short[]{3},null)));
assertEquals("1,2|3,null|null", serialize(ps, new
Short[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new
Short[]{1,2},new Short[]{3,null},null)));
- assertEquals("1,2|3,null|null", serialize(ps, list(list(new
Short((short)1),new Short((short)2)),list(new Short((short)3),null),null)));
+ assertEquals("1,2|3,null|null", serialize(ps,
list(list(Short.valueOf((short)1),Short.valueOf((short)2)),list(Short.valueOf((short)3),null),null)));
assertEquals("1,2|3|null", serialize(ps, new
long[][]{{1l,2l},{3l},null}));
assertEquals("1,2|3|null", serialize(ps, list(new
long[]{1l,2l},new long[]{3l},null)));
assertEquals("1,2|3,null|null", serialize(ps, new
Long[][]{{1l,2l},{3l,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new
Long[]{1l,2l},new Long[]{3l,null},null)));
- assertEquals("1,2|3,null|null", serialize(ps, list(list(new
Long(1),new Long(2)),list(new Long(3),null),null)));
+ assertEquals("1,2|3,null|null", serialize(ps,
list(list(Long.valueOf(1),Long.valueOf(2)),list(Long.valueOf(3),null),null)));
assertEquals("1,2|3,null,null|null", serialize(ps, new
String[][]{{"1","2"},{"3","null",null},null}));
assertEquals("1,2|3,null,null|null", serialize(ps, list(new
String[]{"1","2"},new String[]{"3","null",null},null)));
assertEquals("1,2|3,null,null|null", serialize(ps,
list(list("1","2"),list("3","null",null),null)));
@@ -593,11 +593,11 @@ public class OpenApiPartSerializer_Test {
public void f04_integerType_int64() throws Exception {
HttpPartSchema ps = T_INT64;
assertEquals("1", serialize(ps, 1));
- assertEquals("1", serialize(ps, new Integer(1)));
+ assertEquals("1", serialize(ps, Integer.valueOf(1)));
assertEquals("1", serialize(ps, (short)1));
- assertEquals("1", serialize(ps, new Short((short)1)));
+ assertEquals("1", serialize(ps, Short.valueOf((short)1)));
assertEquals("1", serialize(ps, 1l));
- assertEquals("1", serialize(ps, new Long(1l)));
+ assertEquals("1", serialize(ps, Long.valueOf(1l)));
assertEquals("1", serialize(ps, "1"));
assertEquals("1", serialize(ps, new F3(1l)));
assertEquals("null", serialize(ps, null));
@@ -705,9 +705,9 @@ public class OpenApiPartSerializer_Test {
public void g01_numberType_float() throws Exception {
HttpPartSchema ps = T_FLOAT;
assertEquals("1.0", serialize(ps, 1f));
- assertEquals("1.0", serialize(ps, new Float(1f)));
+ assertEquals("1.0", serialize(ps, Float.valueOf(1f)));
assertEquals("1.0", serialize(ps, 1d));
- assertEquals("1.0", serialize(ps, new Double(1d)));
+ assertEquals("1.0", serialize(ps, Double.valueOf(1d)));
assertEquals("1.0", serialize(ps, "1"));
assertEquals("1.0", serialize(ps, new G1(1f)));
assertEquals("null", serialize(ps, null));
@@ -763,9 +763,9 @@ public class OpenApiPartSerializer_Test {
public void g04_numberType_double() throws Exception {
HttpPartSchema ps = T_DOUBLE;
assertEquals("1.0", serialize(ps, 1f));
- assertEquals("1.0", serialize(ps, new Float(1f)));
+ assertEquals("1.0", serialize(ps, Float.valueOf(1f)));
assertEquals("1.0", serialize(ps, 1d));
- assertEquals("1.0", serialize(ps, new Double(1d)));
+ assertEquals("1.0", serialize(ps, Double.valueOf(1d)));
assertEquals("1.0", serialize(ps, "1"));
assertEquals("1.0", serialize(ps, new G3(1d)));
assertEquals("null", serialize(ps, null));
@@ -1011,56 +1011,56 @@ public class OpenApiPartSerializer_Test {
//-----------------------------------------------------------------------------------------------------------------
@Test
public void i01a_noSchemaTests_Integer() throws Exception {
- for (Integer v : list(new Integer(1), Integer.MAX_VALUE,
Integer.MIN_VALUE))
+ for (Integer v : list(Integer.valueOf(1), Integer.MAX_VALUE,
Integer.MIN_VALUE))
assertEquals(valueOf(v),
serialize((HttpPartSchema)null, v));
}
@Test
public void i01b_noSchemaTests_IntegerArray() throws Exception {
- assertEquals("1,2147483647,-2147483648",
serialize((HttpPartSchema)null, new Integer[]{new Integer(1),
Integer.MAX_VALUE, Integer.MIN_VALUE}));
+ assertEquals("1,2147483647,-2147483648",
serialize((HttpPartSchema)null, new Integer[]{Integer.valueOf(1),
Integer.MAX_VALUE, Integer.MIN_VALUE}));
}
@Test
public void i02a_noSchemaTests_Short() throws Exception {
- for (Short v : list(new Short((short)1), Short.MAX_VALUE,
Short.MIN_VALUE))
+ for (Short v : list(Short.valueOf((short)1), Short.MAX_VALUE,
Short.MIN_VALUE))
assertEquals(valueOf(v),
serialize((HttpPartSchema)null, v));
}
@Test
public void i02b_noSchemaTests_ShortArray() throws Exception {
- assertEquals("1,32767,-32768,null",
serialize((HttpPartSchema)null, new Short[]{new Short((short)1),
Short.MAX_VALUE, Short.MIN_VALUE, null}));
+ assertEquals("1,32767,-32768,null",
serialize((HttpPartSchema)null, new Short[]{Short.valueOf((short)1),
Short.MAX_VALUE, Short.MIN_VALUE, null}));
}
@Test
public void i03a_noSchemaTests_Long() throws Exception {
- for (Long v : list(new Long(1), Long.MAX_VALUE, Long.MIN_VALUE))
+ for (Long v : list(Long.valueOf(1), Long.MAX_VALUE,
Long.MIN_VALUE))
assertEquals(valueOf(v),
serialize((HttpPartSchema)null, v));
}
@Test
public void i03b_noSchemaTests_LongArray() throws Exception {
- assertEquals("1,9223372036854775807,-9223372036854775808,null",
serialize((HttpPartSchema)null, new Long[]{new Long(1), Long.MAX_VALUE,
Long.MIN_VALUE, null}));
+ assertEquals("1,9223372036854775807,-9223372036854775808,null",
serialize((HttpPartSchema)null, new Long[]{Long.valueOf(1), Long.MAX_VALUE,
Long.MIN_VALUE, null}));
}
@Test
public void i04a_noSchemaTests_Float() throws Exception {
- for (Float v : list(new Float(1f), Float.MAX_VALUE,
Float.MIN_VALUE))
+ for (Float v : list(Float.valueOf(1f), Float.MAX_VALUE,
Float.MIN_VALUE))
assertEquals(valueOf(v),
serialize((HttpPartSchema)null, v));
}
@Test
public void i04b_noSchemaTests_FloatArray() throws Exception {
- assertEquals("1.0,3.4028235E38,1.4E-45",
serialize((HttpPartSchema)null, new Float[]{new Float(1f), Float.MAX_VALUE,
Float.MIN_VALUE}));
+ assertEquals("1.0,3.4028235E38,1.4E-45",
serialize((HttpPartSchema)null, new Float[]{Float.valueOf(1f), Float.MAX_VALUE,
Float.MIN_VALUE}));
}
@Test
public void i05a_noSchemaTests_Double() throws Exception {
- for (Double v : list(new Double(1d), Double.MAX_VALUE,
Double.MIN_VALUE))
+ for (Double v : list(Double.valueOf(1d), Double.MAX_VALUE,
Double.MIN_VALUE))
assertEquals(valueOf(v),
serialize((HttpPartSchema)null, v));
}
@Test
public void i05b_noSchemaTests_DoubleArray() throws Exception {
- assertEquals("1.0,1.7976931348623157E308,4.9E-324",
serialize((HttpPartSchema)null, new Double[]{new Double(1), Double.MAX_VALUE,
Double.MIN_VALUE}));
+ assertEquals("1.0,1.7976931348623157E308,4.9E-324",
serialize((HttpPartSchema)null, new Double[]{Double.valueOf(1),
Double.MAX_VALUE, Double.MIN_VALUE}));
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
index 57b37a690..895671542 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
@@ -90,7 +90,7 @@ public class JsonTest {
l.add("2");
l.add("3");
Object o = new Object[] { m, l };
- Object o2 = new Object[] { o, "foo", "bar", new Integer(1), new
Boolean(false), new Float(1.2), null };
+ Object o2 = new Object[] { o, "foo", "bar", Integer.valueOf(1),
Boolean.valueOf(false), Float.valueOf(1.2f), null };
assertEquals("K1",
"[[{J:'f1',B:'b',C:'c'},['1','2','3']],'foo','bar',1,false,1.2,null]",
s1.serialize(o2));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
index 4d02eeb1d..f36c87d08 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
@@ -147,7 +147,7 @@ public class ObjectRest_Test {
m.put("street","street D");
m.put("city","city D");
m.put("state","state D");
- m.put("zip",new Integer(12345));
+ m.put("zip",Integer.valueOf(12345));
// Try the same for an address in an array.
model.put("addresses/1", m);
@@ -156,7 +156,7 @@ public class ObjectRest_Test {
assertEquals(expectedValue, s);
// Try setting some fields.
- model.put("addresses/1/zip", new Integer(99999));
+ model.put("addresses/1/zip", Integer.valueOf(99999));
s = model.get("addresses/1/zip").toString();
expectedValue = "99999";
assertEquals(expectedValue, s);
@@ -185,8 +185,8 @@ public class ObjectRest_Test {
// Make sure doing a POST against "" or "/" adds to the root
object.
model = ObjectRest.create(new JsonList());
- model.post("", new Integer(1));
- model.post("/", new Integer(2));
+ model.post("", Integer.valueOf(1));
+ model.post("/", Integer.valueOf(2));
s = model.get("").toString();
assertEquals("[1,2]", s);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
index bd9a0d1b8..040d6f6c4 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
@@ -27,7 +27,7 @@ public class TestUtils extends
org.apache.juneau.testutils.TestUtils {
*/
public static Swagger getSwagger(Class<?> c) {
try {
- Object r = c.newInstance();
+ Object r = c.getDeclaredConstructor().newInstance();
RestContext rc =
RestContext.create(r.getClass(),null,null).init(()->r).build();
RestOpContext ctx =
RestOpContext.create(TestUtils.class.getMethod("getSwagger", Class.class),
rc).build();
RestSession session =
RestSession.create(rc).resource(r).req(new MockServletRequest()).res(new
MockServletResponse()).build();
