From 8a6441d67deaa5921300b58fca7da585518e39eb Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sat, 26 Nov 2022 14:22:55 +0100
Subject: Cleanup after we no longer use commons-collections

---
 container-dev/pom.xml    | 15 ---------------
 docprocs/pom.xml         |  4 ----
 vespaclient-java/pom.xml |  6 ------
 3 files changed, 25 deletions(-)

diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 85c6371d59c..67ec599af9d 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -187,10 +187,6 @@
           <groupId>com.ibm.icu</groupId>
           <artifactId>icu4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>commons-lang</groupId>
           <artifactId>commons-lang</artifactId>
@@ -242,17 +238,6 @@
     <!-- NOTE: Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container,
          and hence make them invisible to user projects' build classpath.
          Excluded artifacts should be added explicitly to the application module to make then visible in users' test classpath. -->
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>document</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>linguistics</artifactId>
diff --git a/docprocs/pom.xml b/docprocs/pom.xml
index e001d83a00f..6d654deea44 100644
--- a/docprocs/pom.xml
+++ b/docprocs/pom.xml
@@ -57,10 +57,6 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>annotations</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
       </exclusions>
       <!-- End Workaround -->
 
diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml
index 3e5e7ca8025..230ddc5c7d3 100644
--- a/vespaclient-java/pom.xml
+++ b/vespaclient-java/pom.xml
@@ -45,12 +45,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <!-- Added explicitly to get commons-collections, which is excluded from container-dev -->
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>document</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>documentapi</artifactId>
-- 
cgit v1.2.3


From a7362569f24ec81f053667c454cb2402661d7bfe Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sat, 26 Nov 2022 16:45:55 +0100
Subject: commons-lang no longer used either

---
 container-dev/pom.xml |  8 --------
 tenant-base/pom.xml   | 18 +++++-------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 67ec599af9d..6847668404b 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -83,10 +83,6 @@
       <artifactId>container-disc</artifactId>
       <version>${project.version}</version>
       <exclusions>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
@@ -187,10 +183,6 @@
           <groupId>com.ibm.icu</groupId>
           <artifactId>icu4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.antlr</groupId>
           <artifactId>antlr4-runtime</artifactId>
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml
index b50f14558d6..cf7898f6951 100644
--- a/tenant-base/pom.xml
+++ b/tenant-base/pom.xml
@@ -84,15 +84,11 @@
             <version>${vespaversion}</version>
             <scope>test</scope>
 	    <exclusions>
-		    <exclusion>
-			    <groupId>org.apache.commons</groupId>
-			    <artifactId>commons-exec</artifactId>
-		    </exclusion>
-		    <exclusion>
-			    <groupId>commons-lang</groupId>
-			    <artifactId>commons-lang</artifactId>
-		    </exclusion>
-	    </exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-exec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -115,10 +111,6 @@
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-exec</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-lang</groupId>
-                    <artifactId>commons-lang</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-- 
cgit v1.2.3


From 37ca3594cac5c18c17157a77d8adbcd460ed1a10 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sat, 26 Nov 2022 17:19:34 +0100
Subject: Minor cleanup

---
 .../vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java   | 3 +--
 .../src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java       | 1 -
 .../src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java    | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index f7d9c2f4a0d..93b67407933 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -226,8 +226,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
     private Optional<Admin> getAdmin() {
         if (parent != null) {
             AbstractConfigProducerRoot r = parent.getRoot();
-            if (r instanceof VespaModel) {
-                VespaModel model = (VespaModel) r;
+            if (r instanceof VespaModel model) {
                 return Optional.ofNullable(model.getAdmin());
             }
         }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
index f9ecaa29153..67c888a8d77 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static ai.vespa.metricsproxy.metric.ExternalMetrics.extractConfigserverDimensions;
-import static ai.vespa.metricsproxy.metric.model.processing.MetricsProcessor.applyProcessors;
 import static java.util.logging.Level.FINE;
 import static java.util.stream.Collectors.toList;
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
index def61006f15..0c25f31f266 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
@@ -62,7 +62,7 @@ public class ExternalMetrics {
 
     private Set<MetricId> metricsToRetain() {
         return consumers.getConsumersByMetric().keySet().stream()
-                .map(configuredMetric -> configuredMetric.id())
+                .map(ConfiguredMetric::id)
                 .collect(toCollection(LinkedHashSet::new));
     }
 
-- 
cgit v1.2.3