KAA-876: merge develop branch + Update new REST API methods to work w…

…ith ApplicationToken instead of ApplicationId

client/client-multi/client-objective-c/mainpage.html

@@ -28,7 +28,7 @@ <h3>Building Kaa Objective-C SDK</h3>
 <code>$ ./build.sh compile</code>
 
 <h3>Link Kaa library to your project</h3>
-<p>Drag and drop Kaa XCode project workspace as sub-module to your project and add libKaa.a binary to "Link Binary with Libraries" in Build Phases tab. In Build Settings tab find property called "Other Linker Flags" and set it's value to -ObjC. In Build Settings tab find property called "User Header Search Paths" and set it's value to "$(BUILT_PRODUCTS_DIR)" and switch value in right column to recursive.
+<p>Drag and drop Kaa XCode project workspace as sub-module to your project and add Kaa.framework binary to "Link Binary with Libraries" in Build Phases tab. Add new "Copy Files" phase, set its destination to "Frameworks" and add Kaa.framework there. In Build Settings tab find property called "Other Linker Flags" and set it's value to -ObjC. In Build Settings tab find property called "Header Search Paths" and set it's value to "$(BUILT_PRODUCTS_DIR)" and switch value in right column to recursive. In Build Settings tab find property "Allow Non-modular Includes In Framework Modules" and set its value to "Yes".
 </p>
 
 <h2>Programming guide</h2>

server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CTLSchemaDao.java

@@ -31,15 +31,15 @@ public interface CTLSchemaDao<T> extends SqlDao<T> {
      * @return the list of CTL schemas available in the database.
      */
     List<T> findSystemSchemas();
-    
+
     /**
      * Find available for tenant(include system scope) CTL schemas by given tenant identifier.
      *
      * @param tenantId the tenant identifier.
      * @return the list of available schemas.
      */
     List<T> findAvailableSchemasForTenant(String tenantId);
-    
+
     /**
      * Find available for application(include system and tenant scope) CTL schemas by given tenant and application identifier.
      * 
@@ -56,9 +56,9 @@ public interface CTLSchemaDao<T> extends SqlDao<T> {
      * @param version    the schema version.
      * @return the CTL schema with the given meta info id and version.
      */
-    
+
     T findByMetaInfoIdAndVer(String metaInfoId, Integer version);
-    
+
     /**
      * Find CTL schema with the given fully qualified name, version, tenant and application identifiers.
      *
@@ -91,7 +91,7 @@ public interface CTLSchemaDao<T> extends SqlDao<T> {
      * @return the latest version of CTL schema with the given fully qualified name, tenant and application identifiers.
      */
     T findLatestByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId);
-    
+
     /**
      * Find the last version of CTL schema with the given meta info id.
      *
@@ -100,7 +100,7 @@ public interface CTLSchemaDao<T> extends SqlDao<T> {
      */
 
     T findLatestByMetaInfoId(String metaInfoId);
-    
+
     /**
      * Find all available versions of CTL schema with the given fully qualified name, tenant and application identifiers.
      *
@@ -110,7 +110,7 @@ public interface CTLSchemaDao<T> extends SqlDao<T> {
      * @return the list of available versions of CTL schema with the given fully qualified name, tenant and application identifiers.
      */
     List<T> findAllByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId);
-    
+
     /**
      * Find all available versions of CTL schema with the given meta info id.
      *
@@ -126,5 +126,5 @@ public interface CTLSchemaDao<T> extends SqlDao<T> {
      * @return the list of dependents schemas from schema with given identifier.
      */
     List<T> findDependentSchemas(String schemaId);
-    
+
 }

server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaDao.java

@@ -54,7 +54,7 @@ public class HibernateCTLSchemaDao extends HibernateAbstractDao<CTLSchema> imple
     protected Class<CTLSchema> getEntityClass() {
         return CTLSchema.class;
     }
