clean

Signed-off-by: Etienne Homer <[email protected]>

Author: etiennehomer

src/main/java/org/gridsuite/useradmin/server/service/ConnectionsService.java

@@ -45,7 +45,7 @@ public void recordConnectionAttempt(String sub, Boolean isAllowed) {
     public List<ConnectionEntity> removeDuplicates() {
         Map<String, List<ConnectionEntity>> connectionsBySub = connectionRepository.findAll().stream().collect(Collectors.groupingBy(ConnectionEntity::getSub));
 
-        connectionsBySub.keySet().forEach(sub -> {
+        connectionsBySub.keySet().forEach(sub ->
             connectionsBySub.get(sub).stream().skip(1).forEach(connectionEntity -> {
                 ConnectionEntity groupedEntity = connectionsBySub.get(sub).get(0);
                 if (connectionEntity.getLastConnexionDate().isAfter(groupedEntity.getLastConnexionDate())) {
@@ -55,8 +55,8 @@ public List<ConnectionEntity> removeDuplicates() {
                     groupedEntity.setFirstConnexionDate(connectionEntity.getFirstConnexionDate());
                 }
                 connectionRepository.delete(connectionEntity);
-            });
-        });
+            })
+        );
         return connectionsBySub.values().stream().map(list -> list.get(0)).collect(Collectors.toList());
     }
 }

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

@@ -28,7 +28,6 @@
  */
 @Service
 public class UserAdminService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserAdminService.class);
     private UserAdminRepository userAdminRepository;
 
     private ConnectionsService connectionsService;

src/main/resources/config/application.yaml

@@ -6,5 +6,5 @@ dbName: useradmin
 
 useradmin:
   admins:
-    - etiennehomer
+#    - admin1
 #    - admin2

src/main/resources/db/changelog/changesets/changelog_2022-09-30T07:47:33Z.xml

@@ -0,0 +1,2 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-4.1.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd"/>

src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java

@@ -181,8 +181,6 @@ public void testGetConnections() throws Exception {
 
         assertEquals(2, userEntities.size());
 
-        UUID userId = userEntities.get(0).getId();
-
         mockMvc.perform(head("/" + UserAdminApi.API_VERSION + "/users/{sub}", USER_SUB))
                 .andExpect(status().isOk())
                 .andReturn();
@@ -203,10 +201,8 @@ public void testGetConnections() throws Exception {
         assertEquals(2, connectionEntities.size());
 
         connectionRepository.save(new ConnectionEntity(USER_SUB, LocalDateTime.now(), LocalDateTime.now(), true));
-
-        connectionRepository.save(new ConnectionEntity(USER_SUB, LocalDateTime.now(), LocalDateTime.now(), true));
-
         connectionRepository.save(new ConnectionEntity(USER_SUB, LocalDateTime.now(), LocalDateTime.now(), true));
+        connectionRepository.save(new ConnectionEntity(USER_SUB2, LocalDateTime.now(), LocalDateTime.now(), false));
 
         connectionEntities = objectMapper.readValue(
                 mockMvc.perform(get("/" + UserAdminApi.API_VERSION + "/connections")