#138 Refactor com.ironoc.portfolio -> net.ironoc.portfolio (#139)

* #138 Refactor com.ironoc.portfolio -> net.ironoc.portfolio

* #138 Update pom.xml

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>conorheffron</groupId>
 	<artifactId>ironoc</artifactId>
-	<version>5.2.3</version>
+	<version>5.2.4</version>
 	<packaging>war</packaging>
 
 	<distributionManagement>

src/main/java/com/ironoc/portfolio/App.java → src/main/java/net/ironoc/portfolio/App.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio;
+package net.ironoc.portfolio;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/ironoc/portfolio/aws/AwsSecretManager.java → src/main/java/net/ironoc/portfolio/aws/AwsSecretManager.java

@@ -1,8 +1,8 @@
-package com.ironoc.portfolio.aws;
+package net.ironoc.portfolio.aws;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.logger.AbstractLogger;
 import org.springframework.stereotype.Component;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;

src/main/java/com/ironoc/portfolio/aws/SecretManager.java → src/main/java/net/ironoc/portfolio/aws/SecretManager.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.aws;
+package net.ironoc.portfolio.aws;
 
 public interface SecretManager {
 

src/main/java/com/ironoc/portfolio/client/Client.java → src/main/java/net/ironoc/portfolio/client/Client.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.client;
+package net.ironoc.portfolio.client;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;

src/main/java/com/ironoc/portfolio/client/GitClient.java → src/main/java/net/ironoc/portfolio/client/GitClient.java

@@ -1,11 +1,11 @@
-package com.ironoc.portfolio.client;
+package net.ironoc.portfolio.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
-import com.ironoc.portfolio.aws.SecretManager;
-import com.ironoc.portfolio.config.PropertyConfigI;
-import com.ironoc.portfolio.logger.AbstractLogger;
-import com.ironoc.portfolio.utils.UrlUtils;
+import net.ironoc.portfolio.aws.SecretManager;
+import net.ironoc.portfolio.config.PropertyConfigI;
+import net.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.utils.UrlUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/ironoc/portfolio/config/IronocConfiguration.java → src/main/java/net/ironoc/portfolio/config/IronocConfiguration.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
@@ -17,7 +17,7 @@
 @Configuration
 @EnableAsync
 @EnableScheduling
-@ComponentScan(basePackages = { "com.ironoc.portfolio" })
+@ComponentScan(basePackages = { "net.ironoc.portfolio" })
 public class IronocConfiguration implements WebMvcConfigurer {
 
     @Override

src/main/java/net/ironoc/portfolio/config/Properties.java

@@ -0,0 +1,20 @@
+package net.ironoc.portfolio.config;
+
+import lombok.Getter;
+
+@Getter
+public enum Properties {
+
+    GIT_API_ENDPOINT_REPOS("net.ironoc.portfolio.github.api.endpoint.repos"),
+    GIT_API_ENDPOINT_ISSUES("net.ironoc.portfolio.github.api.endpoint.issues"),
+    GIT_TIMEOUT_CONNECT ("net.ironoc.portfolio.github.timeout.connect"),
+    GIT_TIMEOUT_READ("net.ironoc.portfolio.github.timeout.read"),
+    GIT_INSTANCE_FOLLOW_REDIRECTS("net.ironoc.portfolio.github.instance-follow-redirects"),
+    GIT_FOLLOW_REDIRECTS("net.ironoc.portfolio.github.follow-redirects");
+
+    private String key;
+
+    Properties(String key) {
+        this.key = key;
+    }
+}

src/main/java/com/ironoc/portfolio/config/PropertyConfig.java → src/main/java/net/ironoc/portfolio/config/PropertyConfig.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;

src/main/java/com/ironoc/portfolio/config/PropertyConfigI.java → src/main/java/net/ironoc/portfolio/config/PropertyConfigI.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 public interface PropertyConfigI {
 

src/main/java/com/ironoc/portfolio/config/PropertyKey.java → src/main/java/net/ironoc/portfolio/config/PropertyKey.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 import org.springframework.stereotype.Component;
 

src/main/java/com/ironoc/portfolio/config/PropertyKeyI.java → src/main/java/net/ironoc/portfolio/config/PropertyKeyI.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 public interface PropertyKeyI {
 

src/main/java/com/ironoc/portfolio/config/PushStateResourceResolver.java → src/main/java/net/ironoc/portfolio/config/PushStateResourceResolver.java

@@ -1,6 +1,6 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
-import com.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.logger.AbstractLogger;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;

src/main/java/com/ironoc/portfolio/controller/GitProjectsController.java → src/main/java/net/ironoc/portfolio/controller/GitProjectsController.java

@@ -1,11 +1,11 @@
-package com.ironoc.portfolio.controller;
+package net.ironoc.portfolio.controller;
 
-import com.ironoc.portfolio.domain.RepositoryDetailDomain;
-import com.ironoc.portfolio.domain.RepositoryIssueDomain;
-import com.ironoc.portfolio.dto.RepositoryDetailDto;
-import com.ironoc.portfolio.dto.RepositoryIssueDto;
-import com.ironoc.portfolio.logger.AbstractLogger;
-import com.ironoc.portfolio.service.GitDetailsService;
+import net.ironoc.portfolio.domain.RepositoryDetailDomain;
+import net.ironoc.portfolio.domain.RepositoryIssueDomain;
+import net.ironoc.portfolio.dto.RepositoryDetailDto;
+import net.ironoc.portfolio.dto.RepositoryIssueDto;
+import net.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.service.GitDetailsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;

src/main/java/com/ironoc/portfolio/domain/RepositoryDetailDomain.java → src/main/java/net/ironoc/portfolio/domain/RepositoryDetailDomain.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.domain;
+package net.ironoc.portfolio.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

src/main/java/com/ironoc/portfolio/domain/RepositoryIssueDomain.java → src/main/java/net/ironoc/portfolio/domain/RepositoryIssueDomain.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.domain;
+package net.ironoc.portfolio.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

src/main/java/com/ironoc/portfolio/dto/OwnerDto.java → src/main/java/net/ironoc/portfolio/dto/OwnerDto.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.dto;
+package net.ironoc.portfolio.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/ironoc/portfolio/dto/RepositoryDetailDto.java → src/main/java/net/ironoc/portfolio/dto/RepositoryDetailDto.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.dto;
+package net.ironoc.portfolio.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/com/ironoc/portfolio/dto/RepositoryIssueDto.java → src/main/java/net/ironoc/portfolio/dto/RepositoryIssueDto.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.dto;
+package net.ironoc.portfolio.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/com/ironoc/portfolio/job/GitDetailsJob.java → src/main/java/net/ironoc/portfolio/job/GitDetailsJob.java

@@ -1,7 +1,7 @@
-package com.ironoc.portfolio.job;
+package net.ironoc.portfolio.job;
 
-import com.ironoc.portfolio.service.GitRepoCache;
-import com.ironoc.portfolio.service.GitDetails;
+import net.ironoc.portfolio.service.GitRepoCache;
+import net.ironoc.portfolio.service.GitDetails;
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;

src/main/java/com/ironoc/portfolio/job/GitDetailsRunnable.java → src/main/java/net/ironoc/portfolio/job/GitDetailsRunnable.java

@@ -1,9 +1,9 @@
-package com.ironoc.portfolio.job;
+package net.ironoc.portfolio.job;
 
-import com.ironoc.portfolio.logger.AbstractLogger;
-import com.ironoc.portfolio.service.GitRepoCache;
-import com.ironoc.portfolio.dto.RepositoryDetailDto;
-import com.ironoc.portfolio.service.GitDetails;
+import net.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.service.GitRepoCache;
+import net.ironoc.portfolio.dto.RepositoryDetailDto;
+import net.ironoc.portfolio.service.GitDetails;
 import jakarta.annotation.PreDestroy;
 import lombok.Getter;
 
@@ -39,11 +39,13 @@ private Set<String> populateUserIds() {
     @Override
     public void run() {
         info("GitDetailsRunnable running for userIds={}", getUserIds());
+        gitRepoCache.clear();
         for (String userId : userIds) {
             List<RepositoryDetailDto> dtos = gitDetails.getRepoDetails(userId);
-            info("-----Running GIT details job for userIds={}, repositoryDetailDtos={}", getUserIds(), dtos);
+            info("Running GIT details job for userIds={}, repositoryDetailDtos={}", getUserIds(), dtos);
             gitRepoCache.put(userId, gitDetails.mapRepositoriesToResponse(dtos));
         }
+        info("GitDetailsRunnable completed for userIds={}", getUserIds());
     }
 
     @PreDestroy

src/main/java/com/ironoc/portfolio/logger/AbstractLogger.java → src/main/java/net/ironoc/portfolio/logger/AbstractLogger.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.logger;
+package net.ironoc.portfolio.logger;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/ironoc/portfolio/logger/LoggerI.java → src/main/java/net/ironoc/portfolio/logger/LoggerI.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.logger;
+package net.ironoc.portfolio.logger;
 
 public interface LoggerI {
 

src/main/java/com/ironoc/portfolio/service/GitDetails.java → src/main/java/net/ironoc/portfolio/service/GitDetails.java

@@ -1,9 +1,9 @@
-package com.ironoc.portfolio.service;
+package net.ironoc.portfolio.service;
 
-import com.ironoc.portfolio.domain.RepositoryDetailDomain;
-import com.ironoc.portfolio.domain.RepositoryIssueDomain;
-import com.ironoc.portfolio.dto.RepositoryDetailDto;
-import com.ironoc.portfolio.dto.RepositoryIssueDto;
+import net.ironoc.portfolio.domain.RepositoryDetailDomain;
+import net.ironoc.portfolio.domain.RepositoryIssueDomain;
+import net.ironoc.portfolio.dto.RepositoryDetailDto;
+import net.ironoc.portfolio.dto.RepositoryIssueDto;
 
 import java.util.List;
 

src/main/java/com/ironoc/portfolio/service/GitDetailsService.java → src/main/java/net/ironoc/portfolio/service/GitDetailsService.java

@@ -1,15 +1,15 @@
-package com.ironoc.portfolio.service;
+package net.ironoc.portfolio.service;
 
 
-import com.ironoc.portfolio.client.Client;
-import com.ironoc.portfolio.config.PropertyConfigI;
-import com.ironoc.portfolio.domain.RepositoryDetailDomain;
-import com.ironoc.portfolio.domain.RepositoryIssueDomain;
-import com.ironoc.portfolio.dto.RepositoryDetailDto;
-import com.ironoc.portfolio.dto.RepositoryIssueDto;
-import com.ironoc.portfolio.job.GitDetailsRunnable;
-import com.ironoc.portfolio.logger.AbstractLogger;
-import com.ironoc.portfolio.utils.UrlUtils;
+import net.ironoc.portfolio.client.Client;
+import net.ironoc.portfolio.config.PropertyConfigI;
+import net.ironoc.portfolio.domain.RepositoryDetailDomain;
+import net.ironoc.portfolio.domain.RepositoryIssueDomain;
+import net.ironoc.portfolio.dto.RepositoryDetailDto;
+import net.ironoc.portfolio.dto.RepositoryIssueDto;
+import net.ironoc.portfolio.job.GitDetailsRunnable;
+import net.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.utils.UrlUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;

src/main/java/com/ironoc/portfolio/service/GitRepoCache.java → src/main/java/net/ironoc/portfolio/service/GitRepoCache.java

@@ -1,7 +1,6 @@
-package com.ironoc.portfolio.service;
+package net.ironoc.portfolio.service;
 
-import com.ironoc.portfolio.domain.RepositoryDetailDomain;
-import com.ironoc.portfolio.dto.RepositoryDetailDto;
+import net.ironoc.portfolio.domain.RepositoryDetailDomain;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -12,4 +11,6 @@ public interface GitRepoCache {
     void put(String userId, List<RepositoryDetailDomain> repositoryDetails);
 
     List<RepositoryDetailDomain> get(String userId);
+
+    void clear();
 }

src/main/java/com/ironoc/portfolio/service/GitRepoCacheService.java → src/main/java/net/ironoc/portfolio/service/GitRepoCacheService.java

@@ -1,6 +1,6 @@
-package com.ironoc.portfolio.service;
+package net.ironoc.portfolio.service;
 
-import com.ironoc.portfolio.domain.RepositoryDetailDomain;
+import net.ironoc.portfolio.domain.RepositoryDetailDomain;
 import jakarta.annotation.PreDestroy;
 import org.springframework.stereotype.Service;
 
@@ -27,8 +27,13 @@ public List<RepositoryDetailDomain> get(String userId) {
         return userGitDetails.get(userId);
     }
 
-    @PreDestroy
-    public void tearDown() {
+    @Override
+    public void clear() {
         this.userGitDetails.clear();
     }
+
+    @PreDestroy
+    private void tearDown() {
+        this.clear();
+    }
 }

src/main/java/com/ironoc/portfolio/utils/UrlUtils.java → src/main/java/net/ironoc/portfolio/utils/UrlUtils.java

@@ -1,6 +1,6 @@
-package com.ironoc.portfolio.utils;
+package net.ironoc.portfolio.utils;
 
-import com.ironoc.portfolio.logger.AbstractLogger;
+import net.ironoc.portfolio.logger.AbstractLogger;
 import org.springframework.stereotype.Component;
 
 import java.net.URL;

src/main/resources/application.yml

@@ -1,4 +1,4 @@
-com:
+net:
   ironoc:
     portfolio:
       github:

src/test/java/com/ironoc/portfolio/AppTest.java → src/test/java/net/ironoc/portfolio/AppTest.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio;
+package net.ironoc.portfolio;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;

src/test/java/com/ironoc/portfolio/aws/AwsSecretManagerTest.java → src/test/java/net/ironoc/portfolio/aws/AwsSecretManagerTest.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.aws;
+package net.ironoc.portfolio.aws;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/com/ironoc/portfolio/client/GitClientTest.java → src/test/java/net/ironoc/portfolio/client/GitClientTest.java

@@ -1,9 +1,9 @@
-package com.ironoc.portfolio.client;
+package net.ironoc.portfolio.client;
 
-import com.ironoc.portfolio.aws.SecretManager;
-import com.ironoc.portfolio.config.PropertyConfigI;
-import com.ironoc.portfolio.dto.RepositoryDetailDto;
-import com.ironoc.portfolio.utils.UrlUtils;
+import net.ironoc.portfolio.aws.SecretManager;
+import net.ironoc.portfolio.config.PropertyConfigI;
+import net.ironoc.portfolio.dto.RepositoryDetailDto;
+import net.ironoc.portfolio.utils.UrlUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;

src/test/java/com/ironoc/portfolio/config/IronocConfigurationTest.java → src/test/java/net/ironoc/portfolio/config/IronocConfigurationTest.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;

src/test/java/com/ironoc/portfolio/config/PropertyConfigTest.java → src/test/java/net/ironoc/portfolio/config/PropertyConfigTest.java

@@ -1,4 +1,4 @@
-package com.ironoc.portfolio.config;
+package net.ironoc.portfolio.config;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;