-    
+
     private Criterion buildScopeCriterion(String tenantId, String applicationId) {
         if (isBlank(tenantId)) {
            // SYSTEM - tenantId=null && appId=null 
@@ -106,7 +106,7 @@ public List<CTLSchema> findSystemSchemas() {
         }
         return schemas;
     }
-    
+
     @Override
     public List<CTLSchema> findAvailableSchemasForTenant(String tenantId) {
         LOG.debug("Searching available ctl schemas for tenant with id [{}]", tenantId);
@@ -134,7 +134,7 @@ public List<CTLSchema> findAvailableSchemasForApplication(String tenantId, Strin
         }
         return availableSchemas;
     }
-    
+
     @Override
     public CTLSchema findByFqnAndVerAndTenantIdAndApplicationId(String fqn, 
             Integer version, String tenantId, String applicationId) {
@@ -160,7 +160,7 @@ public CTLSchema findByFqnAndVerAndTenantIdAndApplicationId(String fqn,
         }
         return ctlSchema;
     }
-    
+
     @Override
     public CTLSchema findByMetaInfoIdAndVer(String metaInfoId, Integer version) {
         CTLSchema ctlSchema = null;
@@ -179,7 +179,7 @@ public CTLSchema findByMetaInfoIdAndVer(String metaInfoId, Integer version) {
         }
         return ctlSchema;
     }
-    
+
     @Override
     public CTLSchema findAnyByFqnAndVerAndTenantIdAndApplicationId(String fqn, Integer version, String tenantId,
             String applicationId) {
@@ -200,7 +200,7 @@ public CTLSchema findAnyByFqnAndVerAndTenantIdAndApplicationId(String fqn, Integ
         }
         return ctlSchema;
     }
- 
+
     @Override
     public CTLSchema findLatestByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId) {
         LOG.debug("Searching latest ctl schema by fqn [{}], tenantId [{}] and applicationId [{}]", fqn, tenantId, applicationId);
@@ -223,7 +223,7 @@ public CTLSchema findLatestByFqnAndTenantIdAndApplicationId(String fqn, String t
         }
         return latestSchema;
     }
-    
+
     @Override
     public CTLSchema findLatestByMetaInfoId(String metaInfoId) {
         CTLSchema latestSchema = null;
@@ -243,7 +243,7 @@ public CTLSchema findLatestByMetaInfoId(String metaInfoId) {
         }
         return latestSchema;
     }
-    
+
     @Override
     public List<CTLSchema> findAllByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId) {
         LOG.debug("Searching available version of ctl schema by fqn [{}], tenantId [{}] and applicationId [{}]", fqn, tenantId, applicationId);
@@ -265,7 +265,7 @@ public List<CTLSchema> findAllByFqnAndTenantIdAndApplicationId(String fqn, Strin
         }
         return schemas;
     }
-    
+
     @Override
     public List<CTLSchema> findAllByMetaInfoId(String metaInfoId) {
         LOG.debug("Searching available version of ctl schema by meta info id [{}]", metaInfoId);
@@ -280,7 +280,7 @@ public List<CTLSchema> findAllByMetaInfoId(String metaInfoId) {
         }
         return schemas;
     }
