RemoteService

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

@@ -8,7 +8,6 @@ import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.p3p.*;
 import edu.prlab.tyler.iotgateway.cloud.services.DeviceService;
 import edu.prlab.tyler.iotgateway.cloud.services.PrivacyPolicyReportService;
-import edu.prlab.tyler.iotgateway.cloud.services.SensitiveUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -21,27 +20,18 @@ public class DefaultData implements ApplicationRunner {
 
     private DeviceService deviceService;
     private PrivacyPolicyReportService privacyPolicyReportService;
-//    private SensitiveUserService sensitiveUserService;
 
 
     @Autowired
     public DefaultData(DeviceService deviceService,
-                       PrivacyPolicyReportService privacyPolicyReportService,
-                       SensitiveUserService sensitiveUserService) {
+                       PrivacyPolicyReportService privacyPolicyReportService) {
         this.deviceService = deviceService;
         this.privacyPolicyReportService = privacyPolicyReportService;
-//        this.sensitiveUserService = sensitiveUserService;
     }
 
     @Override
     public void run(ApplicationArguments args) {
 
-//        User user = User.builder()
-//                .account("test")
-//                .password("test")
-//                .build();
-//        sensitiveUserService.add(user);
-
         Device oxygenDevice = Device.builder()
                 .udn("a1252c49-4188-4e6d-a32e-66604c664fb8")
                 .name("指尖式血氧機")
@@ -119,7 +109,4 @@ public class DefaultData implements ApplicationRunner {
         privacyPolicyReportService.add(oxygenPrivacyPolicyReport);
 
     }
-
-
-
 }
\ No newline at end of file

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DeviceController.java

@@ -43,10 +43,6 @@ public class DeviceController {
                 .orElseGet(()->ResponseEntity.noContent().build());
     }
 
-//    @GetMapping
-//    public ResponseEntity<Iterable<Device>> readDevicesByUser(User user) {
-//    }
-
     @PostMapping("/privacy")
     public  ResponseEntity<PrivacyPolicyReport> addPrivacyPolicyReport(@RequestBody PrivacyPolicyReport privacyPolicy) {
         return  privacyPolicyReportService.add(privacyPolicy)

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/GatewayController.java

@@ -2,7 +2,6 @@ package edu.prlab.tyler.iotgateway.cloud.controllers;
 
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
 import edu.prlab.tyler.iotgateway.cloud.services.PrivacyChoiceService;
-import edu.prlab.tyler.iotgateway.cloud.services.SensitiveUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,13 +14,10 @@ import java.util.Optional;
 @RestController
 public class GatewayController {
     private PrivacyChoiceService privacyChoiceService;
-    private SensitiveUserService sensitiveUserService;
 
     @Autowired
-    public GatewayController(PrivacyChoiceService privacyChoiceService,
-                             SensitiveUserService sensitiveUserService) {
+    public GatewayController(PrivacyChoiceService privacyChoiceService) {
         this.privacyChoiceService = privacyChoiceService;
-        this.sensitiveUserService = sensitiveUserService;
     }
 
     @PostMapping("/choice")

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/repositories/SensitiveUserRepository.java

-package edu.prlab.tyler.iotgateway.cloud.repositories;
-
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface SensitiveUserRepository extends JpaRepository<User, Long> {
-}

cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/SensitiveUserService.java

-package edu.prlab.tyler.iotgateway.cloud.services;
-
-import edu.prlab.tyler.iotgateway.cloud.pojo.auth.User;
-import edu.prlab.tyler.iotgateway.cloud.repositories.SensitiveUserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-@Service
-public class SensitiveUserService {
-    private SensitiveUserRepository repository;
-
-    @Autowired
-    public SensitiveUserService(SensitiveUserRepository repository) {
-        this.repository = repository;
-    }
-
-    public Optional<User> add(User pojo) {
-        return Optional.of(repository.save(pojo));
-    }
-}

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

@@ -16,7 +16,6 @@ public class DefaultData implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        SensitiveUser defaultUser = userService.registerNewUser(SensitiveUser.builder().account("testUser0").password("testUser0").build()).get();
-        System.out.println(defaultUser.toString());
+        userService.registerNewUser(SensitiveUser.builder().account("testUser0").password("testUser0").build()).get();
     }
 }

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java

@@ -4,15 +4,12 @@ import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
 import edu.prlab.tyler.iotgateway.gateway.model.PrivacyChoiceResponse;
-import edu.prlab.tyler.iotgateway.gateway.pojo.PrivacyChoiceIndex;
 import edu.prlab.tyler.iotgateway.gateway.services.DeviceService;
 import edu.prlab.tyler.iotgateway.gateway.services.PrivacyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Optional;
-
 @RestController
 public class GatewayController {
 

gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/RemoteService.java

@@ -3,6 +3,7 @@ package edu.prlab.tyler.iotgateway.gateway.services;
 import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
 import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyPolicyReport;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -11,12 +12,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 
 @Service
 public class RemoteService {
     private RestTemplate template;
     private String cloudAddress;
 
+    @Autowired
     public RemoteService(RestTemplate template) {
         this.template = template;
     }
@@ -27,51 +30,38 @@ public class RemoteService {
     }
 
     public Optional<Device> readDevice(String udn) {
-        try {
-            return Optional.of(template.exchange(cloudAddress + "/device/" + udn, HttpMethod.GET, null, Device.class).getBody());
-        } catch (Exception e) {
-            System.out.println("Read device error");
-            return Optional.empty();
-        }
+        return tryCatch(() -> template.exchange(cloudAddress + "/device/" + udn, HttpMethod.GET, null,
+                Device.class).getBody(), "Read device error");
     }
 
     public Optional<Iterable<Device>> readDevices() {
-        try {
-            return Optional.of(template.exchange(cloudAddress + "/device", HttpMethod.GET, null,
+        return tryCatch(() -> template.exchange(cloudAddress + "/device", HttpMethod.GET, null,
                 new ParameterizedTypeReference<Iterable<Device>>() {
-                    }).getBody());
-        } catch (Exception e) {
-            System.out.println("Read devices error");
-            return Optional.empty();
-        }
+                }).getBody(), "Read devices error");
     }
 
     public Optional<PrivacyPolicyReport> readRelatedPrivacyPolicies(String udn) {
-        try {
-            return Optional.of(template.exchange(cloudAddress + "/privacy/" + udn, HttpMethod.GET, null,
-                    PrivacyPolicyReport.class).getBody());
-        } catch (Exception e) {
-            System.out.println("Read privacyPolicyReport error");
-            return Optional.empty();
-        }
+        return tryCatch(() -> template.exchange(cloudAddress + "/privacy/" + udn, HttpMethod.GET, null,
+                PrivacyPolicyReport.class).getBody(), "Read privacyPolicyReport error");
     }
 
     public Optional<PrivacyChoice> setPrivacyChoice(PrivacyChoice choice) {
-        try {
-            return Optional.of(template.exchange(cloudAddress + "/choice", HttpMethod.POST, new HttpEntity(choice), PrivacyChoice.class).getBody());
-        } catch (Exception e) {
-            System.out.println("Set privacyChoice error");
-            return Optional.empty();
-        }
+        return tryCatch(() -> template.exchange(cloudAddress + "/choice", HttpMethod.POST,
+                new HttpEntity(choice), PrivacyChoice.class).getBody(), "Set privacyChoice error");
     }
 
     public Optional<Iterable<PrivacyChoice>> readPrivacyChoices() {
-        try {
-            return Optional.of(template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
+        return tryCatch(() -> template.exchange(cloudAddress + "/choice", HttpMethod.GET, null,
                 new ParameterizedTypeReference<Iterable<PrivacyChoice>>() {
-                    }).getBody());
+                }).getBody(), "Read privacyChoice error");
+    }
+
+    public <T> Optional<T> tryCatch(Supplier<T> supplier, String errorMessage) {
+        try {
+            return Optional.of(supplier.get());
         } catch (Exception e) {
-            System.out.println("Read privacyChoice error");
+            System.out.println(errorMessage);
+            e.printStackTrace();
             return Optional.empty();
         }
     }