cleanup

Author: jaydeluca

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/InstrumentationMetadata.java

@@ -5,9 +5,10 @@
 
 package io.opentelemetry.instrumentation.docs.internal;
 
+import static java.util.Collections.emptyList;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nonnull;
@@ -34,10 +35,10 @@ public class InstrumentationMetadata {
   @Nullable
   private String displayName;
 
-  private List<ConfigurationOption> configurations = Collections.emptyList();
+  private List<ConfigurationOption> configurations = emptyList();
 
   public InstrumentationMetadata() {
-    this.classification = InstrumentationClassification.LIBRARY.toString();
+    this.classification = InstrumentationClassification.LIBRARY.name();
   }
 
   public InstrumentationMetadata(
@@ -52,7 +53,7 @@ public InstrumentationMetadata(
     this.description = description;
     this.libraryLink = libraryLink;
     this.displayName = displayName;
-    this.configurations = Objects.requireNonNullElse(configurations, Collections.emptyList());
+    this.configurations = Objects.requireNonNullElse(configurations, emptyList());
   }
 
   @Nullable
@@ -97,7 +98,7 @@ public List<ConfigurationOption> getConfigurations() {
   }
 
   public void setConfigurations(@Nullable List<ConfigurationOption> configurations) {
-    this.configurations = Objects.requireNonNullElse(configurations, Collections.emptyList());
+    this.configurations = Objects.requireNonNullElse(configurations, emptyList());
   }
 
   @Nullable
@@ -120,7 +121,7 @@ public static class Builder {
     @Nullable private String classification;
     @Nullable private String libraryLink;
     @Nullable private String displayName;
-    private List<ConfigurationOption> configurations = Collections.emptyList();
+    private List<ConfigurationOption> configurations = emptyList();
 
     @CanIgnoreReturnValue
     public Builder description(@Nullable String description) {
@@ -154,17 +155,15 @@ public Builder displayName(@Nullable String displayName) {
 
     @CanIgnoreReturnValue
     public Builder configurations(@Nullable List<ConfigurationOption> configurations) {
-      this.configurations = Objects.requireNonNullElse(configurations, Collections.emptyList());
+      this.configurations = Objects.requireNonNullElse(configurations, emptyList());
       return this;
     }
 
     public InstrumentationMetadata build() {
       return new InstrumentationMetadata(
           description,
           disabledByDefault,
-          classification != null
-              ? classification
-              : InstrumentationClassification.LIBRARY.toString(),
+          classification != null ? classification : InstrumentationClassification.LIBRARY.name(),
           libraryLink,
           displayName,
           configurations);

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/utils/YamlHelperTest.java

@@ -42,7 +42,7 @@ void testPrintInstrumentationList() throws Exception {
         new InstrumentationMetadata.Builder()
             .description("Spring Web 6.0 instrumentation")
             .displayName("Spring Web")
-            .classification(InstrumentationClassification.LIBRARY.toString())
+            .classification(InstrumentationClassification.LIBRARY.name())
             .disabledByDefault(true)
             .build();
 
@@ -114,7 +114,7 @@ void testGenerateInstrumentationYamlSeparatesClassifications() throws Exception
     InstrumentationMetadata springMetadata =
         new InstrumentationMetadata.Builder()
             .description("Spring Web 6.0 instrumentation")
-            .classification(InstrumentationClassification.LIBRARY.toString())
+            .classification(InstrumentationClassification.LIBRARY.name())
             .disabledByDefault(false)
             .configurations(
                 List.of(
@@ -138,7 +138,7 @@ void testGenerateInstrumentationYamlSeparatesClassifications() throws Exception
 
     InstrumentationMetadata internalMetadata =
         new InstrumentationMetadata.Builder()
-            .classification(InstrumentationClassification.INTERNAL.toString())
+            .classification(InstrumentationClassification.INTERNAL.name())
             .build();
 
     modules.add(
@@ -153,7 +153,7 @@ void testGenerateInstrumentationYamlSeparatesClassifications() throws Exception
 
     InstrumentationMetadata customMetadata =
         new InstrumentationMetadata.Builder()
-            .classification(InstrumentationClassification.CUSTOM.toString())
+            .classification(InstrumentationClassification.CUSTOM.name())
             .build();
 
     Map<InstrumentationType, Set<String>> externalAnnotationsVersions =
@@ -516,7 +516,7 @@ void testYamlGenerationWithLibraryLink() throws Exception {
     InstrumentationMetadata metadataWithLink =
         new InstrumentationMetadata.Builder()
             .description("Test library instrumentation with link")
-            .classification(InstrumentationClassification.LIBRARY.toString())
+            .classification(InstrumentationClassification.LIBRARY.name())
             .disabledByDefault(false)
             .libraryLink("https://example.com/test-library-docs")
             .build();
@@ -534,7 +534,7 @@ void testYamlGenerationWithLibraryLink() throws Exception {
     InstrumentationMetadata metadataWithoutLink =
         new InstrumentationMetadata.Builder()
             .description("Test library instrumentation without link")
-            .classification(InstrumentationClassification.LIBRARY.toString())
+            .classification(InstrumentationClassification.LIBRARY.name())
             .disabledByDefault(false)
             .build();