upc

.idea/gradle.xml

@@ -10,6 +10,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/cloud" />
+            <option value="$PROJECT_DIR$/contract" />
             <option value="$PROJECT_DIR$/gateway" />
           </set>
         </option>

cloud/build.gradle

@@ -4,7 +4,6 @@ buildscript {
         mapstructVersion = '1.3.0.Final'
         jwtVersion = '3.5.0'
         jjwtVersion = '0.9.1'
-        guavaVersion = '27.1-jre'
     }
     repositories {
         mavenCentral()
@@ -38,7 +37,6 @@ dependencies {
 
     compileOnly 'org.projectlombok:lombok'
     implementation "org.mapstruct:mapstruct:${mapstructVersion}"
-    implementation "com.google.guava:guava:${guavaVersion}"
 
     runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java

@@ -56,7 +56,7 @@ public class DefaultData implements ApplicationRunner {
                         .description("本設備是為符合不同領域及照護應用而設計，並把這些特色融入小如指節的分析儀中，可在數秒內量測出準確可靠的血氧及心跳值。")
                         .url("https://www.amazon.com/Pulse-Oximeter-Blood-Oxygen-Monitor/dp/B00HXXO332")
                         .build())
-                .UPC("B00HXXO332")
+                .upc("B00HXXO332")
                 .location("25.013068, 121.541651")
                 .status(Device.Status.Disconnected)
                 .build();

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/device/Device.java

@@ -36,7 +36,7 @@ public class Device {
     @JoinColumn(name = "model_id")
     private Model model;
 
-    private String UPC;
+    private String upc;
 
     private String location;
 

cloud/src/test/java/edu/prlab/tyler/iotgateway/cloud/CloudHttpApiTest.java

@@ -56,7 +56,7 @@ public class CloudHttpApiTest {
                 .udn("udn")
                 .name("name")
                 .type(Device.Type.Sensor)
-                .UPC("upc")
+                .upc("upc")
                 .model(Model.builder()
                         .name("name")
                         .url("url")

gateway/build.gradle

 buildscript {
     ext {
         springBootVersion = '2.1.4.RELEASE'
+        mapstructVersion = '1.3.0.Final'
     }
     repositories {
         mavenCentral()
@@ -32,6 +33,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+
     implementation project(":cloud")
     implementation project(":contract")
     compileOnly 'org.projectlombok:lombok'

gateway/src/test/java/edu/prlab/tyler/iotgateway/gateway/GatewayHttpApiTest.java

@@ -97,7 +97,6 @@ public class GatewayHttpApiTest {
                 .privacyContent(PrivacyContent.builder()
                         .user(User.builder()
                                 .account("test")
-                                .password("test")
                                 .build())
                         .device(device)
                         .policy(report.getPolicies().get(0))