This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new de535fcb Update call deprecated in Java 9
de535fcb is described below
commit de535fcbf5700bb232305330e513b0c25933f5e3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Oct 2 11:49:19 2023 -0400
Update call deprecated in Java 9
---
core/src/main/java/org/apache/commons/jelly/JellyContext.java | 2 +-
core/src/main/java/org/apache/commons/jelly/TagLibrary.java | 6 ++----
.../main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java | 6 ++----
.../main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java | 6 ++----
core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java | 2 +-
core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java | 2 +-
.../main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java | 6 ++----
.../src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java | 7 ++-----
.../org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java | 2 +-
.../apache/commons/jelly/tags/jface/preference/FieldEditorTag.java | 2 +-
.../main/java/org/apache/commons/jelly/tags/swing/ActionTag.java | 6 ++----
.../main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java | 4 ++--
.../java/org/apache/commons/jelly/tags/swing/ComponentTag.java | 6 ++----
.../src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java | 6 ++----
.../src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java | 2 +-
.../java/org/apache/commons/jelly/tags/validate/VerifierTag.java | 6 ++----
16 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
index 7acfb72c..e8f7c2a6 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
@@ -479,7 +479,7 @@ public class JellyContext {
}
if ( theClass != null ) {
try {
- Object object = theClass.newInstance();
+ Object object = theClass.getConstructor().newInstance();
if (object instanceof TagLibrary) {
taglibs.put(namespaceURI, object);
return (TagLibrary) object;
diff --git a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
index 107a5a1f..e7388ade 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
@@ -101,10 +101,8 @@ public abstract class TagLibrary {
if (value instanceof Class) {
Class type = (Class) value;
try {
- return (Tag) type.newInstance();
- } catch (InstantiationException e) {
- throw new JellyException(e.toString());
- } catch (IllegalAccessException e) {
+ return (Tag) type.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new JellyException(e.toString());
}
}
diff --git
a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
index 8ec959d6..46f9d5a3 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
@@ -42,10 +42,8 @@ public class DefaultTagFactory implements TagFactory {
@Override
public Tag createTag(String name, Attributes attributes) throws
JellyException {
try {
- return (Tag) tagClass.newInstance();
- } catch (InstantiationException e) {
- throw new JellyException(e.toString());
- } catch (IllegalAccessException e) {
+ return (Tag) tagClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new JellyException(e.toString());
}
}
diff --git
a/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
b/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
index 00531d6a..a375d7b1 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
@@ -95,11 +95,9 @@ public class DynamicBeanTag extends DynaBeanTagSupport
implements BeanSource {
public void beforeSetAttributes() throws JellyTagException {
// create a new dynabean before the attributes are set
try {
- bean = beanClass.newInstance();
+ bean = beanClass.getConstructor().newInstance();
setDynaBean(new ConvertingWrapDynaBean(bean));
- } catch (InstantiationException e) {
- throw new JellyTagException("Could not instantiate dynabean", e);
- } catch (IllegalAccessException e) {
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException("Could not instantiate dynabean", e);
}
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index 7c79c4ba..e4e1c8eb 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -1096,7 +1096,7 @@ public class XMLParser extends DefaultHandler {
// try to find the class on the classpath
try {
Class taglibClass = getClassLoader().loadClass(uri);
- taglib = (TagLibrary) taglibClass.newInstance();
+ taglib = (TagLibrary)
taglibClass.getConstructor().newInstance();
context.registerTagLibrary(namespaceURI, taglib);
}
catch (ClassNotFoundException e) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
index 3367b349..023d16f2 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
@@ -79,7 +79,7 @@ public class NewTag extends BaseClassLoaderTag implements
ArgTagParent {
Class theClass = getClassLoader().loadClass( className );
Object object = null;
if (paramTypes.size() == 0) {
- object = theClass.newInstance();
+ object = theClass.getConstructor().newInstance();
} else {
Object[] values = paramValues.toArray();
Class[] types = (Class[]) (paramTypes.toArray(new
Class[paramTypes.size()]));
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
index 06414f7d..1660e6a7 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
@@ -168,10 +168,8 @@ public class UseBeanTag extends MapTagSupport implements
BeanSource {
protected Object newInstance(Class theClass, Map attributes, XMLOutput
output)
throws JellyTagException {
try {
- return theClass.newInstance();
- } catch (IllegalAccessException e) {
- throw new JellyTagException(e.toString());
- } catch (InstantiationException e) {
+ return theClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException(e.toString());
}
}
diff --git
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
index 3d20eab7..21350940 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
@@ -504,11 +504,8 @@ public class AntTag extends MapTagSupport implements
TaskSource {
Object o = null;
try {
- o = taskType.newInstance();
- } catch (InstantiationException e) {
- throw new JellyTagException(e);
- }
- catch (IllegalAccessException e) {
+ o = taskType.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException(e);
}
diff --git
a/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
index 155e8efb..0894132b 100644
---
a/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
+++
b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
@@ -174,7 +174,7 @@ public class IntrospectorTag extends TagSupport {
Object object = null;
try {
- object = theClass.newInstance();
+ object = theClass.getConstructor().newInstance();
}
catch (Exception e) {
throw new ConversionException( "Could not instantiate an
instance of: " + name, e );
diff --git
a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
index dac55d21..1100a7ef 100644
---
a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
+++
b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
@@ -94,7 +94,7 @@ public class FieldEditorTag extends UseBeanTag {
Object[] arguments = { name, labelText, parentComposite };
return constructor.newInstance(arguments);
}
- return theClass.newInstance();
+ return theClass.getConstructor().newInstance();
} catch (NoSuchMethodException e) {
throw new JellyTagException(e);
diff --git
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
index 6f6f4544..2f7f14cb 100644
---
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
+++
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
@@ -88,10 +88,8 @@ public class ActionTag extends UseBeanTag {
if (theClass != null ) {
try {
- return theClass.newInstance();
- } catch (InstantiationException e) {
- throw new JellyTagException(e);
- } catch (IllegalAccessException e) {
+ return theClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException(e);
}
diff --git
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
index 5101b156..52bbfadf 100644
---
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
+++
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
@@ -35,8 +35,8 @@ public class BeanFactory implements Factory {
@Override
public Object newInstance() throws InstantiationException {
try {
- return beanClass.newInstance();
- } catch (IllegalAccessException e) {
+ return beanClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new InstantiationException(e.toString());
}
}
diff --git
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
index 364400a6..2e5331d5 100644
---
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
+++
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
@@ -321,13 +321,11 @@ public class ComponentTag extends UseBeanTag implements
ContainerTag {
}
try {
if (theClass != null ) {
- return theClass.newInstance();
+ return theClass.getConstructor().newInstance();
} else {
return factory.newInstance();
}
- } catch (IllegalAccessException e) {
- throw new JellyTagException(e);
- } catch (InstantiationException e) {
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException(e);
}
}
diff --git
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
index c4d3eaca..31e49a46 100644
---
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
+++
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
@@ -104,10 +104,8 @@ public class GbcTag extends UseBeanTag implements
ContainerTag {
protected Object newInstance(Class theClass, Map attributes, XMLOutput
output) throws JellyTagException {
if (theClass != null ) {
try {
- return theClass.newInstance();
- } catch (IllegalAccessException e) {
- throw new JellyTagException(e);
- } catch (InstantiationException e) {
+ return theClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException(e);
}
}
diff --git
a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
index 813c0a31..2cfd865e 100644
---
a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
+++
b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
@@ -261,7 +261,7 @@ public class WidgetTag extends UseBeanTag {
}
}
}
- return theClass.newInstance();
+ return theClass.getConstructor().newInstance();
} catch (NoSuchMethodException e) {
throw new JellyTagException(e);
} catch (InstantiationException e) {
diff --git
a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
index cd638385..f94b0113 100644
---
a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
+++
b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
@@ -175,12 +175,10 @@ public class VerifierTag extends TagSupport {
try {
ClassLoader loader = ClassLoaderUtils.getClassLoader(null,
true, getClass());
factory = (VerifierFactory)loader.loadClass(
- "com.sun.msv.verifier.jarv.TheFactoryImpl").newInstance();
+
"com.sun.msv.verifier.jarv.TheFactoryImpl").getConstructor().newInstance();
} catch (ClassNotFoundException e) {
throw new JellyTagException(e);
- } catch (InstantiationException e) {
- throw new JellyTagException(e);
- } catch (IllegalAccessException e) {
+ } catch (ReflectiveOperationException e) {
throw new JellyTagException(e);
}
}
