KAA-1423: Add Endpoint Specific Configuration Support. Process of upd…

…ating configuration fixed.
kaaproject · Dec 15, 2016 · 3097964 · 3097964
1 parent 700c731
commit 3097964
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 35 deletions.
diff --git a/...main/java/org/kaaproject/kaa/server/common/dao/impl/EndpointSpecificConfigurationDao.java b/...main/java/org/kaaproject/kaa/server/common/dao/impl/EndpointSpecificConfigurationDao.java
@@ -23,7 +23,7 @@ public interface EndpointSpecificConfigurationDao<T extends EndpointSpecificConf
 
   void removeByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHash, Integer confSchemaVersion);
 
-  EndpointSpecificConfiguration findByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHash, int configurationVersion);
+  EndpointSpecificConfiguration findByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHash, int configurationSchemaVersion);
 
   EndpointSpecificConfiguration save(EndpointSpecificConfigurationDto endpointSpecificConfigurationDto);
 

diff --git a/...rg/kaaproject/kaa/server/common/dao/service/EndpointSpecificConfigurationServiceImpl.java b/...rg/kaaproject/kaa/server/common/dao/service/EndpointSpecificConfigurationServiceImpl.java
@@ -85,8 +85,8 @@ public Optional<EndpointSpecificConfigurationDto> findActiveConfigurationByEndpo
   public Optional<EndpointSpecificConfigurationDto> deleteActiveConfigurationByEndpointKeyHash(byte[] endpointKeyHash) {
     Optional<EndpointSpecificConfigurationDto> configuration = findActiveConfigurationByEndpointKeyHash(endpointKeyHash);
     if (configuration.isPresent()) {
-      int confSchemaVersion = configuration.get().getConfigurationSchemaVersion();
+      int profileSchemaVersion = configuration.get().getConfigurationSchemaVersion();
-      endpointSpecificConfigurationDao.removeByEndpointKeyHashAndConfigurationVersion(endpointKeyHash, confSchemaVersion);
+      endpointSpecificConfigurationDao.removeByEndpointKeyHashAndConfigurationVersion(endpointKeyHash, profileSchemaVersion);
     }
     return configuration;
   }

