root attributes configuration via properties

Author: dnltsk

src/main/java/com/dasburo/spring/cache/dynamo/DynamoCache.java

@@ -157,17 +157,26 @@ public final Duration getTtl() {
     return cacheConfig.getTtl();
   }
 
+  /**
+   * Returns the configuration of additional root attributes for this cache
+   *
+   * @return the rootAttributeConfigs value.
+   */
+  public final List<RootAttributeConfig> getRootAttributes() {
+    return cacheConfig.getRootAttributes();
+  }
+
   @Override
   public void put(Object key, Object value) {
     Assert.isTrue(key instanceof String, "'key' must be an instance of 'java.lang.String'.");
-    writer.put(cacheName, (String) key, serialize(value), cacheConfig.getTtl(), readRootAttributes(cacheConfig.getRootAttributeConfigs(), value));
+    writer.put(cacheName, (String) key, serialize(value), cacheConfig.getTtl(), readRootAttributes(cacheConfig.getRootAttributes(), value));
   }
 
   @Override
   public ValueWrapper putIfAbsent(Object key, Object value) {
     Assert.isTrue(key instanceof String, "'key' must be an instance of 'java.lang.String'.");
 
-    byte[] result = writer.putIfAbsent(cacheName, (String) key, serialize(value), cacheConfig.getTtl(), readRootAttributes(cacheConfig.getRootAttributeConfigs(), value));
+    byte[] result = writer.putIfAbsent(cacheName, (String) key, serialize(value), cacheConfig.getTtl(), readRootAttributes(cacheConfig.getRootAttributes(), value));
     if (result != null) {
       LOGGER.debug(String.format("Key: %s already exists in the cache. Element will not be replaced.", key));
       return new SimpleValueWrapper(deserialize(result));

src/main/java/com/dasburo/spring/cache/dynamo/DynamoCacheBuilder.java

@@ -134,7 +134,7 @@ public DynamoCacheBuilder withSerializer(DynamoSerializer serializer) {
    * @return this builder for chaining.
    */
   public DynamoCacheBuilder withRootAttributes(List<RootAttributeConfig> rootAttributeConfigs) {
-    this.cacheConfig.setRootAttributeConfigs(rootAttributeConfigs);
+    this.cacheConfig.setRootAttributes(rootAttributeConfigs);
     return this;
   }
 

src/main/java/com/dasburo/spring/cache/dynamo/DynamoCacheConfiguration.java

@@ -35,15 +35,15 @@ public class DynamoCacheConfiguration {
   private Long readCapacityUnits;
   private Long writeCapacityUnits;
   private DynamoSerializer serializer;
-  private List<RootAttributeConfig> rootAttributeConfigs;
+  private List<RootAttributeConfig> rootAttributes;
 
-  private DynamoCacheConfiguration(Duration ttl, boolean flushOnBoot, Long readCapacityUnits, Long writeCapacityUnits, DynamoSerializer serializer, List<RootAttributeConfig> rootAttributeConfigs) {
+  private DynamoCacheConfiguration(Duration ttl, boolean flushOnBoot, Long readCapacityUnits, Long writeCapacityUnits, DynamoSerializer serializer, List<RootAttributeConfig> rootAttributes) {
     this.ttl = ttl;
     this.flushOnBoot = flushOnBoot;
     this.readCapacityUnits = readCapacityUnits;
     this.writeCapacityUnits = writeCapacityUnits;
     this.serializer = serializer;
-    this.rootAttributeConfigs = rootAttributeConfigs;
+    this.rootAttributes = rootAttributes;
   }
 
   public static DynamoCacheConfiguration defaultCacheConfig() {
@@ -90,11 +90,11 @@ public void setSerializer(DynamoSerializer serializer) {
     this.serializer = serializer;
   }
 
-  public List<RootAttributeConfig> getRootAttributeConfigs() {
-    return rootAttributeConfigs;
+  public List<RootAttributeConfig> getRootAttributes() {
+    return rootAttributes;
   }
 
-  public void setRootAttributeConfigs(List<RootAttributeConfig> rootAttributeConfigs) {
-    this.rootAttributeConfigs = rootAttributeConfigs;
+  public void setRootAttributes(List<RootAttributeConfig> rootAttributes) {
+    this.rootAttributes = rootAttributes;
   }
 }

src/main/java/com/dasburo/spring/cache/dynamo/autoconfigure/DynamoCacheAutoConfiguration.java

@@ -80,6 +80,7 @@ private List<DynamoCacheBuilder> dynamoCacheBuilders() {
             .withReadCapacityUnit(dynamoCacheProperties.getReadCapacityUnits())
             .withWriteCapacityUnit(dynamoCacheProperties.getWriteCapacityUnits())
             .withSerializer(new StringSerializer())
+            .withRootAttributes(dynamoCacheProperties.getRootAttributes())
             .withWriter(DynamoCacheWriter.nonLockingDynamoCacheWriter(dynamoTemplate))
         );
       }

src/main/java/com/dasburo/spring/cache/dynamo/autoconfigure/DynamoCacheProperties.java

@@ -15,8 +15,10 @@
 package com.dasburo.spring.cache.dynamo.autoconfigure;
 
 import com.dasburo.spring.cache.dynamo.DynamoCache;
+import com.dasburo.spring.cache.dynamo.rootattribute.RootAttributeConfig;
 
 import java.time.Duration;
+import java.util.List;
 
 /**
  * Properties for {@link DynamoCache}.
@@ -28,6 +30,7 @@ public class DynamoCacheProperties {
   private String cacheName;
   private boolean flushOnBoot;
   private Duration ttl;
+  private List<RootAttributeConfig> rootAttributes;
   private Long readCapacityUnits = 1L;
   private Long writeCapacityUnits = 1L;
 
@@ -55,6 +58,14 @@ public void setTtl(Duration ttl) {
     this.ttl = ttl;
   }
 
+  public List<RootAttributeConfig> getRootAttributes() {
+    return rootAttributes;
+  }
+
+  public void setRootAttributes(List<RootAttributeConfig> rootAttributes) {
+    this.rootAttributes = rootAttributes;
+  }
+
   public Long getReadCapacityUnits() {
     return readCapacityUnits;
   }

src/main/java/com/dasburo/spring/cache/dynamo/rootattribute/RootAttributeConfig.java

@@ -12,22 +12,34 @@ public class RootAttributeConfig {
   private String name;
   private ScalarAttributeType type;
 
+  /* default constructor required for property binding */
+  public RootAttributeConfig(){
+  }
+
   public RootAttributeConfig(String name, ScalarAttributeType type) {
-    Assert.notNull(type, "type must not be null!");
+    setName(name);
+    setType(type);
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
     Assert.notNull(name, "name must not be null!");
     Assert.isTrue(name.length() > 0, "name must not be empty!");
     Assert.isTrue(!ATTRIBUTE_KEY.equalsIgnoreCase(name), "name must not equal '" + ATTRIBUTE_KEY+"'");
     Assert.isTrue(!ATTRIBUTE_VALUE.equalsIgnoreCase(name), "name must not equal '" + ATTRIBUTE_VALUE+"'");
     Assert.isTrue(!ATTRIBUTE_TTL.equalsIgnoreCase(name), "name must not equal '" + ATTRIBUTE_TTL+"'");
     this.name = name;
-    this.type = type;
-  }
-
-  public String getName() {
-    return name;
   }
 
   public ScalarAttributeType getType() {
     return type;
   }
+
+  public void setType(ScalarAttributeType type) {
+    Assert.notNull(type, "type must not be null!");
+    this.type = type;
+  }
 }