Merge branch 'main' of github.com:microsoft/gctoolkit

microsoft · Apr 20, 2022 · c478a62 · c478a62
2 parents 99f423c + 5d7646d
commit c478a62
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/IT/pom.xml b/IT/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.gctoolkit</groupId>
         <artifactId>gctoolkit</artifactId>
-        <version>2.0.9-SNAPSHOT</version>
+        <version>2.0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.microsoft.gctoolkit</groupId>
             <artifactId>gctoolkit-sample</artifactId>
-            <version>2.0.9-SNAPSHOT</version>
+            <version>2.0.10-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.gctoolkit</groupId>
         <artifactId>gctoolkit</artifactId>
-        <version>2.0.9-SNAPSHOT</version>
+        <version>2.0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/gclogs/pom.xml b/gclogs/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.microsoft.gctoolkit</groupId>
         <artifactId>gctoolkit</artifactId>
-        <version>2.0.9-SNAPSHOT</version>
+        <version>2.0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/parser/pom.xml b/parser/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.gctoolkit</groupId>
         <artifactId>gctoolkit</artifactId>
-        <version>2.0.9-SNAPSHOT</version>
+        <version>2.0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.microsoft.gctoolkit</groupId>
     <artifactId>gctoolkit</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.9-SNAPSHOT</version>
+    <version>2.0.10-SNAPSHOT</version>
 
     <name>GCToolKit</name>
     <description>GC log parsing utilities</description>

diff --git a/sample/pom.xml b/sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.gctoolkit</groupId>
         <artifactId>gctoolkit</artifactId>
-        <version>2.0.9-SNAPSHOT</version>
+        <version>2.0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/vertx/pom.xml b/vertx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.gctoolkit</groupId>
         <artifactId>gctoolkit</artifactId>
-        <version>2.0.9-SNAPSHOT</version>
+        <version>2.0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/vertx/src/main/java/com/microsoft/gctoolkit/vertx/jvm/GCToolkitVertxParameters.java b/vertx/src/main/java/com/microsoft/gctoolkit/vertx/jvm/GCToolkitVertxParameters.java
@@ -15,6 +15,7 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
 
 /* package-scope */ abstract class GCToolkitVertxParameters {
 
@@ -75,12 +76,15 @@ private static Aggregator<?> createAggregator(
             Class<? extends Aggregator<?>> aggregatorClass,
             Class<? extends Aggregation> aggregationClass) {
         try {
-            Constructor<?>[] constructors = aggregatorClass.getConstructors();
-            if (constructors.length == 0) {
-                LOGGER.log(Level.WARNING, aggregatorClass + " must have a public constructor which takes a " + Aggregation.class);
-                return null;
-            }
-            return (Aggregator<?>) aggregatorClass.getConstructors()[0].newInstance(aggregationClass.getConstructors()[0].newInstance());
+            Constructor<?>[] aggregatorCtors = aggregatorClass.getConstructors();
+            Constructor<?> aggregatorCtor = Stream.of(aggregatorCtors)
+                    .filter(ctor -> ctor.getParameterTypes().length == 1)
+                    .filter(ctor -> ctor.getParameterTypes()[0].isAssignableFrom(aggregationClass))
+                    .findFirst()
+                    .orElseThrow(() -> new NoSuchMethodException(aggregatorClass + " must have a public constructor which takes a " + Aggregation.class));
+            Constructor<? extends Aggregation> aggregationCtor = aggregationClass.getConstructor();
+            Aggregation aggregation = aggregationCtor.newInstance();
+            return (Aggregator<?>)aggregatorCtor.newInstance(aggregation);
         } catch (ReflectiveOperationException e) {
             LOGGER.log(Level.WARNING, e + ": Cannot construct instance of " + aggregatorClass);
         }