Upgrade POM and update changelog

grookage · Sep 16, 2024 · ca32b81 · ca32b81
1 parent d7e0515
commit ca32b81
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.0.1-RC3]
+- Simplified NamespaceDataSource to use a supplier instead of hierarchy for static and dynamic source
+- LeiaBundle: Fixed duplicate instantiation of schema repository
+- TimeBasedDataProvider: Fixed the initial delay of executor to prevent multiple invocation of update on startup
+- Schema Validator: Removed instance creation of schema class. It's not required for static validations.
+- SchemaValidationUtils - Fixed strict type validation
+
 ## [0.0.1-RC2]
 - Added tests to the core functionality to schemaValidator, refresher, client, core and models
 - Fixed the validation bug in SchemaValidationUtils. field.getType().isInstanceOf is a miss, Class.isAssignable is the correct way to check for class assignments.

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ And
 <dependency>
     <groupId>com.grookage.leia</groupId>
     <artifactId>leia-bom</artifactId>
-    <versio>0.0.1-RC2</version>
+    <versio>0.0.1-RC3</version>
 </dependency>
 ```
 

diff --git a/leia-bom/pom.xml b/leia-bom/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
     </parent>
 
     <artifactId>leia-bom</artifactId>

diff --git a/leia-client-dropwizard/pom.xml b/leia-client-dropwizard/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-client/pom.xml b/leia-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-client/src/test/java/com/grookage/leia/client/datasource/NamespaceDataSourceTest.java b/leia-client/src/test/java/com/grookage/leia/client/datasource/NamespaceDataSourceTest.java
@@ -27,32 +27,26 @@ class NamespaceDataSourceTest {
 
     @Test
     void testNamespaceDataSource() {
-        final var staticSource = new StaticNamespaceDataSource(Set.of("testNamespace"));
-        Assertions.assertNotNull(staticSource);
-        Assertions.assertNotNull(staticSource.getNamespaces());
-        Assertions.assertFalse(staticSource.getNamespaces().isEmpty());
         final var supplier = new Supplier<Set<String>>() {
 
             private static final AtomicReference<Boolean> supplierMarker = new AtomicReference<>(false);
 
             @Override
             public Set<String> get() {
                 return supplierMarker.get() ?
-                        Set.of("testNamespace") : Set.of();
+                       Set.of("testNamespace") : Set.of();
             }
 
             public void mark() {
                 supplierMarker.set(true);
             }
         };
-        final var suppliedSource = new DynamicNamespaceDataSource(supplier);
+        final var suppliedSource = new NamespaceDataSource(supplier);
         Assertions.assertNotNull(suppliedSource.getNamespaces());
         Assertions.assertTrue(suppliedSource.getNamespaces().isEmpty());
 
         supplier.mark();
         Assertions.assertNotNull(suppliedSource.getNamespaces());
         Assertions.assertFalse(suppliedSource.getNamespaces().isEmpty());
-
-
     }
 }
diff --git a/leia-core/pom.xml b/leia-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-dropwizard-es/pom.xml b/leia-dropwizard-es/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-dropwizard/pom.xml b/leia-dropwizard/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-elastic/pom.xml b/leia-elastic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-models/pom.xml b/leia-models/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-parent/pom.xml b/leia-parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-bom</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-bom</relativePath>
     </parent>
 

diff --git a/leia-refresher/pom.xml b/leia-refresher/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-refresher/src/main/java/com/grookage/leia/provider/TimeBasedDataProvider.java b/leia-refresher/src/main/java/com/grookage/leia/provider/TimeBasedDataProvider.java
@@ -63,7 +63,8 @@ public TimeBasedDataProvider(Supplier<T> configSupplier, T initialDefaultValue,
     }
 
     public void start() {
-        this.executorService.scheduleWithFixedDelay(this.updater, 0L, this.delay, this.timeUnit);
+        this.executorService.scheduleWithFixedDelay(this.updater, this.delay, this.delay, this.timeUnit);
+        this.update();
     }
 
     public void stop() {

diff --git a/leia-repository/pom.xml b/leia-repository/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/leia-schema-validator/pom.xml b/leia-schema-validator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.grookage.leia</groupId>
         <artifactId>leia-parent</artifactId>
-        <version>0.0.1-RC2</version>
+        <version>0.0.1-RC3</version>
         <relativePath>../leia-parent</relativePath>
     </parent>
 

diff --git a/...hema-validator/src/main/java/com/grookage/leia/validator/utils/SchemaValidationUtils.java b/...hema-validator/src/main/java/com/grookage/leia/validator/utils/SchemaValidationUtils.java
@@ -16,6 +16,7 @@
 
 package com.grookage.leia.validator.utils;
 
+import com.google.common.collect.Sets;
 import com.grookage.leia.models.attributes.*;
 import com.grookage.leia.models.schema.SchemaDetails;
 import com.grookage.leia.models.schema.SchemaValidationType;
@@ -34,19 +35,29 @@ public static boolean valid(final SchemaDetails schemaDetails,
                                 final Class<?> klass) {
         final var fields = getAllFields(klass);
         final var validationType = schemaDetails.getValidationType();
-        final var attributedNotListed = fields.stream().filter(each -> !schemaDetails.hasAttribute(each.getName()))
-                .collect(Collectors.toSet());
-        if (!attributedNotListed.isEmpty() &&
-                validationType == SchemaValidationType.STRICT) {
-            log.error("There seems to be attributes present in the class definition that are not in the schema. " +
-                            "[Validation Failed]. The extra attributes are {}",
-                    attributedNotListed);
-            return false;
-        }
+        if (validationType == SchemaValidationType.STRICT && !strictlyMatching(schemaDetails, fields)) return false;
         return schemaDetails.getAttributes().stream().allMatch(each ->
                 valid(each, fields));
     }
 
+    private static boolean strictlyMatching(SchemaDetails schemaDetails, List<Field> fields) {
+        final var fieldNames = fields.stream()
+                .map(Field::getName)
+                .map(String::toUpperCase)
+                .collect(Collectors.toSet());
+        final var attributesListed = schemaDetails.getAttributes().stream()
+                .map(SchemaAttribute::getName)
+                .map(String::toUpperCase)
+                .collect(Collectors.toSet());
+        final var mismatchedAttributes = Sets.symmetricDifference(fieldNames, attributesListed);
+        if (mismatchedAttributes.isEmpty()) {
+            return true;
+        }
+        log.error("There seems to be a mismatch in the attributes present in the class definition and schema. " +
+                "[Validation Failed]. The attributes are {}", mismatchedAttributes);
+        return false;
+    }
+
     private static List<Field> getAllFields(Class<?> type) {
         List<Field> fields = new ArrayList<>();
         for (Class<?> c = type; c != null; c = c.getSuperclass()) {

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.grookage.leia</groupId>
     <artifactId>leia</artifactId>
-    <version>0.0.1-RC2</version>
+    <version>0.0.1-RC3</version>
     <packaging>pom</packaging>
 
     <name>Leia</name>