-    
+
     @Override
     public List<CTLSchema> findDependentSchemas(String schemaId) {
         LOG.debug("Searching dependents ctl schemas for schema with id [{}]", schemaId);

server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaMetaInfo.java

@@ -45,15 +45,15 @@
 public class CTLSchemaMetaInfo extends GenericModel<CTLSchemaMetaInfoDto> implements Serializable {
 
     private static final long serialVersionUID = 3185049875063895954L;
-    
+
     @Column(name = CTL_SCHEMA_META_INFO_FQN)
     private String fqn;
     @ManyToOne(optional = true, fetch = FetchType.LAZY)
     @JoinColumn(nullable = true, name = CTL_SCHEMA_META_INFO_TENANT_ID, foreignKey = @ForeignKey(name = CTL_SCHEMA_META_INFO_TENANT_FK))
     private Tenant tenant;
     @ManyToOne(optional = true, fetch = FetchType.LAZY)
     @JoinColumn(nullable = true, name = CTL_SCHEMA_META_INFO_APPLICATION_ID, foreignKey = @ForeignKey(name = CTL_SCHEMA_META_INFO_APPLICATION_FK))
-    private Application application;    
+    private Application application;
 
     public CTLSchemaMetaInfo() {
     }

server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CTLServiceImpl.java

@@ -223,7 +223,7 @@ public CTLSchemaDto updateCTLSchema(CTLSchemaDto ctlSchema) {
             throw new DatabaseProcessingException("Can't find common type version by id.");
         }
     }
-    
+
     @Override
     public CTLSchemaMetaInfoDto updateCTLSchemaMetaInfoScope(CTLSchemaMetaInfoDto ctlSchemaMetaInfo) {
         validateObject(ctlSchemaMetaInfo, "Incorrect ctl schema meta info object");
@@ -245,7 +245,7 @@ public CTLSchemaMetaInfoDto updateCTLSchemaMetaInfoScope(CTLSchemaMetaInfoDto ct
             throw new DatabaseProcessingException("Can't find common type by id.");
         }
     }
-    
+
     @Override
     public List<CTLSchemaMetaInfoDto> findSiblingsByFqnTenantIdAndApplicationId(String fqn, String tenantId, String applicationId) {
         if (isBlank(fqn)) {
@@ -254,7 +254,7 @@ public List<CTLSchemaMetaInfoDto> findSiblingsByFqnTenantIdAndApplicationId(Stri
         LOG.debug("Find sibling ctl schemas by fqn {}, tenant id {} and application id {}", fqn, tenantId, applicationId);
         return convertDtoList(ctlSchemaMetaInfoDao.findSiblingsByFqnTenantIdAndApplicationId(fqn, tenantId, applicationId));
     }
-    
+
     private boolean checkScopeUpdate(CTLSchemaMetaInfoDto newSchemaMetaInfo, CTLSchemaMetaInfoDto prevSchemaMetaInfo) {
         if (!newSchemaMetaInfo.equals(prevSchemaMetaInfo)) {
             if (isBlank(newSchemaMetaInfo.getFqn())) {
@@ -330,7 +330,7 @@ public CTLSchemaDto findCTLSchemaByFqnAndVerAndTenantIdAndApplicationId(String f
         LOG.debug("Find ctl schema by fqn {} version {}, tenant id {} and application id {}", fqn, version, tenantId, applicationId);
         return DaoUtil.getDto(ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(fqn, version, tenantId, applicationId));
     }
-    
+
     @Override
     public CTLSchemaDto findByMetaInfoIdAndVer(String metaInfoId, Integer version) {
         if (isBlank(metaInfoId) || version == null) {
@@ -349,7 +349,7 @@ public CTLSchemaDto findAnyCTLSchemaByFqnAndVerAndTenantIdAndApplicationId(Strin
         LOG.debug("Find any ctl schema by fqn {} version {}, tenant id {} and application id {}", fqn, version, tenantId, applicationId);
         return DaoUtil.getDto(ctlSchemaDao.findAnyByFqnAndVerAndTenantIdAndApplicationId(fqn, version, tenantId, applicationId));
     }
-    
+
     @Override
     public List<CTLSchemaDto> findSystemCTLSchemas() {
         LOG.debug("Find system ctl schemas");
@@ -367,7 +367,7 @@ public List<CTLSchemaMetaInfoDto> findAvailableCTLSchemasMetaInfoForTenant(Strin
         LOG.debug("Find system and tenant scopes ctl schemas by tenant id {}", tenantId);
         return getMetaInfoFromCTLSchema(ctlSchemaDao.findAvailableSchemasForTenant(tenantId));
     }
-    
+
     @Override
     public List<CTLSchemaMetaInfoDto> findAvailableCTLSchemasMetaInfoForApplication(String tenantId, String applicationId) {
         LOG.debug("Find system, tenant and application scopes ctl schemas by application id {}", applicationId);
@@ -380,14 +380,14 @@ public CTLSchemaDto findLatestCTLSchemaByFqnAndTenantIdAndApplicationId(String f
         LOG.debug("Find latest ctl schema by fqn {}, tenantId {} and applicationId {}", fqn, tenantId, applicationId);
         return DaoUtil.getDto(ctlSchemaDao.findLatestByFqnAndTenantIdAndApplicationId(fqn, tenantId, applicationId));
     }
-    
+
     @Override
     public CTLSchemaDto findLatestByMetaInfoId(String metaInfoId) {
         validateString(metaInfoId, "Incorrect meta info id for ctl schema request.");
         LOG.debug("Find latest ctl schema by meta info id {}", metaInfoId);
         return DaoUtil.getDto(ctlSchemaDao.findLatestByMetaInfoId(metaInfoId));
     }
-    
+
     @Override
     public List<CTLSchemaDto> findAllCTLSchemasByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId) {
         validateString(fqn, "Incorrect fqn for ctl schema request.");
@@ -460,7 +460,7 @@ private List<CTLSchemaMetaInfoDto> getMetaInfoFromCTLSchema(List<CTLSchema> sche
         List<CTLSchemaMetaInfoDto> result = new ArrayList<>(metaInfoMap.values());
         return result;
     }
-    
+
     @Override
     public FileData shallowExport(CTLSchemaDto schema) {
         try {

server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/TopicServiceImpl.java

@@ -89,7 +89,7 @@ public TopicDto findTopicById(String id) {
 
     @Override
     public List<TopicDto> findTopicsByAppId(String appId) {
-        validateId(appId, "Can't find topic. Invalid topic id " + appId);
+        validateId(appId, "Can't find topic. Invalid application id " + appId);
         return convertDtoList(topicDao.findTopicsByAppId(appId));
     }
 

server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaDaoTest.java

@@ -63,7 +63,7 @@ public class HibernateCTLSchemaDaoTest extends HibernateAbstractTest {
     private CTLSchemaDto systemSchema;
 
     private static final String SYSTEM_FQN = "org.kaaproject.kaa.ctl.SystemSchema";
-    
+
     @Before
     public void before() {
         clearDBData();
@@ -95,7 +95,7 @@ public void saveCTLSchemaWithSameFqnAndVersion() {
         ctlSchemaDao.save(generateCTLSchema(DEFAULT_FQN, new Tenant(tenant), 11, null));
         ctlSchemaDao.save(generateCTLSchema(DEFAULT_FQN, null, 11, null));
     }
-    
+
     private CTLSchema generateCTLSchema(String fqn, Tenant tenant, int version, String body) {
         CTLSchema ctlSchema = new CTLSchema();
         if (tenant == null) {
@@ -125,7 +125,6 @@ public void saveCTLSchemaWithDependency() throws InterruptedException {
         Assert.assertEquals(expected.size(), dep.size());
     }
 
-
     @Test
     public void testFindByFqnAndVerAndTenantIdAndApplicationId() {
         CTLSchema found = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(firstSchema.getMetaInfo().getFqn(), 

server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/LogSchemaServiceImplTest.java

@@ -98,11 +98,10 @@ public void findLogSchemaByIdTest() {
 
         Assert.assertNotNull(dto);
     }
-    
+
     @Test
     public void findLogSchemaVersionsByApplicationIdTest() {
         List<VersionDto> schemas = logSchemaService.findLogSchemaVersionsByApplicationId(applicationDto.getId());
-
         Assert.assertEquals(1, schemas.size());
     }
 }

server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/UserVerifierServiceImplTest.java

@@ -35,41 +35,41 @@ public void beforeTest() throws Exception {
     }
 
     @Test
-    public void findUserVerifiersByAppIdTest(){
-        UserVerifierDto verifierDto1 = generateUserVerifierDto(null, null);
-        List<UserVerifierDto> found = verifierService.findUserVerifiersByAppId(verifierDto1.getApplicationId());
+    public void findUserVerifiersByAppIdTest() {
+        UserVerifierDto verifierDto = generateUserVerifierDto(null, null);
+        List<UserVerifierDto> found = verifierService.findUserVerifiersByAppId(verifierDto.getApplicationId());
         Assert.assertEquals(2, found.size());
     }
 
     @Test
-    public void findUserVerifiersByAppIdAndVerifierTokenTest(){
+    public void findUserVerifiersByAppIdAndVerifierTokenTest() {
         UserVerifierDto verifierDto = generateUserVerifierDto(null, null);
         UserVerifierDto found = verifierService.findUserVerifiersByAppIdAndVerifierToken(verifierDto.getApplicationId(), verifierDto.getVerifierToken());
         Assert.assertEquals(verifierDto, found);
     }
 
     @Test
-    public void findUserVerifierByIdTest(){
+    public void findUserVerifierByIdTest() {
         UserVerifierDto verifierDto = generateUserVerifierDto(null, null);
         UserVerifierDto found = verifierService.findUserVerifierById(verifierDto.getId());
         Assert.assertEquals(verifierDto, found);
     }
 
     @Test
-    public void saveUserVerifierTest(){
+    public void saveUserVerifierTest() {
         UserVerifierDto verifierDto = generateUserVerifierDto(null, null);
         UserVerifierDto found = verifierService.saveUserVerifier(verifierDto);
         Assert.assertEquals(verifierDto, found);
     }
 
     @Test
-    public void saveUserVerifierNullVerifierDtoTest(){
+    public void saveUserVerifierNullVerifierDtoTest() {
         UserVerifierDto found = verifierService.saveUserVerifier(null);
         Assert.assertNull(found);
     }
 
     @Test
-    public void removeUserVerifierByIdTest(){
+    public void removeUserVerifierByIdTest() {
         UserVerifierDto verifierDto = generateUserVerifierDto(null, null);
         verifierService.removeUserVerifierById(verifierDto.getId());
         UserVerifierDto found = verifierService.findUserVerifierById(verifierDto.getId());