Replace newInstance() with getDeclaredConstructor().newInstance() (ap…

…ache#12094) * Replace newInstance() with getDeclaredConstructor().newInstance() * Format code
teaey · Sep 20, 2021 · 69abf98 · 69abf98
1 parent 9975fe4
commit 69abf98
Show file tree

Hide file tree

Showing 29 changed files with 55 additions and 41 deletions.
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java
@@ -71,7 +71,7 @@ static Pair<NarClassLoader, LedgerOffloaderFactory> getOffloaderFactory(String n
             Thread loadingThread = new Thread(() -> {
                 Thread.currentThread().setContextClassLoader(ncl);
                 try {
-                    Object offloader = factoryClass.newInstance();
+                    Object offloader = factoryClass.getDeclaredConstructor().newInstance();
                     if (!(offloader instanceof LedgerOffloaderFactory)) {
                         throw new IOException("Class " + conf.getOffloaderFactoryClass() + " does not implement interface "
                             + LedgerOffloaderFactory.class.getName());

diff --git a/...r-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationService.java b/...r-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationService.java
@@ -55,7 +55,8 @@ public AuthenticationService(ServiceConfiguration conf) throws PulsarServerExcep
                     if (className.isEmpty()) {
                         continue;
                     }
-                    AuthenticationProvider provider = (AuthenticationProvider) Class.forName(className).newInstance();
+                    AuthenticationProvider provider = (AuthenticationProvider) Class.forName(className)
+                            .getDeclaredConstructor().newInstance();
 
                     List<AuthenticationProvider> providerList = providerMap.get(provider.getAuthMethodName());
                     if (null == providerList) {

diff --git a/...ker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationService.java b/...ker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationService.java
@@ -62,7 +62,8 @@ public AuthorizationService(ServiceConfiguration conf, PulsarResources pulsarRes
         try {
             final String providerClassname = conf.getAuthorizationProvider();
             if (StringUtils.isNotBlank(providerClassname)) {
-                provider = (AuthorizationProvider) Class.forName(providerClassname).newInstance();
+                provider = (AuthorizationProvider) Class.forName(providerClassname)
+                        .getDeclaredConstructor().newInstance();
                 provider.initialize(conf, pulsarResources);
                 log.info("{} has been loaded.", providerClassname);
             } else {

diff --git a/...mon/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java b/...mon/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java
@@ -132,7 +132,7 @@ public AdditionalServletWithClassLoader load(
 
         try {
             Class additionalServletClass = ncl.loadClass(def.getAdditionalServletClass());
-            Object additionalServlet = additionalServletClass.newInstance();
+            Object additionalServlet = additionalServletClass.getDeclaredConstructor().newInstance();
             if (!(additionalServlet instanceof AdditionalServlet)) {
                 throw new IOException("Class " + def.getAdditionalServletClass()
                         + " does not implement additional servlet interface");

diff --git a/...ommon/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java b/...ommon/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.Map;
@@ -94,10 +95,11 @@ public static <T extends PulsarConfiguration> T create(Properties properties,
         checkNotNull(properties);
         T configuration = null;
         try {
-            configuration = (T) clazz.newInstance();
+            configuration = (T) clazz.getDeclaredConstructor().newInstance();
             configuration.setProperties(properties);
             update((Map) properties, configuration);
-        } catch (InstantiationException | IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException
+                | NoSuchMethodException | InvocationTargetException e) {
             throw new IllegalArgumentException("Failed to instantiate " + clazz.getName(), e);
         }
         return configuration;
@@ -177,7 +179,8 @@ private static boolean isEmpty(Object obj) {
      */
     public static ServiceConfiguration convertFrom(PulsarConfiguration conf, boolean ignoreNonExistMember) throws RuntimeException {
         try {
-            final ServiceConfiguration convertedConf = ServiceConfiguration.class.newInstance();
+            final ServiceConfiguration convertedConf = ServiceConfiguration.class
+                    .getDeclaredConstructor().newInstance();
             Field[] confFields = conf.getClass().getDeclaredFields();
             Arrays.stream(confFields).forEach(confField -> {
                 try {
@@ -196,9 +199,8 @@ public static ServiceConfiguration convertFrom(PulsarConfiguration conf, boolean
                 }
             });
             return convertedConf;
-        } catch (InstantiationException e) {
-            throw new RuntimeException("Exception caused while converting configuration: " + e.getMessage());
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException
+                | InvocationTargetException | NoSuchMethodException e) {
             throw new RuntimeException("Exception caused while converting configuration: " + e.getMessage());
         }
     }

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -1213,7 +1213,7 @@ public synchronized LedgerOffloader createManagedLedgerOffloader(OffloadPolicies
 
     private SchemaStorage createAndStartSchemaStorage() throws Exception {
         final Class<?> storageClass = Class.forName(config.getSchemaRegistryStorageClassName());
-        Object factoryInstance = storageClass.newInstance();
+        Object factoryInstance = storageClass.getDeclaredConstructor().newInstance();
         Method createMethod = storageClass.getMethod("create", PulsarService.class);
         SchemaStorage schemaStorage = (SchemaStorage) createMethod.invoke(factoryInstance, this);
         schemaStorage.start();

diff --git a/...r-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java b/...r-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java
@@ -30,7 +30,7 @@ public static DelayedDeliveryTrackerFactory loadDelayedDeliveryTrackerFactory(Se
         Class<?> factoryClass;
         try {
             factoryClass = Class.forName(conf.getDelayedDeliveryTrackerFactoryClassName());
-            Object obj = factoryClass.newInstance();
+            Object obj = factoryClass.getDeclaredConstructor().newInstance();
             checkArgument(obj instanceof DelayedDeliveryTrackerFactory,
                     "The factory has to be an instance of " + DelayedDeliveryTrackerFactory.class.getName());
 

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java
@@ -130,7 +130,7 @@ BrokerInterceptorWithClassLoader load(BrokerInterceptorMetadata metadata, String
 
         try {
             Class interceptorClass = ncl.loadClass(def.getInterceptorClass());
-            Object interceptor = interceptorClass.newInstance();
+            Object interceptor = interceptorClass.getDeclaredConstructor().newInstance();
             if (!(interceptor instanceof BrokerInterceptor)) {
                 throw new IOException("Class " + def.getInterceptorClass()
                         + " does not implement broker interceptor interface");

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java
@@ -130,7 +130,7 @@ static LoadManager create(final PulsarService pulsar) {
             final ServiceConfiguration conf = pulsar.getConfiguration();
             final Class<?> loadManagerClass = Class.forName(conf.getLoadManagerClassName());
             // Assume there is a constructor with one argument of PulsarService.
-            final Object loadManagerInstance = loadManagerClass.newInstance();
+            final Object loadManagerInstance = loadManagerClass.getDeclaredConstructor().newInstance();
             if (loadManagerInstance instanceof LoadManager) {
                 final LoadManager casted = (LoadManager) loadManagerInstance;
                 casted.initialize(pulsar);

diff --git a/...roker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/...roker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
@@ -290,7 +290,7 @@ public void accept(Notification t) {
     private LoadSheddingStrategy createLoadSheddingStrategy() {
         try {
             Class<?> loadSheddingClass = Class.forName(conf.getLoadBalancerLoadSheddingStrategy());
-            Object loadSheddingInstance = loadSheddingClass.newInstance();
+            Object loadSheddingInstance = loadSheddingClass.getDeclaredConstructor().newInstance();
             if (loadSheddingInstance instanceof LoadSheddingStrategy) {
                 return (LoadSheddingStrategy) loadSheddingInstance;
             } else {

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java
@@ -130,7 +130,7 @@ static ProtocolHandlerWithClassLoader load(ProtocolHandlerMetadata metadata,
 
         try {
             Class handlerClass = ncl.loadClass(phDef.getHandlerClass());
-            Object handler = handlerClass.newInstance();
+            Object handler = handlerClass.getDeclaredConstructor().newInstance();
             if (!(handler instanceof ProtocolHandler)) {
                 throw new IOException("Class " + phDef.getHandlerClass()
                     + " does not implement protocol handler interface");

diff --git a/...r-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java b/...r-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java
@@ -35,7 +35,8 @@ static Map<SchemaType, SchemaCompatibilityCheck> getCheckers(Set<String> checker
         Map<SchemaType, SchemaCompatibilityCheck> checkers = Maps.newHashMap();
         for (String className : checkerClasses) {
             final Class<?> checkerClass = Class.forName(className);
-            SchemaCompatibilityCheck instance = (SchemaCompatibilityCheck) checkerClass.newInstance();
+            SchemaCompatibilityCheck instance = (SchemaCompatibilityCheck) checkerClass
+                    .getDeclaredConstructor().newInstance();
             checkers.put(instance.getSchemaType(), instance);
         }
         return checkers;

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/ManagedLedgerStorage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/ManagedLedgerStorage.java
@@ -93,7 +93,7 @@ static ManagedLedgerStorage create(ServiceConfiguration conf,
                                        BookKeeperClientFactory bkProvider,
                                        EventLoopGroup eventLoopGroup) throws Exception {
         final Class<?> storageClass = Class.forName(conf.getManagedLedgerStorageClassName());
-        final ManagedLedgerStorage storage = (ManagedLedgerStorage) storageClass.newInstance();
+        final ManagedLedgerStorage storage = (ManagedLedgerStorage) storageClass.getDeclaredConstructor().newInstance();
         storage.initialize(conf, metadataStore, zkClient, bkProvider, eventLoopGroup);
         return storage;
     }

diff --git a/.../src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferProvider.java b/.../src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferProvider.java
@@ -40,7 +40,7 @@ static TransactionBufferProvider newProvider(String providerClassName) throws IO
         Class<?> providerClass;
         try {
             providerClass = Class.forName(providerClassName);
-            Object obj = providerClass.newInstance();
+            Object obj = providerClass.getDeclaredConstructor().newInstance();
             checkArgument(obj instanceof TransactionBufferProvider,
                 "The factory has to be an instance of "
                     + TransactionBufferProvider.class.getName());

diff --git a/...a/org/apache/pulsar/broker/transaction/pendingack/TransactionPendingAckStoreProvider.java b/...a/org/apache/pulsar/broker/transaction/pendingack/TransactionPendingAckStoreProvider.java
@@ -38,7 +38,7 @@ static TransactionPendingAckStoreProvider newProvider(String providerClassName)
         Class<?> providerClass;
         try {
             providerClass = Class.forName(providerClassName);
-            Object obj = providerClass.newInstance();
+            Object obj = providerClass.getDeclaredConstructor().newInstance();
             checkArgument(obj instanceof TransactionPendingAckStoreProvider,
                     "The factory has to be an instance of "
                             + TransactionPendingAckStoreProvider.class.getName());

diff --git a/...r-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java b/...r-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
@@ -630,7 +630,7 @@ private void testAvroFunctionLocalRun(String jarFilePathUrl) throws Exception {
         int totalMsgs = 5;
         Method setBaseValueMethod = avroTestObjectClass.getMethod("setBaseValue", new Class[]{int.class});
         for (int i = 0; i < totalMsgs; i++) {
-            Object avroTestObject = avroTestObjectClass.newInstance();
+            Object avroTestObject = avroTestObjectClass.getDeclaredConstructor().newInstance();
             setBaseValueMethod.invoke(avroTestObject, i);
             producer.newMessage().property(propertyKey, propertyValue)
                     .value(avroTestObject).send();
@@ -672,7 +672,8 @@ private void testAvroFunctionLocalRun(String jarFilePathUrl) throws Exception {
                 .brokerServiceUrl(pulsar.getBrokerServiceUrlTls()).build();
         localRunner.start(false);
 
-        producer.newMessage().property(propertyKey, propertyValue).value(avroTestObjectClass.newInstance()).send();
+        producer.newMessage().property(propertyKey, propertyValue).value(avroTestObjectClass
+                .getDeclaredConstructor().newInstance()).send();
         Message<GenericRecord> msg = consumer.receive(2, TimeUnit.SECONDS);
         Assert.assertNull(msg);
 

diff --git a/...t-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/DefaultImplementation.java b/...t-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/DefaultImplementation.java
@@ -40,7 +40,7 @@ public class DefaultImplementation {
                     LongRunningProcessStatus.Status.class, String.class, MessageId.class);
 
     public static PulsarAdminBuilder newAdminClientBuilder() {
-        return ReflectionUtils.catchExceptions(() -> ADMIN_CLIENT_BUILDER_IMPL.newInstance());
+        return ReflectionUtils.catchExceptions(() -> ADMIN_CLIENT_BUILDER_IMPL.getDeclaredConstructor().newInstance());
     }
 
     public static OffloadProcessStatus newOffloadProcessStatus(LongRunningProcessStatus.Status status, String lastError

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AuthenticationUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AuthenticationUtil.java
@@ -71,7 +71,7 @@ public static final Authentication create(String authPluginClassName, String aut
         try {
             if (isNotBlank(authPluginClassName)) {
                 Class<?> authClass = Class.forName(authPluginClassName);
-                Authentication auth = (Authentication) authClass.newInstance();
+                Authentication auth = (Authentication) authClass.getDeclaredConstructor().newInstance();
                 if (auth instanceof EncodedAuthenticationParameterSupport) {
                     // Parse parameters on plugin side.
                     ((EncodedAuthenticationParameterSupport) auth).configure(authParamsString);
@@ -104,7 +104,7 @@ public static final Authentication create(String authPluginClassName, Map<String
         try {
             if (isNotBlank(authPluginClassName)) {
                 Class<?> authClass = Class.forName(authPluginClassName);
-                Authentication auth = (Authentication) authClass.newInstance();
+                Authentication auth = (Authentication) authClass.getDeclaredConstructor().newInstance();
                 auth.configure(authParams);
                 return auth;
             } else {

diff --git a/...-common/src/main/java/org/apache/pulsar/client/api/url/PulsarURLStreamHandlerFactory.java b/...-common/src/main/java/org/apache/pulsar/client/api/url/PulsarURLStreamHandlerFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.client.api.url;
 
+import java.lang.reflect.InvocationTargetException;
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
 import java.util.HashMap;
@@ -40,13 +41,12 @@ public URLStreamHandler createURLStreamHandler(String protocol) {
         try {
             Class<? extends URLStreamHandler> handler = handlers.get(protocol);
             if (handler != null) {
-                urlStreamHandler = handler.newInstance();
+                urlStreamHandler = handler.getDeclaredConstructor().newInstance();
             } else {
                 urlStreamHandler = null;
             }
-        } catch (InstantiationException e) {
-            urlStreamHandler = null;
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException
+                | InvocationTargetException | NoSuchMethodException e) {
             urlStreamHandler = null;
         }
         return urlStreamHandler;

diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataUtils.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.common.intercept;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
 import java.util.Set;
 import org.apache.pulsar.common.util.ClassLoaderUtils;
@@ -41,8 +42,9 @@ public static Set<BrokerEntryMetadataInterceptor> loadBrokerEntryMetadataInterce
                     Class<BrokerEntryMetadataInterceptor> clz = (Class<BrokerEntryMetadataInterceptor>) ClassLoaderUtils
                             .loadClass(interceptorName, classLoader);
                     try {
-                        interceptors.add(clz.newInstance());
-                    } catch (InstantiationException | IllegalAccessException e) {
+                        interceptors.add(clz.getDeclaredConstructor().newInstance());
+                    } catch (InstantiationException | IllegalAccessException
+                            | InvocationTargetException | NoSuchMethodException e) {
                         log.error("Create new BrokerEntryMetadataInterceptor instance for {} failed.",
                                 interceptorName, e);
                         throw new RuntimeException(e);

diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmMetrics.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmMetrics.java
@@ -71,7 +71,8 @@ public static JvmMetrics create(ScheduledExecutorService executor, String compon
         JvmGCMetricsLogger gcLoggerImpl = null;
         if (StringUtils.isNotBlank(gcLoggerImplClassName)) {
             try {
-                gcLoggerImpl = (JvmGCMetricsLogger) Class.forName(gcLoggerImplClassName).newInstance();
+                gcLoggerImpl = (JvmGCMetricsLogger) Class.forName(gcLoggerImplClassName)
+                        .getDeclaredConstructor().newInstance();
             } catch (Exception e) {
                 log.error("Failed to initialize jvmGCMetricsLogger {} due to {}", jvmGCMetricsLoggerClassName,
                         e.getMessage(), e);

diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java
@@ -118,7 +118,7 @@ public static Provider getProvider() {
     private static Provider loadConscryptProvider() {
         Provider provider;
         try {
-            provider = (Provider) Class.forName(CONSCRYPT_PROVIDER_CLASS).newInstance();
+            provider = (Provider) Class.forName(CONSCRYPT_PROVIDER_CLASS).getDeclaredConstructor().newInstance();
         } catch (ReflectiveOperationException e) {
             log.warn("Unable to get security provider for class {}", CONSCRYPT_PROVIDER_CLASS, e);
             return null;
@@ -179,7 +179,7 @@ public static Provider getBCProviderFromClassPath() throws Exception {
             clazz = Class.forName(BC_FIPS_PROVIDER_CLASS);
         }
 
-        Provider provider = (Provider) clazz.newInstance();
+        Provider provider = (Provider) clazz.getDeclaredConstructor().newInstance();
         Security.addProvider(provider);
         if (log.isDebugEnabled()) {
             log.debug("Found and Instantiated Bouncy Castle provider in classpath {}", provider.getName());

diff --git a/...config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidation.java b/...config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidation.java
@@ -95,7 +95,7 @@ private static void processAnnotations(Annotation[] annotations, String fieldNam
                     if (hasConstructor(clazz, Map.class)) {
                         o = clazz.getConstructor(Map.class).newInstance(params);
                     } else { //If not call default constructor
-                        o = clazz.newInstance();
+                        o = clazz.getDeclaredConstructor().newInstance();
                     }
                     o.validateField(fieldName, value);
                 }

diff --git a/.../worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java b/.../worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java
@@ -85,7 +85,7 @@ static WorkerServiceWithClassLoader load(WorkerServiceMetadata metadata,
 
         try {
             Class handlerClass = ncl.loadClass(phDef.getHandlerClass());
-            Object handler = handlerClass.newInstance();
+            Object handler = handlerClass.getDeclaredConstructor().newInstance();
             if (!(handler instanceof WorkerService)) {
                 throw new IOException("Class " + phDef.getHandlerClass()
                     + " does not implement worker service interface");

diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/node/Application.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/node/Application.java
@@ -217,7 +217,7 @@ private void loadMonitoring() {
                     //Not a known type, use FQCN
                     klass = (Class<? extends MonitorService>) Class.forName(monitorType);
                 }
-                this.monitorServer = klass.newInstance();
+                this.monitorServer = klass.getDeclaredConstructor().newInstance();
                 Context context = new Context();
                 for (String key : keys) {
                     if (key.startsWith(CONF_MONITOR_PREFIX)) {