diff --git a/...mon/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointSpecificConfigurationDto.java b/...mon/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointSpecificConfigurationDto.java
@@ -26,19 +26,19 @@ public class EndpointSpecificConfigurationDto implements Serializable {
   private byte[] endpointKeyHash;
   private Integer configurationSchemaVersion;
   private String configuration;
-  private Long version;
+  private Long specificConfigurationVersion;
 
   public EndpointSpecificConfigurationDto() {
   }
 
   /**
    * All-args constructor.
    */
-  public EndpointSpecificConfigurationDto(byte[] endpointKeyHash, Integer configurationSchemaVersion, String configuration, Long version) {
+  public EndpointSpecificConfigurationDto(byte[] endpointKeyHash, Integer configurationSchemaVersion, String configuration, Long specificConfigurationVersion) {
     this.endpointKeyHash = endpointKeyHash;
     this.configurationSchemaVersion = configurationSchemaVersion;
     this.configuration = configuration;
-    this.version = version;
+    this.specificConfigurationVersion = specificConfigurationVersion;
   }
 
   public Integer getConfigurationSchemaVersion() {
@@ -65,12 +65,12 @@ public void setEndpointKeyHash(byte[] endpointKeyHash) {
     this.endpointKeyHash = endpointKeyHash;
   }
 
-  public Long getVersion() {
+  public Long getSpecificConfigurationVersion() {
-    return version;
+    return specificConfigurationVersion;
   }
 
-  public void setVersion(Long version) {
+  public void setSpecificConfigurationVersion(Long specificConfigurationVersion) {
-    this.version = version;
+    this.specificConfigurationVersion = specificConfigurationVersion;
   }
 
   @Override

diff --git a/...ject/kaa/server/common/nosql/cassandra/dao/EndpointSpecificConfigurationCassandraDao.java b/...ject/kaa/server/common/nosql/cassandra/dao/EndpointSpecificConfigurationCassandraDao.java
@@ -21,8 +21,8 @@
 import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.CassandraDaoUtil.getByteBuffer;
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EPS_CONFIGURATION_COLUMN_FAMILY_NAME;
-import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EPS_CONFIGURATION_CONFIGURATION_VERSION_PROPERTY;
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EPS_CONFIGURATION_KEY_HASH_PROPERTY;
+import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EP_CONFIGURATION_VERSION_PROPERTY;
 
 import com.datastax.driver.core.querybuilder.Delete;
 import com.datastax.driver.core.querybuilder.Select;
@@ -66,7 +66,7 @@ public void removeByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHas
     LOG.debug("Remove endpoint specific configuration by endpointKeyHash {} and confSchemaVersion {}", endpointKeyHash, confSchemaVersion);
     Delete.Where deleteQuery = delete().from(getColumnFamilyName())
         .where(eq(EPS_CONFIGURATION_KEY_HASH_PROPERTY, getByteBuffer(endpointKeyHash)))
-        .and(eq(EPS_CONFIGURATION_CONFIGURATION_VERSION_PROPERTY, confSchemaVersion));
+        .and(eq(EP_CONFIGURATION_VERSION_PROPERTY, confSchemaVersion));
     LOG.trace("Remove endpoint specific configuration by endpointKeyHash and confSchemaVersion query {}", deleteQuery);
     execute(deleteQuery);
   }
@@ -76,7 +76,7 @@ public CassandraEndpointSpecificConfiguration findByEndpointKeyHashAndConfigurat
     LOG.debug("Try to find endpoint specific configuration by endpointKeyHash {} and configurationVersion {}", endpointKeyHash, configurationVersion);
     Select.Where where = select().from(getColumnFamilyName())
         .where(eq(EPS_CONFIGURATION_KEY_HASH_PROPERTY, getByteBuffer(endpointKeyHash)))
-        .and(eq(EPS_CONFIGURATION_CONFIGURATION_VERSION_PROPERTY, configurationVersion));
+        .and(eq(EP_CONFIGURATION_VERSION_PROPERTY, configurationVersion));
     LOG.trace("Try to find endpoint specific configuration by cql select {}", where);
     CassandraEndpointSpecificConfiguration configuration = findOneByStatement(where);
     LOG.trace("Found {} endpoint specific configuration", configuration);
@@ -86,7 +86,16 @@ public CassandraEndpointSpecificConfiguration findByEndpointKeyHashAndConfigurat
   @Override
   public EndpointSpecificConfiguration save(EndpointSpecificConfigurationDto dto) {
     LOG.debug("Saving endpoint specific configuration {}", dto);
-    EndpointSpecificConfiguration configuration = save(new CassandraEndpointSpecificConfiguration(dto));
+    CassandraEndpointSpecificConfiguration configuration =
+            findByEndpointKeyHashAndConfigurationVersion(dto.getEndpointKeyHash(), dto.getConfigurationSchemaVersion());
+    if (configuration != null) {
+      configuration.setConfiguration(dto.getConfiguration());
+      configuration.setConfigurationVersion(dto.getConfigurationSchemaVersion());
+      configuration.setEndpointKeyHash(getByteBuffer(dto.getEndpointKeyHash()));
+      save(configuration);
+    } else {
+      configuration = save(new CassandraEndpointSpecificConfiguration(dto));
+    }
     if (LOG.isTraceEnabled()) {
       LOG.trace("Saved: {}", configuration);
     } else {

diff --git a/...t/kaa/server/common/nosql/cassandra/dao/model/CassandraEndpointSpecificConfiguration.java b/...t/kaa/server/common/nosql/cassandra/dao/model/CassandraEndpointSpecificConfiguration.java
@@ -20,8 +20,8 @@
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.CassandraDaoUtil.getByteBuffer;
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.CassandraDaoUtil.getBytes;
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EPS_CONFIGURATION_CONFIGURATION_BODY_PROPERTY;
-import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EPS_CONFIGURATION_CONFIGURATION_VERSION_PROPERTY;
 import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EPS_CONFIGURATION_KEY_HASH_PROPERTY;
+import static org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraModelConstants.EP_CONFIGURATION_VERSION_PROPERTY;
 
 import com.datastax.driver.mapping.annotations.ClusteringColumn;
 import com.datastax.driver.mapping.annotations.Column;
@@ -48,7 +48,7 @@ public final class CassandraEndpointSpecificConfiguration implements EndpointSpe
   @Column(name = EPS_CONFIGURATION_KEY_HASH_PROPERTY)
   private ByteBuffer endpointKeyHash;
   @ClusteringColumn
-  @Column(name = EPS_CONFIGURATION_CONFIGURATION_VERSION_PROPERTY)
+  @Column(name = EP_CONFIGURATION_VERSION_PROPERTY)
   private Integer configurationVersion;
   @Column(name = EPS_CONFIGURATION_CONFIGURATION_BODY_PROPERTY)
   private String configuration;
@@ -68,7 +68,7 @@ public CassandraEndpointSpecificConfiguration(EndpointSpecificConfigurationDto d
     this.endpointKeyHash = getByteBuffer(dto.getEndpointKeyHash());
     this.configurationVersion = dto.getConfigurationSchemaVersion();
     this.configuration = dto.getConfiguration();
-    this.version = dto.getVersion();
+    this.version = dto.getSpecificConfigurationVersion();
   }
 
   @Override
@@ -77,7 +77,7 @@ public EndpointSpecificConfigurationDto toDto() {
     dto.setEndpointKeyHash(getBytes(this.getEndpointKeyHash()));
     dto.setConfiguration(this.getConfiguration());
     dto.setConfigurationSchemaVersion(this.getConfigurationVersion());
-    dto.setVersion(this.getVersion());
+    dto.setSpecificConfigurationVersion(this.getVersion());
     return dto;
   }
 

diff --git a/...a/org/kaaproject/kaa/server/common/nosql/cassandra/dao/model/CassandraModelConstants.java b/...a/org/kaaproject/kaa/server/common/nosql/cassandra/dao/model/CassandraModelConstants.java
@@ -213,7 +213,6 @@ public class CassandraModelConstants {
    */
   public static final String EPS_CONFIGURATION_COLUMN_FAMILY_NAME = "ep_specific_conf";
   public static final String EPS_CONFIGURATION_KEY_HASH_PROPERTY = ENDPOINT_KEY_HASH_PROPERTY;
-  public static final String EPS_CONFIGURATION_CONFIGURATION_VERSION_PROPERTY = EP_CONFIGURATION_VERSION_PROPERTY;
   public static final String EPS_CONFIGURATION_CONFIGURATION_BODY_PROPERTY = BODY_PROPERTY;
 
   /**

diff --git a/.../kaa/server/common/nosql/cassandra/dao/EndpointSpecificConfigurationCassandraDaoTest.java b/.../kaa/server/common/nosql/cassandra/dao/EndpointSpecificConfigurationCassandraDaoTest.java
@@ -22,7 +22,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kaaproject.kaa.common.dto.EndpointSpecificConfigurationDto;
-import org.kaaproject.kaa.server.common.dao.exception.KaaOptimisticLockingFailureException;
 import org.kaaproject.kaa.server.common.dao.model.EndpointSpecificConfiguration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -61,7 +60,7 @@ public void testFindByEndpointKeyHashAndConfigurationVersion() throws Exception
     Assert.assertNull(found4);
   }
 
-  @Test(expected = KaaOptimisticLockingFailureException.class)
+  @Test
   public void testLocking() throws Exception {
     saved1 = generateEpsConfigurationDto(KEY, 1, BODY, 9L);
     saved2 = generateEpsConfigurationDto(KEY, 1, BODY, 9L);

diff --git a/...g/kaaproject/kaa/server/common/nosql/mongo/dao/EndpointSpecificConfigurationMongoDao.java b/...g/kaaproject/kaa/server/common/nosql/mongo/dao/EndpointSpecificConfigurationMongoDao.java
@@ -16,8 +16,8 @@
 
 package org.kaaproject.kaa.server.common.nosql.mongo.dao;
 
+import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_CONFIGURATION_VERSION;
 import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_SPECIFIC_CONFIGURATION;
-import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION;
 import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_SPECIFIC_CONFIGURATION_KEY_HASH;
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 import static org.springframework.data.mongodb.core.query.Query.query;
@@ -42,22 +42,31 @@ public void removeByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHas
     LOG.debug("Remove endpoint specific configuration by endpoint key hash [{}] ", endpointKeyHash);
     mongoTemplate.remove(
         query(where(EP_SPECIFIC_CONFIGURATION_KEY_HASH).is(endpointKeyHash)
-            .and(EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION).is(confSchemaVersion)), getCollectionName());
+            .and(EP_CONFIGURATION_VERSION).is(confSchemaVersion)), getCollectionName());
   }
 
   @Override
-  public EndpointSpecificConfiguration findByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHash, int configurationVersion) {
+  public EndpointSpecificConfiguration findByEndpointKeyHashAndConfigurationVersion(byte[] endpointKeyHash, int configurationSchemaVersion) {
-    LOG.debug("Try to find endpoint specific configuration by endpointKeyHash {} and configurationVersion {}", endpointKeyHash, configurationVersion);
+    LOG.debug("Try to find endpoint specific configuration by endpointKeyHash {} and configurationVersion {}", endpointKeyHash, configurationSchemaVersion);
     EndpointSpecificConfiguration configuration = findOne(query(where(EP_SPECIFIC_CONFIGURATION_KEY_HASH).is(endpointKeyHash)
-        .and(EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION).is(configurationVersion)));
+        .and(EP_CONFIGURATION_VERSION).is(configurationSchemaVersion)));
     LOG.trace("Found {}  endpoint specific configuration", configuration);
     return configuration;
   }
 
   @Override
   public EndpointSpecificConfiguration save(EndpointSpecificConfigurationDto dto) {
     LOG.debug("Saving endpoint specific configuration {}", dto);
-    MongoEndpointSpecificConfiguration configuration = save(new MongoEndpointSpecificConfiguration(dto));
+    MongoEndpointSpecificConfiguration configuration =
+            (MongoEndpointSpecificConfiguration) findByEndpointKeyHashAndConfigurationVersion(dto.getEndpointKeyHash(), dto.getConfigurationSchemaVersion());
+    if (configuration != null) {
+      configuration.setConfiguration(dto.getConfiguration());
+      configuration.setConfigurationVersion(dto.getConfigurationSchemaVersion());
+      configuration.setEndpointKeyHash(dto.getEndpointKeyHash());
+      save(configuration);
+    } else {
+      configuration = save(new MongoEndpointSpecificConfiguration(dto));
+    }
     if (LOG.isTraceEnabled()) {
       LOG.trace("Saved: {}", configuration);
     } else {

diff --git a/...aaproject/kaa/server/common/nosql/mongo/dao/model/MongoEndpointSpecificConfiguration.java b/...aaproject/kaa/server/common/nosql/mongo/dao/model/MongoEndpointSpecificConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.kaaproject.kaa.server.common.nosql.mongo.dao.model;
 
-import static org.kaaproject.kaa.server.common.dao.DaoConstants.OPT_LOCK;
+import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_CONFIGURATION_VERSION;
 import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_SPECIFIC_CONFIGURATION;
 import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_SPECIFIC_CONFIGURATION_CONFIGURATION;
 import static org.kaaproject.kaa.server.common.nosql.mongo.dao.model.MongoModelConstants.EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION;
@@ -46,12 +46,12 @@ public class MongoEndpointSpecificConfiguration implements EndpointSpecificConfi
   @Indexed
   @Field(EP_SPECIFIC_CONFIGURATION_KEY_HASH)
   private byte[] endpointKeyHash;
-  @Field(EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION)
+  @Field(EP_CONFIGURATION_VERSION)
   private Integer configurationVersion;
   @Field(EP_SPECIFIC_CONFIGURATION_CONFIGURATION)
   private String configuration;
   @Version
-  @Field(OPT_LOCK)
+  @Field(EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION)
   private Long version;
 
   public MongoEndpointSpecificConfiguration() {
@@ -64,7 +64,7 @@ public MongoEndpointSpecificConfiguration(EndpointSpecificConfigurationDto dto)
     this.endpointKeyHash = dto.getEndpointKeyHash();
     this.configurationVersion = dto.getConfigurationSchemaVersion();
     this.configuration = dto.getConfiguration();
-    this.version = dto.getVersion();
+    this.version = dto.getSpecificConfigurationVersion();
     generateId();
   }
 
@@ -74,7 +74,7 @@ public EndpointSpecificConfigurationDto toDto() {
     dto.setEndpointKeyHash(this.getEndpointKeyHash());
     dto.setConfiguration(this.getConfiguration());
     dto.setConfigurationSchemaVersion(this.getConfigurationVersion());
-    dto.setVersion(this.getVersion());
+    dto.setSpecificConfigurationVersion(this.getVersion());
     return dto;
   }
 

diff --git a/...main/java/org/kaaproject/kaa/server/common/nosql/mongo/dao/model/MongoModelConstants.java b/...main/java/org/kaaproject/kaa/server/common/nosql/mongo/dao/model/MongoModelConstants.java
@@ -135,7 +135,7 @@ public class MongoModelConstants {
    */
   public static final String EP_SPECIFIC_CONFIGURATION = "endpoint_specific_configuration";
   public static final String EP_SPECIFIC_CONFIGURATION_KEY_HASH = EP_ENDPOINT_KEY_HASH;
-  public static final String EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION = EP_CONFIGURATION_VERSION;
+  public static final String EP_SPECIFIC_CONFIGURATION_CONFIGURATION_VERSION = "endpoint_specific_configuration_version";
   public static final String EP_SPECIFIC_CONFIGURATION_CONFIGURATION = BODY;
 
   private MongoModelConstants() {

diff --git a/...aproject/kaa/server/common/nosql/mongo/dao/EndpointSpecificConfigurationMongoDaoTest.java b/...aproject/kaa/server/common/nosql/mongo/dao/EndpointSpecificConfigurationMongoDaoTest.java
@@ -24,7 +24,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kaaproject.kaa.common.dto.EndpointSpecificConfigurationDto;
-import org.kaaproject.kaa.server.common.dao.exception.KaaOptimisticLockingFailureException;
 import org.kaaproject.kaa.server.common.dao.model.EndpointSpecificConfiguration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -72,7 +71,7 @@ public void testFindByEndpointKeyHashAndConfigurationVersion() throws Exception
     Assert.assertNull(found4);
   }
 
-  @Test(expected = KaaOptimisticLockingFailureException.class)
+  @Test
   public void testLocking() throws Exception {
     saved1 = generateEndpointSpecificConfigurationDto(KEY, 1, BODY, 8L);
     saved2 = generateEndpointSpecificConfigurationDto(KEY, 1, BODY, 8L);