Add support for nested attributes, bug fixes and refactoring

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.

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>
 ```
 

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>

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>
 

leia-client-dropwizard/src/main/java/com/grookage/leia/dw/client/LeiaClientBundle.java

@@ -17,13 +17,12 @@
 package com.grookage.leia.dw.client;
 
 import com.google.common.base.Preconditions;
-import com.google.inject.Injector;
 import com.grookage.leia.client.LeiaMessageProduceClient;
 import com.grookage.leia.client.datasource.NamespaceDataSource;
 import com.grookage.leia.client.refresher.LeiaClientRefresher;
 import com.grookage.leia.client.refresher.LeiaClientSupplier;
 import com.grookage.leia.provider.config.LeiaHttpConfiguration;
-import com.grookage.leia.validator.InjectableSchemaValidator;
+import com.grookage.leia.validator.StaticSchemaValidator;
 import com.grookage.leia.validator.LeiaSchemaValidator;
 import io.dropwizard.Configuration;
 import io.dropwizard.ConfiguredBundle;
@@ -47,15 +46,11 @@ public abstract class LeiaClientBundle<T extends Configuration> implements Confi
 
     protected abstract Set<String> getPackageRoots(T configuration);
 
-    protected abstract Injector getInjector(Environment environment);
-
     protected LeiaSchemaValidator getSchemaValidator(T configuration,
-                                                     Environment environment,
                                                      LeiaClientRefresher clientRefresher) {
-        return InjectableSchemaValidator.builder()
+        return StaticSchemaValidator.builder()
                 .supplier(clientRefresher::getConfiguration)
                 .packageRoots(getPackageRoots(configuration))
-                .injector(getInjector(environment))
                 .build();
     }
 
@@ -76,7 +71,7 @@ public void run(T configuration, Environment environment) {
                         .build())
                 .configRefreshTimeSeconds(configRefreshSeconds)
                 .build();
-        final var validator = getSchemaValidator(configuration, environment, clientRefresher);
+        final var validator = getSchemaValidator(configuration, clientRefresher);
         validator.start();
         if (withProducerClient) {
             producerClient = LeiaMessageProduceClient.builder()

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>
 

leia-client/src/main/java/com/grookage/leia/client/datasource/NamespaceDataSource.java

@@ -16,10 +16,17 @@
 
 package com.grookage.leia.client.datasource;
 
+import lombok.AllArgsConstructor;
+
 import java.util.Set;
+import java.util.function.Supplier;
 
-public interface NamespaceDataSource {
+@AllArgsConstructor
+public class NamespaceDataSource {
 
-    Set<String> getNamespaces();
+    private final Supplier<Set<String>> namespaceSupplier;
 
+    public Set<String> getNamespaces() {
+        return namespaceSupplier.get();
+    }
 }

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());
-
-
     }
 }

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>
 

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>
 

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>
 

leia-dropwizard/src/main/java/com/grookage/leia/dropwizard/bundle/LeiaBundle.java

@@ -69,14 +69,14 @@ protected List<Lifecycle> withLifecycleManagers(T configuration) {
     public void run(T configuration, Environment environment) {
         final var userResolver = userResolver(configuration);
         Preconditions.checkNotNull(userResolver, "User Resolver can't be null");
+        this.schemaRepository = getSchemaRepository(configuration);
         final var schemaProcessorHub = SchemaProcessorHub.of()
-                .withSchemaRepository(getSchemaRepository(configuration))
+                .withSchemaRepository(schemaRepository)
                 .withVersionIDGenerator(getVersionIDGenerator())
                 .build();
         this.schemaIngestor = new SchemaIngestor<U>()
                 .withProcessorHub(schemaProcessorHub)
                 .build();
-        this.schemaRepository = getSchemaRepository(configuration);
         final var cacheConfig = getCacheConfig(configuration);
         this.schemaRetriever = new SchemaRetriever(schemaRepository, cacheConfig);
         withLifecycleManagers(configuration)

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>
 

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>
 

leia-models/src/main/java/com/grookage/leia/models/attributes/ObjectAttribute.java

@@ -22,6 +22,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.Set;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)

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>
 

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>
 

leia-refresher/src/main/java/com/grookage/leia/provider/TimeBasedDataProvider.java

@@ -63,7 +63,7 @@ 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();
     }
 

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>
 

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>
 
@@ -47,13 +47,6 @@
             <version>${reflections.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.inject.version}</version>
-        </dependency>
-
-
         <dependency>
             <artifactId>leia-models</artifactId>
             <type>test-jar</type>