[PIE-2023] Fixed casing of dynamic MetricCategorys

besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java

@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.common.annotations.VisibleForTesting;
 import picocli.CommandLine;
 
 public class MetricCategoryConverter implements CommandLine.ITypeConverter<MetricCategory> {
@@ -41,6 +42,11 @@ public <T extends Enum<T> & MetricCategory> void addCategories(final Class<T> ca
   }
 
   public void addRegistryCategory(final MetricCategory metricCategory) {
-    metricCategories.put(metricCategory.getName(), metricCategory);
+    metricCategories.put(metricCategory.getName().toUpperCase(), metricCategory);
+  }
+
+  @VisibleForTesting
+  Map<String, MetricCategory> getMetricCategories() {
+    return metricCategories;
   }
 }

besu/src/test/java/org/hyperledger/besu/cli/converter/MetricCategoryConverterTest.java

@@ -0,0 +1,44 @@
+package org.hyperledger.besu.cli.converter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MetricCategoryConverterTest {
+
+  private MetricCategoryConverter metricCategoryConverter;
+
+  @Mock MetricCategory metricCategory;
+
+  @Before
+  public void setUp() {
+    metricCategoryConverter = new MetricCategoryConverter();
+  }
+
+  @Test
+  public void convertShouldFailIfValueNotRegistered() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> metricCategoryConverter.convert("notRegistered"));
+  }
+
+  @Test
+  public void addRegistryCategoryShouldUppercaseInputValues() {
+    when(metricCategory.getName()).thenReturn("testcat");
+    metricCategoryConverter.addRegistryCategory(metricCategory);
+    when(metricCategory.getName()).thenReturn("tesTCat2");
+    metricCategoryConverter.addRegistryCategory(metricCategory);
+    boolean containsLowercase =
+        metricCategoryConverter.getMetricCategories().keySet().stream()
+            .anyMatch(testString -> testString.chars().anyMatch(Character::isLowerCase));
+    assertThat(containsLowercase).isFalse();
+  }
+}

build.gradle

@@ -276,8 +276,8 @@ task checkMavenCoordianteCollisions {
         def coordinate = it.publishing?.publications[0].coordinates
         if (coordinates.containsKey(coordinate)) {
           throw new GradleException("Duplicate maven coordinates detected, ${coordinate} is used by " +
-              "both ${coordinates[coordinate]} and ${it.path}.\n" +
-              "Please add a `publishing` script block to one or both subprojects.")
+          "both ${coordinates[coordinate]} and ${it.path}.\n" +
+          "Please add a `publishing` script block to one or both subprojects.")
         }
         coordinates[coordinate] = it.path
       }