You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/07/24 16:00:01 UTC
wicket git commit: Fix deprecation warning.
Repository: wicket
Updated Branches:
refs/heads/master 9f3bbac34 -> 47e7a1c89
Fix deprecation warning.
Class#newInstance() should be replaced with Class#getDeclaredConstructor().newInstance()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/47e7a1c8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/47e7a1c8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/47e7a1c8
Branch: refs/heads/master
Commit: 47e7a1c897e43697607d68b9b7f8e159e0e0e315
Parents: 9f3bbac
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jul 24 18:59:27 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jul 24 18:59:27 2018 +0300
----------------------------------------------------------------------
.../crypt/KeyInSessionSunJceCryptFactory.java | 2 +-
.../wicket/core/util/lang/PropertyResolver.java | 10 ++++-----
.../wicket/core/util/lang/WicketObjects.java | 2 +-
.../AbstractHeaderRenderStrategy.java | 7 +++++--
.../http/ContextParamWebApplicationFactory.java | 22 +++++---------------
.../wicket/protocol/http/WicketFilter.java | 18 ++++------------
.../protocol/http/mock/MockServletContext.java | 9 ++++----
.../core/request/mapper/TestMapperContext.java | 2 +-
.../guice/GuiceWebApplicationFactory.java | 17 +++++----------
.../wicket/util/crypt/ClassCryptFactory.java | 2 +-
.../java/org/apache/wicket/util/diff/Delta.java | 2 +-
11 files changed, 34 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
index ce3037e..eb76cf5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/KeyInSessionSunJceCryptFactory.java
@@ -71,7 +71,7 @@ public class KeyInSessionSunJceCryptFactory implements ICryptFactory
// Initialize and add a security provider required for encryption
final Class<?> clazz = Class.forName("com.sun.crypto.provider.SunJCE");
- final Provider provider = (Provider) clazz.newInstance();
+ final Provider provider = (Provider) clazz.getDeclaredConstructor().newInstance();
Security.addProvider(provider);
}
catch (Exception ex)
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
index 8a5e614..3069de4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/PropertyResolver.java
@@ -710,7 +710,7 @@ public final class PropertyResolver
Object value = null;
try
{
- value = clzComponentType.newInstance();
+ value = clzComponentType.getDeclaredConstructor().newInstance();
Array.set(object, index, value);
}
catch (Exception e)
@@ -900,7 +900,7 @@ public final class PropertyResolver
Object value = null;
try
{
- value = clz.newInstance();
+ value = clz.getDeclaredConstructor().newInstance();
setMethod.invoke(object, index, value);
}
catch (Exception e)
@@ -1091,7 +1091,7 @@ public final class PropertyResolver
Object value = null;
try
{
- value = clz.newInstance();
+ value = clz.getDeclaredConstructor().newInstance();
setMethod.invoke(object, value);
}
catch (Exception e)
@@ -1184,7 +1184,7 @@ public final class PropertyResolver
Object value = null;
try
{
- value = clz.newInstance();
+ value = clz.getDeclaredConstructor().newInstance();
field.set(object, value);
}
catch (Exception e)
@@ -1582,4 +1582,4 @@ public final class PropertyResolver
return method;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java
index f4f3ec0..6cf7067 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java
@@ -341,7 +341,7 @@ public class WicketObjects
try
{
Class<?> c = WicketObjects.resolveClass(className);
- return (T) c.newInstance();
+ return (T) c.getDeclaredConstructor().newInstance();
}
catch (Exception e)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
index 25ab204..571b346 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.renderStrategy;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -68,10 +70,11 @@ public abstract class AbstractHeaderRenderStrategy implements IHeaderRenderStrat
if (clazz != null)
{
- return (IHeaderRenderStrategy)clazz.newInstance();
+ return (IHeaderRenderStrategy)clazz.getDeclaredConstructor().newInstance();
}
}
- catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex)
+ catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+ | NoSuchMethodException | InvocationTargetException ex)
{
// ignore
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
index 82ff3d1..ee04266 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.protocol.http;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.wicket.WicketRuntimeException;
/**
@@ -73,7 +75,7 @@ public class ContextParamWebApplicationFactory implements IWebApplicationFactory
if (WebApplication.class.isAssignableFrom(applicationClass))
{
// Construct WebApplication subclass
- return (WebApplication)applicationClass.newInstance();
+ return (WebApplication)applicationClass.getDeclaredConstructor().newInstance();
}
else
{
@@ -81,22 +83,8 @@ public class ContextParamWebApplicationFactory implements IWebApplicationFactory
" must be a subclass of WebApplication");
}
}
- catch (ClassNotFoundException e)
- {
- throw new WicketRuntimeException("Unable to create application of class " +
- applicationClassName, e);
- }
- catch (InstantiationException e)
- {
- throw new WicketRuntimeException("Unable to create application of class " +
- applicationClassName, e);
- }
- catch (IllegalAccessException e)
- {
- throw new WicketRuntimeException("Unable to create application of class " +
- applicationClassName, e);
- }
- catch (SecurityException e)
+ catch (ClassNotFoundException | InstantiationException | IllegalAccessException | SecurityException
+ | NoSuchMethodException | InvocationTargetException e)
{
throw new WicketRuntimeException("Unable to create application of class " +
applicationClassName, e);
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
index 0b5f5bb..47d54cc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
@@ -17,6 +17,7 @@
package org.apache.wicket.protocol.http;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashSet;
import java.util.Set;
@@ -318,26 +319,15 @@ public class WicketFilter implements Filter
Thread.currentThread().getContextClassLoader());
// Instantiate the factory
- return (IWebApplicationFactory)factoryClass.newInstance();
+ return (IWebApplicationFactory)factoryClass.getDeclaredConstructor().newInstance();
}
catch (ClassCastException e)
{
throw new WicketRuntimeException("Application factory class " +
appFactoryClassName + " must implement IWebApplicationFactory");
}
- catch (ClassNotFoundException e)
- {
- throw new WebApplicationFactoryCreationException(appFactoryClassName, e);
- }
- catch (InstantiationException e)
- {
- throw new WebApplicationFactoryCreationException(appFactoryClassName, e);
- }
- catch (IllegalAccessException e)
- {
- throw new WebApplicationFactoryCreationException(appFactoryClassName, e);
- }
- catch (SecurityException e)
+ catch (ClassNotFoundException | InstantiationException | IllegalAccessException | SecurityException
+ | NoSuchMethodException | InvocationTargetException e)
{
throw new WebApplicationFactoryCreationException(appFactoryClassName, e);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
index ce3bae0..f7b6579 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.MalformedURLException;
@@ -578,9 +579,9 @@ public class MockServletContext implements ServletContext
{
try
{
- return addServlet(servletName, servletClass.newInstance());
+ return addServlet(servletName, servletClass.getDeclaredConstructor().newInstance());
}
- catch (InstantiationException | IllegalAccessException e)
+ catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e)
{
throw new WicketRuntimeException(e);
}
@@ -591,9 +592,9 @@ public class MockServletContext implements ServletContext
{
try
{
- return clazz.newInstance();
+ return clazz.getDeclaredConstructor().newInstance();
}
- catch (InstantiationException | IllegalAccessException e)
+ catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e)
{
throw new WicketRuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
index a1b960d..15518c6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
@@ -184,7 +184,7 @@ public class TestMapperContext implements IMapperContext
try
{
MockPage page;
- page = (MockPage)pageClass.newInstance();
+ page = (MockPage)pageClass.getDeclaredConstructor().newInstance();
page.setPageId(++idCounter);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
index d83b98c..02f12e5 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.guice;
+import java.lang.reflect.InvocationTargetException;
+
import javax.servlet.ServletContext;
import com.google.inject.Guice;
@@ -143,20 +145,11 @@ public class GuiceWebApplicationFactory implements IWebApplicationFactory
{
// see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6500212
Class<?> moduleClazz = Class.forName(moduleName, false, classLoader);
- Object moduleObject = moduleClazz.newInstance();
+ Object moduleObject = moduleClazz.getDeclaredConstructor().newInstance();
modules[i] = (Module)moduleObject;
}
- catch (InstantiationException e)
- {
- throw new RuntimeException(
- "Could not create new instance of Guice Module class " + moduleName, e);
- }
- catch (ClassNotFoundException e)
- {
- throw new RuntimeException(
- "Could not create new instance of Guice Module class " + moduleName, e);
- }
- catch (IllegalAccessException e)
+ catch (InstantiationException | ClassNotFoundException | IllegalAccessException
+ | NoSuchMethodException | InvocationTargetException e)
{
throw new RuntimeException(
"Could not create new instance of Guice Module class " + moduleName, e);
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
index d57d84a..5216c3b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
@@ -62,7 +62,7 @@ public class ClassCryptFactory implements ICryptFactory
{
try
{
- ICrypt crypt = (ICrypt)(cryptClass.get()).newInstance();
+ ICrypt crypt = (ICrypt)(cryptClass.get()).getDeclaredConstructor().newInstance();
log.info("using encryption/decryption object {}", crypt);
crypt.setKey(encryptionKey);
return crypt;
http://git-wip-us.apache.org/repos/asf/wicket/blob/47e7a1c8/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
index 13526b0..a48ff3d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
@@ -115,7 +115,7 @@ public abstract class Delta extends ToString
Delta result;
try
{
- result = (Delta)c.newInstance();
+ result = (Delta)c.getDeclaredConstructor().newInstance();
}
catch (Exception e)
{