move ConfigReaders to static method utilities

Author: jackshirazi

dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/registry/json/JsonPolicyInitConfigReader.java

@@ -19,12 +19,14 @@ public final class JsonPolicyInitConfigReader {
 
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
-  public PolicyInitConfig read(String json) throws IOException {
+  private JsonPolicyInitConfigReader() {}
+
+  public static PolicyInitConfig read(String json) throws IOException {
     Objects.requireNonNull(json, "json cannot be null");
     return read(new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)));
   }
 
-  public PolicyInitConfig read(InputStream in) throws IOException {
+  public static PolicyInitConfig read(InputStream in) throws IOException {
     Objects.requireNonNull(in, "in cannot be null");
     JsonNode root = MAPPER.readTree(in);
     return JsonNodePolicyInitConfigParser.parse(root);

dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/registry/yaml/YamlPolicyInitConfigReader.java

@@ -21,13 +21,15 @@ public final class YamlPolicyInitConfigReader {
 
   private static final ObjectMapper MAPPER = new ObjectMapper(new YAMLFactory());
 
-  public PolicyInitConfig read(InputStream in) throws IOException {
+  private YamlPolicyInitConfigReader() {}
+
+  public static PolicyInitConfig read(InputStream in) throws IOException {
     Objects.requireNonNull(in, "in cannot be null");
     JsonNode root = MAPPER.readTree(in);
     return JsonNodePolicyInitConfigParser.parse(root);
   }
 
-  public PolicyInitConfig read(String yaml) throws IOException {
+  public static PolicyInitConfig read(String yaml) throws IOException {
     Objects.requireNonNull(yaml, "yaml cannot be null");
     return read(new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8)));
   }

dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/registry/json/JsonPolicyInitConfigReaderTest.java

@@ -20,14 +20,12 @@ class JsonPolicyInitConfigReaderTest {
   private static final String EXAMPLE_FIXTURE =
       "/io/opentelemetry/contrib/dynamic/policy/registry/json/policy-init-example.json";
 
-  private final JsonPolicyInitConfigReader reader = new JsonPolicyInitConfigReader();
-
   @Test
   void readsSourceCentricFixture() throws Exception {
     try (InputStream in = getClass().getResourceAsStream(EXAMPLE_FIXTURE)) {
       assertThat(in).isNotNull();
 
-      PolicyInitConfig config = reader.read(in);
+      PolicyInitConfig config = JsonPolicyInitConfigReader.read(in);
       assertThat(config.getSources()).hasSize(1);
 
       PolicySourceConfig source = config.getSources().get(0);
@@ -43,30 +41,30 @@ void readsSourceCentricFixture() throws Exception {
 
   @Test
   void missingSourcesThrows() {
-    assertThatThrownBy(() -> reader.read("{}"))
+    assertThatThrownBy(() -> JsonPolicyInitConfigReader.read("{}"))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("sources");
   }
 
   @Test
   void emptyPayloadThrows() {
-    assertThatThrownBy(() -> reader.read(""))
+    assertThatThrownBy(() -> JsonPolicyInitConfigReader.read(""))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageMatching("(?s).*(empty|sources).*");
   }
 
   @Test
   void missingFormatThrows() {
     String json = "{\"sources\":[{\"kind\":\"opamp\",\"mappings\":[]}]}";
-    assertThatThrownBy(() -> reader.read(json))
+    assertThatThrownBy(() -> JsonPolicyInitConfigReader.read(json))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("format");
   }
 
   @Test
   void missingMappingsThrows() {
     String json = "{\"sources\":[{\"kind\":\"opamp\",\"format\":\"jsonkeyvalue\"}]}";
-    assertThatThrownBy(() -> reader.read(json))
+    assertThatThrownBy(() -> JsonPolicyInitConfigReader.read(json))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("mappings");
   }
@@ -75,7 +73,7 @@ void missingMappingsThrows() {
   void mappingMissingSourceKeyThrows() {
     String json =
         "{\"sources\":[{\"kind\":\"opamp\",\"format\":\"jsonkeyvalue\",\"mappings\":[{\"policyType\":\"x\"}]}]}";
-    assertThatThrownBy(() -> reader.read(json))
+    assertThatThrownBy(() -> JsonPolicyInitConfigReader.read(json))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("sourceKey");
   }

dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/registry/yaml/YamlPolicyInitConfigReaderTest.java

@@ -20,14 +20,12 @@ class YamlPolicyInitConfigReaderTest {
   private static final String EXAMPLE_FIXTURE =
       "/io/opentelemetry/contrib/dynamic/policy/registry/yaml/policy-init-example.yaml";
 
-  private final YamlPolicyInitConfigReader reader = new YamlPolicyInitConfigReader();
-
   @Test
   void readsSourceCentricFixture() throws Exception {
     try (InputStream in = getClass().getResourceAsStream(EXAMPLE_FIXTURE)) {
       assertThat(in).isNotNull();
 
-      PolicyInitConfig config = reader.read(in);
+      PolicyInitConfig config = YamlPolicyInitConfigReader.read(in);
       assertThat(config.getSources()).hasSize(1);
 
       PolicySourceConfig source = config.getSources().get(0);
@@ -43,30 +41,30 @@ void readsSourceCentricFixture() throws Exception {
 
   @Test
   void missingSourcesThrows() {
-    assertThatThrownBy(() -> reader.read("{}"))
+    assertThatThrownBy(() -> YamlPolicyInitConfigReader.read("{}"))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("sources");
   }
 
   @Test
   void emptyPayloadThrows() {
-    assertThatThrownBy(() -> reader.read(""))
+    assertThatThrownBy(() -> YamlPolicyInitConfigReader.read(""))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageMatching("(?s).*(empty|sources).*");
   }
 
   @Test
   void missingFormatThrows() {
     String yaml = "sources:\n  - kind: opamp\n    mappings: []\n";
-    assertThatThrownBy(() -> reader.read(yaml))
+    assertThatThrownBy(() -> YamlPolicyInitConfigReader.read(yaml))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("format");
   }
 
   @Test
   void missingMappingsThrows() {
     String yaml = "sources:\n  - kind: opamp\n    format: jsonkeyvalue\n";
-    assertThatThrownBy(() -> reader.read(yaml))
+    assertThatThrownBy(() -> YamlPolicyInitConfigReader.read(yaml))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("mappings");
   }
@@ -79,7 +77,7 @@ void mappingMissingSourceKeyThrows() {
             + "    format: jsonkeyvalue\n"
             + "    mappings:\n"
             + "      - policyType: x\n";
-    assertThatThrownBy(() -> reader.read(yaml))
+    assertThatThrownBy(() -> YamlPolicyInitConfigReader.read(yaml))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("sourceKey");
   }