end of refactor

pom.xml

@@ -42,6 +42,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Swagger -->
         <dependency>
             <groupId>org.springdoc</groupId>

src/main/java/fr/insee/knowledge/configuration/MongoConfiguration.java

@@ -3,6 +3,7 @@
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
+import lombok.extern.slf4j.Slf4j;
 import org.bson.codecs.configuration.CodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.codecs.pojo.PojoCodecProvider;
@@ -17,9 +18,8 @@
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
 
 @Configuration
+@Slf4j
 public class MongoConfiguration {
-    private static final Logger logger = LoggerFactory.getLogger(MongoConfiguration.class);
-
     private CodecProvider pojoCodecProvider = PojoCodecProvider.builder().automatic(true).build();
     private CodecRegistry pojoCodecRegistry = fromRegistries(getDefaultCodecRegistry(), fromProviders(pojoCodecProvider));
 
@@ -29,14 +29,14 @@ public class MongoConfiguration {
     private String mongoUri;
 
     private MongoClient mongoClient() {
-        logger.info("Create mongoClient");
+        log.info("Create mongoClient");
         //we don't auth as admin
         return MongoClients.create(mongoUri + "?authSource=" + database);
     }
 
     @Bean(name = "mongoDatabase")
     public MongoDatabase mongoDatabase() {
-        logger.info("Connection to database");
+        log.info("Connection to database");
         return mongoClient().getDatabase(database).withCodecRegistry(pojoCodecRegistry);
     }
 

src/main/java/fr/insee/knowledge/configuration/PropertiesLogger.java

@@ -16,13 +16,12 @@
 
 @Slf4j
 public class PropertiesLogger implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesLogger.class);
 
     @Override
     public void onApplicationEvent(@NonNull ApplicationEnvironmentPreparedEvent event) {
         final Environment env = event.getEnvironment();
-        LOGGER.info("====== Environment and configuration ======");
-        LOGGER.info("Active profiles: {}", Arrays.toString(env.getActiveProfiles()));
+        log.info("====== Environment and configuration ======");
+        log.info("Active profiles: {}", Arrays.toString(env.getActiveProfiles()));
         final MutablePropertySources sources = ((AbstractEnvironment) env).getPropertySources();
         StreamSupport.stream(sources.spliterator(), false)
                 .filter(ps -> ps instanceof EnumerablePropertySource)
@@ -31,8 +30,8 @@ public void onApplicationEvent(@NonNull ApplicationEnvironmentPreparedEvent even
                 .distinct()
                 .filter(prop -> !(prop.contains("credentials") || prop.contains("password")))
                 .sorted()
-                .forEach(prop -> LOGGER.info("{}: {}", prop, env.getProperty(prop)));
-        LOGGER.info("===========================================");
+                .forEach(prop -> log.info("{}: {}", prop, env.getProperty(prop)));
+        log.info("===========================================");
     }
 
 }

src/main/java/fr/insee/knowledge/controller/hierarchy/GenericHierarchyController.java

@@ -21,7 +21,7 @@ public class GenericHierarchyController<T extends Hierarchy> {
 
     private final static Logger logger = LoggerFactory.getLogger(GenericHierarchyController.class);
 
-    private GenericHierarchyService<T> hierarchyService;
+    private final GenericHierarchyService<T> hierarchyService;
 
     public GenericHierarchyController(GenericHierarchyService<T> hierarchyService) {
         this.hierarchyService = hierarchyService;

src/main/java/fr/insee/knowledge/controller/hierarchy/HierarchyGsbpmController.java

@@ -14,10 +14,7 @@
 @Tag(name = "Hierarchy", description = "")
 @RestController
 @RequestMapping(path = "/hierarchy")
-public class HierarchyGsbpmController extends GenericHierarchyController<HierarchyGsbpm>{
-
-    private final static Logger logger = LoggerFactory.getLogger(HierarchyGsbpmController.class);
-
+public class HierarchyGsbpmController extends GenericHierarchyController<HierarchyGsbpm> {
     public HierarchyGsbpmController(HierarchyGsbpmServiceImpl hierarchyService) {
         super(hierarchyService);
     }

src/main/java/fr/insee/knowledge/controller/hierarchy/HierarchyProductController.java

@@ -14,10 +14,7 @@
 @Tag(name = "Hierarchy", description = "")
 @RestController
 @RequestMapping(path = "/hierarchy")
-public class HierarchyProductController extends GenericHierarchyController<HierarchyProduct>{
-
-    private final static Logger logger = LoggerFactory.getLogger(HierarchyProductController.class);
-
+public class HierarchyProductController extends GenericHierarchyController<HierarchyProduct> {
     public HierarchyProductController(HierarchyProductServiceImpl hierarchyService) {
         super(hierarchyService);
     }

src/main/java/fr/insee/knowledge/controller/hierarchy/HierarchyServiceController.java

@@ -14,10 +14,7 @@
 @Tag(name = "Hierarchy", description = "")
 @RestController
 @RequestMapping(path = "/hierarchy")
-public class HierarchyServiceController extends GenericHierarchyController<HierarchySvc>{
-
-    private final static Logger logger = LoggerFactory.getLogger(HierarchyServiceController.class);
-
+public class HierarchyServiceController extends GenericHierarchyController<HierarchySvc> {
     public HierarchyServiceController(HierarchySvcServiceImpl hierarchyService) {
         super(hierarchyService);
     }

src/main/java/fr/insee/knowledge/controller/hierarchy/HierarchyUserController.java

@@ -17,10 +17,7 @@
 @Tag(name = "Hierarchy", description = "")
 @RestController
 @RequestMapping(path = "/hierarchy")
-public class HierarchyUserController extends GenericHierarchyController<HierarchyUser>{
-
-    private final static Logger logger = LoggerFactory.getLogger(HierarchyUserController.class);
-
+public class HierarchyUserController extends GenericHierarchyController<HierarchyUser> {
     public HierarchyUserController(HierarchyUserServiceImpl hierarchyService) {
         super(hierarchyService);
     }

src/main/java/fr/insee/knowledge/dao/generic/DAO.java

@@ -25,9 +25,6 @@
  * @param <T> the type of the entity, it extends GenericIDLabel
  */
 public class DAO<T extends GenericIDLabel> implements IDao<T> {
-
-    private final static Logger LOGGER = LoggerFactory.getLogger(DAO.class);
-
     @Autowired
     private MongoDatabase mongoDatabase;
     protected MongoCollection<T> mongoCollection;

src/main/java/fr/insee/knowledge/service/GenericHierarchyService.java

@@ -3,11 +3,12 @@
 import fr.insee.knowledge.domain.hierarchy.Hierarchy;
 
 import java.io.IOException;
+import java.util.Optional;
 
 public interface GenericHierarchyService<T extends Hierarchy> {
     T getHierarchy();
 
     String importHierarchy() throws IOException;
 
-    Boolean isHierarchyExist(String id);
+    T findHierarchyById(String id);
 }

src/main/java/fr/insee/knowledge/service/impl/GenericHierarchyServiceImpl.java

@@ -1,43 +1,47 @@
 package fr.insee.knowledge.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.generic.DAO;
 import fr.insee.knowledge.domain.hierarchy.Hierarchy;
 import fr.insee.knowledge.service.GenericHierarchyService;
 import org.springframework.core.GenericTypeResolver;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Optional;
 
 public class GenericHierarchyServiceImpl<T extends Hierarchy> implements GenericHierarchyService<T> {
-    private DAO<T> hierarchyDAO;
+    private final DAO<T> hierarchyDAO;
+
+    private final String idHierarchy;
 
     private final ObjectMapper mapper;
+    private final String githubFileName;
 
     private String githubRepository;
 
-    public GenericHierarchyServiceImpl(DAO<T> hierarchyDAO, String githubRepository) {
+    public GenericHierarchyServiceImpl(DAO<T> hierarchyDAO, String idHierarchy, String githubFileName, String githubRepository) {
         this.hierarchyDAO = hierarchyDAO;
+        this.idHierarchy = idHierarchy;
+        this.githubFileName = githubFileName;
         this.githubRepository = githubRepository;
         this.mapper = new ObjectMapper();
     }
 
     @Override
     public T getHierarchy() {
-        return hierarchyDAO.findById(Constants.idUsersDocument);
+        return findHierarchyById(idHierarchy);
     }
 
     @Override
     public String importHierarchy() throws IOException {
         Class<T> tClass = (Class<T>) GenericTypeResolver.resolveTypeArgument(getClass(), GenericHierarchyServiceImpl.class);
-        T hierarchy = mapper.readValue(new URL(githubRepository + Constants.GithubUserFile), tClass);
+        T hierarchy = mapper.readValue(new URL(githubRepository + githubFileName), tClass);
         return hierarchyDAO.insertOrReplaceOne(hierarchy);
     }
 
-    //TODO
     @Override
-    public Boolean isHierarchyExist(String id) {
-        return null;
+    public T findHierarchyById(String id) {
+        return hierarchyDAO.findById(id);
     }
 }

src/main/java/fr/insee/knowledge/service/impl/HierarchyGsbpmServiceImpl.java

@@ -1,15 +1,15 @@
 package fr.insee.knowledge.service.impl;
 
-import fr.insee.knowledge.dao.generic.DAO;
+import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.impl.HierarchyGsbpmDAOImpl;
 import fr.insee.knowledge.domain.hierarchy.HierarchyGsbpm;
-import fr.insee.knowledge.domain.hierarchy.HierarchyUser;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Service
 public class HierarchyGsbpmServiceImpl extends GenericHierarchyServiceImpl<HierarchyGsbpm> {
+
     public HierarchyGsbpmServiceImpl(HierarchyGsbpmDAOImpl hierarchyDAO, @Value("${fr.insee.knowledge.git.access.rawrepository}") String githubRepository) {
-        super(hierarchyDAO, githubRepository);
+        super(hierarchyDAO, Constants.idGsbpmDocument, Constants.GithubGsbpmFile, githubRepository);
     }
 }

src/main/java/fr/insee/knowledge/service/impl/HierarchyProductServiceImpl.java

@@ -1,5 +1,6 @@
 package fr.insee.knowledge.service.impl;
 
+import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.impl.HierarchyProductDAOImpl;
 import fr.insee.knowledge.domain.hierarchy.HierarchyProduct;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,6 +9,6 @@
 @Service
 public class HierarchyProductServiceImpl extends GenericHierarchyServiceImpl<HierarchyProduct> {
     public HierarchyProductServiceImpl(HierarchyProductDAOImpl hierarchyDAO, @Value("${fr.insee.knowledge.git.access.rawrepository}") String githubRepository) {
-        super(hierarchyDAO, githubRepository);
+        super(hierarchyDAO, Constants.idProductsDocument, Constants.GithubProductsFile, githubRepository);
     }
 }

src/main/java/fr/insee/knowledge/service/impl/HierarchySvcServiceImpl.java

@@ -1,5 +1,6 @@
 package fr.insee.knowledge.service.impl;
 
+import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.impl.HierarchySvcDAOImpl;
 import fr.insee.knowledge.domain.hierarchy.HierarchySvc;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,6 +9,6 @@
 @Service
 public class HierarchySvcServiceImpl extends GenericHierarchyServiceImpl<HierarchySvc> {
     public HierarchySvcServiceImpl(HierarchySvcDAOImpl hierarchyDAO, @Value("${fr.insee.knowledge.git.access.rawrepository}") String githubRepository) {
-        super(hierarchyDAO, githubRepository);
+        super(hierarchyDAO, Constants.idServicesDocument, Constants.GithubServicesFile, githubRepository);
     }
 }

src/main/java/fr/insee/knowledge/service/impl/HierarchyUserServiceImpl.java

@@ -1,5 +1,6 @@
 package fr.insee.knowledge.service.impl;
 
+import fr.insee.knowledge.constants.Constants;
 import fr.insee.knowledge.dao.impl.HierarchyUserDAOImpl;
 import fr.insee.knowledge.domain.hierarchy.HierarchyUser;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,6 +9,6 @@
 @Service
 public class HierarchyUserServiceImpl extends GenericHierarchyServiceImpl<HierarchyUser> {
     public HierarchyUserServiceImpl(HierarchyUserDAOImpl hierarchyDAO, @Value("${fr.insee.knowledge.git.access.rawrepository}") String githubRepository) {
-        super(hierarchyDAO, githubRepository);
+        super(hierarchyDAO, Constants.idUsersDocument, Constants.GithubUserFile, githubRepository);
     }
 }