You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by vl...@apache.org on 2023/04/06 05:07:19 UTC
[tapestry-5] branch master updated: Replaced deprecated constructors with valueOf() equivalents.
This is an automated email from the ASF dual-hosted git repository.
vlamp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 4137f728a Replaced deprecated constructors with valueOf() equivalents.
4137f728a is described below
commit 4137f728a1ed5ab9a1b6697a52a45eba8dfd61f1
Author: Volker Lamp <vl...@apache.org>
AuthorDate: Thu Apr 6 07:07:10 2023 +0200
Replaced deprecated constructors with valueOf() equivalents.
---
.../beanmodel/internal/services/PropertyConduitSourceImpl.java | 8 ++++----
.../integration/app1/pages/DateFieldAjaxFormLoop.java | 2 +-
.../tapestry5/integration/app1/pages/FormInjectorDemo.java | 2 +-
.../tapestry5/integration/app1/pages/LinkSubmitDemo.java | 2 +-
.../tapestry5/integration/app1/pages/SubmitWithContext.java | 2 +-
.../apache/tapestry5/internal/TapestryInternalUtilsTest.java | 2 +-
.../internal/services/AbstractBeanModelSourceImplTest.java | 2 +-
.../tapestry5/internal/services/ComponentEventImplTest.java | 2 +-
.../internal/services/DefaultRequestExceptionHandlerTest.java | 2 +-
.../internal/services/FieldValidationSupportImplTest.java | 2 +-
.../tapestry5/internal/services/MetaDataLocatorImplTest.java | 2 +-
.../internal/services/PropertyConduitSourceImplTest.java | 10 +++++-----
.../internal/structure/InternalComponentResourcesImplTest.java | 2 +-
.../org/apache/tapestry5/internal/util/IntegerRangeTest.java | 4 ++--
.../src/test/java/org/apache/tapestry5/func/FuncTest.java | 2 +-
15 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/internal/services/PropertyConduitSourceImpl.java b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/internal/services/PropertyConduitSourceImpl.java
index 46641a8f7..158132a39 100644
--- a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/internal/services/PropertyConduitSourceImpl.java
+++ b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/internal/services/PropertyConduitSourceImpl.java
@@ -814,13 +814,13 @@ public class PropertyConduitSourceImpl implements PropertyConduitSource
case INTEGER:
- builder.loadConstant(new Long(node.getText()));
+ builder.loadConstant(Long.valueOf(node.getText()));
return long.class;
case DECIMAL:
- builder.loadConstant(new Double(node.getText()));
+ builder.loadConstant(Double.valueOf(node.getText()));
return double.class;
@@ -1448,14 +1448,14 @@ public class PropertyConduitSourceImpl implements PropertyConduitSource
// Leading '+' may screw this up.
// TODO: Singleton instance for "0", maybe "1"?
- return createLiteralConduit(Long.class, new Long(tree.getText()));
+ return createLiteralConduit(Long.class, Long.valueOf(tree.getText()));
case DECIMAL:
// Leading '+' may screw this up.
// TODO: Singleton instance for "0.0"?
- return createLiteralConduit(Double.class, new Double(tree.getText()));
+ return createLiteralConduit(Double.class, Double.valueOf(tree.getText()));
case STRING:
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldAjaxFormLoop.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldAjaxFormLoop.java
index 825f865a1..8b96c4553 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldAjaxFormLoop.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldAjaxFormLoop.java
@@ -51,7 +51,7 @@ public class DateFieldAjaxFormLoop
public DateHolder toValue(String clientValue)
{
- Integer key = new Integer(clientValue);
+ Integer key = Integer.valueOf(clientValue);
return database.get(key);
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
index f3af9fdbf..50b8b5fca 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
@@ -59,7 +59,7 @@ public class FormInjectorDemo
public DoubleItem toValue(String clientValue)
{
- Long key = new Long(clientValue);
+ Long key = Long.valueOf(clientValue);
return database.get(key);
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LinkSubmitDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LinkSubmitDemo.java
index 4832f63ff..6032a4ee6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LinkSubmitDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LinkSubmitDemo.java
@@ -35,7 +35,7 @@ public class LinkSubmitDemo
public Object[] getFormContext()
{
- return new Object[]{new Integer(7), new Double(3.14159)};
+ return new Object[]{Integer.valueOf(7), Double.valueOf(3.14159)};
}
void onSelectedFromFred(Integer first, Double second)
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SubmitWithContext.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SubmitWithContext.java
index 8fe8f3455..4e738aaf4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SubmitWithContext.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SubmitWithContext.java
@@ -25,7 +25,7 @@ public class SubmitWithContext
public Object[] getFormContext()
{
- return new Object[]{new Integer(7), new Double(3.14159)};
+ return new Object[]{Integer.valueOf(7), Double.valueOf(3.14159)};
}
void onSelected(Integer first, Double second)
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
index 8f70ab5fa..a249a30f1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
@@ -145,7 +145,7 @@ public class TapestryInternalUtilsTest extends InternalBaseTestCase
@Test
public void object_to_option_model()
{
- Object object = new Integer(27);
+ Object object = Integer.valueOf(27);
OptionModel model = TapestryInternalUtils.toOptionModel(object);
assertEquals(model.getLabel(), "27");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AbstractBeanModelSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AbstractBeanModelSourceImplTest.java
index ddd68a8d1..c303fe52f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AbstractBeanModelSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AbstractBeanModelSourceImplTest.java
@@ -522,7 +522,7 @@ public abstract class AbstractBeanModelSourceImplTest extends InternalBaseTestCa
bean.getSimple().setAge(24);
- assertEquals(age.getConduit().get(bean), new Integer(24));
+ assertEquals(age.getConduit().get(bean), Integer.valueOf(24));
verify();
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
index 53e57ddff..307bed707 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
@@ -172,7 +172,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
ComponentPageElementResources resources = mockComponentPageElementResources();
EventContext context = mockEventContext();
- Integer value = new Integer(27);
+ Integer value = Integer.valueOf(27);
Logger logger = mockLogger();
ComponentModel model = mockComponentModel();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
index bcd923320..59589643b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
@@ -141,7 +141,7 @@ public class DefaultRequestExceptionHandlerTest extends InternalBaseTestCase
@Test
public void contextIsProvidedByContextAwareException()
{
- Object[] sourceContext = new Object[]{new Integer(10), this};
+ Object[] sourceContext = new Object[]{Integer.valueOf(10), this};
Object[] context = exceptionHandler.formExceptionContext(new MyContextAwareException(sourceContext)
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
index bbc026361..3049360bc 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
@@ -217,7 +217,7 @@ public class FieldValidationSupportImplTest extends InternalBaseTestCase
@Test
public void to_client_via_translator()
{
- Object value = new Integer(99);
+ Object value = Integer.valueOf(99);
ComponentResources resources = mockComponentResources();
FieldTranslator translator = mockFieldTranslator();
NullFieldStrategy nullFieldStrategy = mockNullFieldStrategy();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
index 4f3afce6e..db8000d80 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
@@ -374,7 +374,7 @@ public class MetaDataLocatorImplTest extends InternalBaseTestCase
MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, modelSource,
configuration);
- assertEquals(locator.findMeta(key, resources, Integer.class), new Integer(99));
+ assertEquals(locator.findMeta(key, resources, Integer.class), Integer.valueOf(99));
verify();
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
index 2a6ffc388..75494d7b8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
@@ -514,7 +514,7 @@ public class PropertyConduitSourceImplTest extends InternalBaseTestCase
for (int i = 0; i < 10; i++)
{
bean.setStoredInt(i);
- assertEquals(conduit.get(bean), new Integer(i * 3));
+ assertEquals(conduit.get(bean), Integer.valueOf(i * 3));
}
}
@@ -528,7 +528,7 @@ public class PropertyConduitSourceImplTest extends InternalBaseTestCase
bean.setStoredDouble(value);
- assertEquals(conduit.get(bean), new Double(2. * value));
+ assertEquals(conduit.get(bean), Double.valueOf(2. * value));
}
@Test
@@ -566,7 +566,7 @@ public class PropertyConduitSourceImplTest extends InternalBaseTestCase
List l = (List) conduit.get(bean);
- assertListsEquals(l, new Long(1), new Double(2.0), "Lisa");
+ assertListsEquals(l, Long.valueOf(1), Double.valueOf(2.0), "Lisa");
}
@Test
@@ -592,7 +592,7 @@ public class PropertyConduitSourceImplTest extends InternalBaseTestCase
List l = (List) conduit.get(bean);
- assertListsEquals(l, new Long(1), new Double(2.0), "Bart");
+ assertListsEquals(l, Long.valueOf(1), Double.valueOf(2.0), "Bart");
}
@Test
@@ -804,7 +804,7 @@ public class PropertyConduitSourceImplTest extends InternalBaseTestCase
PropertyConduit pc = source.create(PublicFieldBean.class, "IntField");
- assertEquals(pc.get(bean), new Integer(99));
+ assertEquals(pc.get(bean), Integer.valueOf(99));
pc.set(bean, 37);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
index d85b3ef04..33422c496 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
@@ -111,7 +111,7 @@ public class InternalComponentResourcesImplTest extends InternalBaseTestCase
MarkupWriter writer = mockMarkupWriter();
ComponentModel model = mockComponentModel();
Binding binding = mockBinding();
- Object rawValue = new Long(97);
+ Object rawValue = Long.valueOf(97);
train_getModel(ins, model);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java
index 20dba47c5..8dd6f0ea4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java
@@ -121,7 +121,7 @@ public class IntegerRangeTest extends Assert
Iterator<Integer> i = r.iterator();
- assertEquals(i.next(), new Integer(1));
+ assertEquals(i.next(), Integer.valueOf(1));
try
{
@@ -133,7 +133,7 @@ public class IntegerRangeTest extends Assert
// Expected, ignored.
}
- assertEquals(i.next(), new Integer(2));
+ assertEquals(i.next(), Integer.valueOf(2));
}
private final void unreachable()
diff --git a/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java b/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
index b459ee97f..8e9ed9235 100644
--- a/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
+++ b/tapestry-func/src/test/java/org/apache/tapestry5/func/FuncTest.java
@@ -491,7 +491,7 @@ public class FuncTest extends BaseFuncTest
Iterator<Integer> it = flow.iterator();
assertTrue(it.hasNext());
- assertEquals(it.next(), new Integer(2));
+ assertEquals(it.next(), Integer.valueOf(2));
it.remove();
}