Merge pull request #393 from devicehive/development

Development

Author: tmatvienko

Jenkinsfile

@@ -70,7 +70,7 @@ if (publishable_branches.contains(env.BRANCH_NAME)) {
 
           echo("Install dependencies with npm")
           sh '''
-            sudo npm install -g mocha mochawesome
+            sudo npm install -g mocha@3.5.3 mochawesome
             sudo npm i
           '''
 
@@ -84,8 +84,10 @@ if (publishable_branches.contains(env.BRANCH_NAME)) {
             jq ".server.restUrl = \\"http://127.0.0.1:8080/api/rest\\"" > config.json
           '''
 
-          echo("Run integration tests")
-          sh 'mocha -R mochawesome integration-tests'
+          timeout(time:10, unit: 'MINUTES') {
+            echo("Run integration tests")
+            sh 'mocha -R mochawesome integration-tests'
+          }
         }
       } finally {
         archiveArtifacts artifacts: 'devicehive-tests/mochawesome-report/mochawesome.json, devicehive-tests/mochawesome-report/mochawesome.html', fingerprint: true, onlyIfSuccessful: true

devicehive-backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>devicehive-server</artifactId>
         <groupId>com.devicehive</groupId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -81,6 +81,19 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>proxy-ws-kafka</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.devicehive</groupId>
+                    <artifactId>devicehive-proxy-ws-kafka-impl</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
     <build>
         <plugins>

devicehive-backend/src/main/resources/messages.properties

@@ -110,4 +110,4 @@ CANT_DELETE_CURRENT_USER_KEY=You can not delete a user or access key that you us
 CANT_DELETE_LAST_DEFAULT_ACCESS_KEY=You can not delete your last default access key
 PAYLOAD_NOT_FOUND=Missing or invalid payload in request
 SUBSCRIPTION_NOT_FOUND=Subscription with id %s was not found
-DEVICE_ID_CONTAINS_INVALID_CHARACTERS=Device Id can only contain letters, digits, dashes and underscores.
+DEVICE_ID_CONTAINS_INVALID_CHARACTERS=Device Id can only contain letters, digits and dashes.

devicehive-common-dao/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.devicehive</groupId>
         <artifactId>devicehive-server</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
     </parent>
     <artifactId>devicehive-common-dao</artifactId>
     <packaging>jar</packaging>

devicehive-common/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.devicehive</groupId>
         <artifactId>devicehive-server</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
     </parent>
     <artifactId>devicehive-common</artifactId>
     <packaging>jar</packaging>
@@ -29,6 +29,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.devicehive</groupId>
+            <artifactId>devicehive-proxy-api</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>

devicehive-common/src/main/java/com/devicehive/model/updates/DeviceUpdate.java

@@ -36,10 +36,6 @@ public class DeviceUpdate implements HiveEntity {
 
     private static final long serialVersionUID = -7498444232044147881L;
 
-    @SerializedName("id")
-    @JsonPolicyDef({DEVICE_PUBLISHED, NETWORK_PUBLISHED})
-    private String id;
-
     @Size(min = 1, max = 128, message = "Field name cannot be empty. The length of name should not be more than 128 symbols.")
     @SerializedName("name")
     @JsonPolicyDef({DEVICE_PUBLISHED, DEVICE_SUBMITTED, NETWORK_PUBLISHED})
@@ -57,14 +53,6 @@ public class DeviceUpdate implements HiveEntity {
     @SerializedName("isBlocked")
     private Boolean blocked;
 
-    public Optional<String> getId() {
-        return Optional.ofNullable(id);
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public Optional<String> getName() {
         return Optional.ofNullable(name);
     }
@@ -97,10 +85,10 @@ public void setBlocked(Boolean blocked) {
         this.blocked = blocked;
     }
 
-    public DeviceVO convertTo() {
+    public DeviceVO convertTo(String deviceId) {
         DeviceVO device = new DeviceVO();
-        if (this.id != null){
-            device.setDeviceId(this.id);
+        if (deviceId != null){
+            device.setDeviceId(deviceId);
         }
         if (this.data != null){
             device.setData(this.data);

devicehive-frontend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>devicehive-server</artifactId>
         <groupId>com.devicehive</groupId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -181,5 +181,18 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>proxy-ws-kafka</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.devicehive</groupId>
+                    <artifactId>devicehive-proxy-ws-kafka-impl</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>

devicehive-frontend/src/main/java/com/devicehive/resource/DeviceResource.java

@@ -44,7 +44,7 @@
 @Api(tags = {"Device"}, description = "Represents a device, a unit that runs microcode and communicates to this API.", consumes = "application/json")
 @Produces({"application/json"})
 public interface DeviceResource {
-    String DEVICE_ID_CONTAINS_INVALID_CHARACTERS = "Device Id can only contain letters, digits, dashes and underscores.";
+    String DEVICE_ID_CONTAINS_INVALID_CHARACTERS = "Device Id can only contain letters, digits and dashes.";
 
     /**
      * Implementation of <a href="http://www.devicehive.com/restful#Reference/Device/list"> DeviceHive RESTful API:
@@ -132,7 +132,7 @@ Response register(
             DeviceUpdate deviceUpdate,
             @ApiParam(name = "id", value = "Device unique identifier.", required = true)
             @PathParam("id")
-            @Pattern(regexp = "[a-zA-Z0-9-_]+", message = DEVICE_ID_CONTAINS_INVALID_CHARACTERS)
+            @Pattern(regexp = "[a-zA-Z0-9-]+", message = DEVICE_ID_CONTAINS_INVALID_CHARACTERS)
             String deviceId);
 
     /**

devicehive-frontend/src/main/java/com/devicehive/resource/exceptions/AllExceptionMapper.java

@@ -44,7 +44,7 @@ public class AllExceptionMapper implements ExceptionMapper<Exception> {
 
     @Override
     public Response toResponse(Exception exception) {
-        logger.error("Error: ", exception);
+        logger.error("Error: {}", exception.getMessage());
 
         Response.Status responseCode = Response.Status.INTERNAL_SERVER_ERROR;
         String message = exception.getMessage();

devicehive-frontend/src/main/java/com/devicehive/resource/impl/DeviceResourceImpl.java

@@ -123,10 +123,8 @@ public Response register(DeviceUpdate deviceUpdate, String deviceId) {
         }
         logger.debug("Device register method requested. Device ID : {}, Device: {}", deviceId, deviceUpdate);
 
-        deviceUpdate.setId(deviceId);
-
         HivePrincipal principal = (HivePrincipal) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        deviceService.deviceSaveAndNotify(deviceUpdate, principal);
+        deviceService.deviceSaveAndNotify(deviceId, deviceUpdate, principal);
         logger.debug("Device register finished successfully. Device ID: {}", deviceId);
 
         return ResponseFactory.response(Response.Status.NO_CONTENT);