Browse Source

ZOOKEEPER-2914: compiler warning using java 9

Replaced deprecated methods (Class.newInstance()) and removed redundant cast

Author: Andor Molnar <andor@cloudera.com>

Reviewers: Patrick Hunt <phunt@apache.org>

Closes #392 from dolphy17/ZOOKEEPER-2914 and squashes the following commits:

ab7bd5e2 [Andor Molnar] Reverted explicit case, because java 1.7 requires it to compile
b2d400bc [Andor Molnar] Replaced Class.newInstance() methods (deprecated in Java 9) with Constructor.newInstance()

Change-Id: Iae00f0874b69d425f35b96775d6ac9634b3ade73
Andor Molnar 7 years ago
parent
commit
fb10c2b546

+ 1 - 1
src/java/main/org/apache/zookeeper/jmx/ManagedUtil.java

@@ -69,7 +69,7 @@ public class ManagedUtil {
             try {
                 // Create and Register the top level Log4J MBean
                 // org.apache.log4j.jmx.HierarchyDynamicMBean hdm = new org.apache.log4j.jmx.HierarchyDynamicMBean();
-                Object hdm = Class.forName("org.apache.log4j.jmx.HierarchyDynamicMBean").newInstance();
+                Object hdm = Class.forName("org.apache.log4j.jmx.HierarchyDynamicMBean").getDeclaredConstructor().newInstance();
 
                 ObjectName mbo = new ObjectName("log4j:hiearchy=default");
                 mbs.registerMBean(hdm, mbo);

+ 1 - 1
src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -252,7 +252,7 @@ public class NIOServerCnxn extends ServerCnxn {
                      * so we've got to slice the buffer if it's too big.
                      */
                     b = (ByteBuffer) b.slice().limit(
-                        directBuffer.remaining());
+                            directBuffer.remaining());
                 }
                 /*
                  * put() is going to modify the positions of both

+ 2 - 1
src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java

@@ -130,7 +130,8 @@ public abstract class ServerCnxnFactory {
             serverCnxnFactoryName = NIOServerCnxnFactory.class.getName();
         }
         try {
-            ServerCnxnFactory serverCnxnFactory = (ServerCnxnFactory) Class.forName(serverCnxnFactoryName).newInstance();
+            ServerCnxnFactory serverCnxnFactory = (ServerCnxnFactory) Class.forName(serverCnxnFactoryName)
+                    .getDeclaredConstructor().newInstance();
             LOG.info("Using {} as server connection factory", serverCnxnFactoryName);
             return serverCnxnFactory;
         } catch (Exception e) {

+ 1 - 1
src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java

@@ -58,7 +58,7 @@ public class ProviderRegistry {
                     try {
                         Class<?> c = ZooKeeperServer.class.getClassLoader()
                                 .loadClass(className);
-                        AuthenticationProvider ap = (AuthenticationProvider) c
+                        AuthenticationProvider ap = (AuthenticationProvider) c.getDeclaredConstructor()
                                 .newInstance();
                         authenticationProviders.put(ap.getScheme(), ap);
                     } catch (Exception e) {