GH-00 : Minor refactoring and fix typo in test package name (#4)

Co-authored-by: Prashanth Ramakrishnan <[email protected]>
R-CUBE · Dec 13, 2023 · 5efa965 · 5efa965
1 parent adc8a87
commit 5efa965
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/src/main/java/com/rcube/configmap/operator/ConfigMapController.java b/src/main/java/com/rcube/configmap/operator/ConfigMapController.java
@@ -32,7 +32,10 @@ public class ConfigMapController implements Reconciler<ConfigMapCustomResource>,
     @Override
     public UpdateControl<ConfigMapCustomResource> reconcile(final ConfigMapCustomResource resource, final Context<ConfigMapCustomResource> context) {
         try {
-            log.info("Context being reloaded for [{}]",context.getSecondaryResource(ConfigMap.class).map(map -> map.getMetadata().getName()).orElse("None"));
+            val reloadedResource = context.getSecondaryResource(ConfigMap.class)
+                    .map(map -> map.getMetadata().getName())
+                    .orElse("None");
+            log.info("Context being reloaded for [{}]", reloadedResource);
             specValidator.validateResourceContent(resource);
             createConfigMap(resource);
             resource.setStatus(ResourceStatus.builder().build());
@@ -73,7 +76,7 @@ private ConfigMap buildConfigMap(final ConfigMapCustomResource resource) {
 
     @Override
     public Map<String, EventSource> prepareEventSources(final EventSourceContext<ConfigMapCustomResource> context) {
-        InformerConfiguration<ConfigMap> configuration =
+        final InformerConfiguration<ConfigMap> configuration =
                 InformerConfiguration.from(ConfigMap.class, context)
                         .build();
         return EventSourceInitializer

diff --git a/src/main/java/com/rcube/configmap/validators/SpecValidator.java b/src/main/java/com/rcube/configmap/validators/SpecValidator.java
@@ -3,16 +3,16 @@
 import com.networknt.schema.ValidationMessage;
 import com.rcube.configmap.operator.ConfigMapCustomResource;
 import com.rcube.configmap.operator.ResourceStatus;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 @Component
 @Slf4j
 @AllArgsConstructor
@@ -24,7 +24,7 @@ public void validateResourceContent(final ConfigMapCustomResource resource) {
             final Map<String, String> schemaResource = resource.getSpec().getConfig().getSchema();
 
             if (schemaResource == null || CollectionUtils.isEmpty(schemaResource)) {
-                log.warn("Resource [{}] doesnt have a schema, it is recommended to have one", resource.getMetadata().getName());
+                log.warn("Resource [{}] does not have a schema, it is recommended to have one", resource.getMetadata().getName());
                 return;
             }
 
@@ -33,15 +33,7 @@ public void validateResourceContent(final ConfigMapCustomResource resource) {
             if (CollectionUtils.isEmpty(dataResource)) {
                 throw new RuntimeException("Missing required fields in the data configuration.");
             }
-            final Map<String, Set<ValidationMessage>> schemaValidationResult = new HashMap<>();
-            dataResource.forEach((key, data) -> {
-                if (schemaResource.containsKey(key)) {
-                    final Set<ValidationMessage> validation = jsonContentValidators.validate(schemaResource.get(key), data);
-                    if (!CollectionUtils.isEmpty(validation)) {
-                        schemaValidationResult.put(key, validation);
-                    }
-                }
-            });
+            final Map<String, Set<ValidationMessage>> schemaValidationResult = getValidationFailures(dataResource, schemaResource);
             if (!CollectionUtils.isEmpty(schemaValidationResult)) {
                 throw new RuntimeException(String.format("Invalid data format %s", schemaValidationResult));
             }
@@ -51,4 +43,19 @@ public void validateResourceContent(final ConfigMapCustomResource resource) {
             throw ex;
         }
     }
+
+    @NotNull
+    private Map<String, Set<ValidationMessage>> getValidationFailures(final Map<String, String> dataResource,
+                                                                      final Map<String, String> schemaResource) {
+        final Map<String, Set<ValidationMessage>> schemaValidationResult = new HashMap<>();
+        dataResource.forEach((key, data) -> {
+            if (schemaResource.containsKey(key)) {
+                final Set<ValidationMessage> validation = jsonContentValidators.validate(schemaResource.get(key), data);
+                if (!CollectionUtils.isEmpty(validation)) {
+                    schemaValidationResult.put(key, validation);
+                }
+            }
+        });
+        return schemaValidationResult;
+    }
 }
diff --git a/.../conifgvalidator/ConfigValidatorTest.java → .../configvalidator/ConfigValidatorTest.java b/.../conifgvalidator/ConfigValidatorTest.java → .../configvalidator/ConfigValidatorTest.java
@@ -1,4 +1,4 @@
-package com.rcube.configmap.conifgvalidator;
+package com.rcube.configmap.configvalidator;
 
 import com.rcube.configmap.TestDataUtil;
 import com.rcube.configmap.operator.ConfigMapCustomResource;