Merge branch 'sonar-fix' into 'dev'

Even another batch of sonar fixes

See merge request sa4-2020/the-sanmarinoes/backend!130

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java

@@ -99,7 +99,7 @@ public class AutomationController {
                         req.getScenes()
                                 .stream()
                                 .map(AutomationFastUpdateRequest.ScenePriorityDTO::toModel)
-                                .peek(
+                                .map(
                                         t -> {
                                             t.setAutomationId(a.getId());
 
@@ -107,6 +107,7 @@ public class AutomationController {
                                             // please do not replicate unless the quality gate sees
                                             // it as a bug
                                             t.setAutomation(a);
+                                            return t;
                                         })
                                 .collect(Collectors.toList()));
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java

@@ -53,7 +53,7 @@ public class ConfirmationToken {
     }
 
     public Date getCreatedDate() {
-        return createdDate;
+        return (Date) createdDate.clone();
     }
 
     public User getUser() {
@@ -69,7 +69,7 @@ public class ConfirmationToken {
     }
 
     public void setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
+        this.createdDate = (Date) createdDate.clone();
     }
 
     public void setUser(User user) {

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java

@@ -75,7 +75,7 @@ public class DeviceService {
                                 sceneRepository
                                         .findById(t.getSceneId())
                                         .orElseThrow(IllegalStateException::new))
-                .forEach((s) -> sceneService.apply(s, username, true));
+                .forEach(s -> sceneService.apply(s, username, true));
     }
 
     public List<Device> findAll(Long hostId, String username) throws NotFoundException {
@@ -123,7 +123,7 @@ public class DeviceService {
         List<T> toReturn =
                 devicePropagationService.saveAllAsOwner(devices, username, fromScene, fromTrigger);
         if (!fromScene) {
-            toReturn.forEach((d) -> this.triggerTriggers(d, username));
+            toReturn.forEach(d -> this.triggerTriggers(d, username));
         }
         return toReturn;
     }
@@ -170,6 +170,10 @@ public class DeviceService {
 
         devicePopulationService.populateComputedFields(devices);
 
+        return filterOutCamerasIfNeeded(host, devices);
+    }
+
+    private List<Device> filterOutCamerasIfNeeded(User host, Iterable<Device> devices) {
         if (host != null && !host.isCameraEnabled()) {
             return StreamSupport.stream(devices.spliterator(), true)
                     .filter(d -> !(d instanceof SecurityCamera))

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java

@@ -15,7 +15,7 @@ public class JWTUserDetailsService implements UserDetailsService {
     @Autowired private UserRepository repository;
 
     @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+    public UserDetails loadUserByUsername(String username) {
         User toReturn = repository.findByUsername(username);
         if (toReturn != null && toReturn.getEnabled()) {
             return new org.springframework.security.core.userdetails.User(

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java

@@ -42,8 +42,8 @@ public class SensorSocketConfig extends ServerEndpointConfig.Configurator {
     public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException {
         try {
             @SuppressWarnings("unchecked")
-            final T instance = (T) this.instance;
+            final T thaInstance = (T) this.instance;
-            return instance;
+            return thaInstance;
         } catch (ClassCastException e) {
             final var e2 =
                     new InstantiationException("Cannot cast SensorSocketEndpoint to desired type");

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java

@@ -122,7 +122,8 @@ public class SensorSocketEndpoint extends Endpoint {
         } else {
             try {
                 session.close();
-            } catch (IOException ignored) {
+            } catch (IOException e) {
+                logger.warn(e.getLocalizedMessage(), e);
             }
         }
     }

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java

@@ -41,7 +41,7 @@ public abstract class SmartHutTest {
             final ConfirmationTokenRepository tokenRepository) {
         final ResponseEntity<Object> res2 =
                 restTemplate.postForEntity(this.url("/register"), enabledUser, Object.class);
-        assertThat(res2.getStatusCode().equals(HttpStatus.OK));
+        assertThat(res2.getStatusCode()).isEqualTo(HttpStatus.OK);
 
         final User persistedEnabledUser = userRepository.findByUsername("enabled");
         final ConfirmationToken token = tokenRepository.findByUser(persistedEnabledUser);

src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplicationTests.java

@@ -16,11 +16,8 @@ public class SmarthutApplicationTests extends SmartHutTest {
     @Autowired private TestRestTemplate restTemplate;
 
     @Test
-    public void anonymousGreetingShouldNotBeAuthorized() throws Exception {
+    public void anonymousGreetingShouldNotBeAuthorized() {
-        assertThat(
+        assertThat(this.restTemplate.getForEntity(getBaseURL(), Void.class).getStatusCode())
-                this.restTemplate
+                .isEqualTo(HttpStatus.UNAUTHORIZED);
-                        .getForEntity(getBaseURL(), Void.class)
-                        .getStatusCode()
-                        .equals(HttpStatus.UNAUTHORIZED));
     }
 }