diff --git a/pom.xml b/pom.xml index 07a5802..e63c750 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.github.switcherac + com.switcherac switcher-ac 2.0.1-SNAPSHOT @@ -58,7 +58,7 @@ ${java.version} ${java.version} - 2.4.0 + 2.4.1 0.12.6 2.14.0 2.13.1 @@ -103,7 +103,7 @@ native-maven-plugin ${native-image-plugin.version} - com.github.switcherapi.ac.SwitcherAcApplication + com.switcherapi.ac.SwitcherAcApplication diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/PlanType.java b/src/main/java/com/github/switcherapi/ac/model/domain/PlanType.java deleted file mode 100644 index 194373a..0000000 --- a/src/main/java/com/github/switcherapi/ac/model/domain/PlanType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.switcherapi.ac.model.domain; - -public enum PlanType { - DEFAULT -} diff --git a/src/main/java/com/github/switcherapi/ac/SwitcherAcApplication.java b/src/main/java/com/switcherapi/ac/SwitcherAcApplication.java similarity index 81% rename from src/main/java/com/github/switcherapi/ac/SwitcherAcApplication.java rename to src/main/java/com/switcherapi/ac/SwitcherAcApplication.java index 93d2ff1..9151c3c 100644 --- a/src/main/java/com/github/switcherapi/ac/SwitcherAcApplication.java +++ b/src/main/java/com/switcherapi/ac/SwitcherAcApplication.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac; +package com.switcherapi.ac; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.service.PlanService; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.service.PlanService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -11,7 +11,7 @@ @SpringBootApplication @ConfigurationPropertiesScan -@ComponentScan(basePackages = { "com.github.switcherapi.ac" }) +@ComponentScan(basePackages = { "com.switcherapi.ac" }) @Slf4j public class SwitcherAcApplication implements CommandLineRunner { diff --git a/src/main/java/com/github/switcherapi/ac/config/AppConfig.java b/src/main/java/com/switcherapi/ac/config/AppConfig.java similarity index 91% rename from src/main/java/com/github/switcherapi/ac/config/AppConfig.java rename to src/main/java/com/switcherapi/ac/config/AppConfig.java index 0aacad9..fa63822 100644 --- a/src/main/java/com/github/switcherapi/ac/config/AppConfig.java +++ b/src/main/java/com/switcherapi/ac/config/AppConfig.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.config; +package com.switcherapi.ac.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/github/switcherapi/ac/config/CacheConfig.java b/src/main/java/com/switcherapi/ac/config/CacheConfig.java similarity index 96% rename from src/main/java/com/github/switcherapi/ac/config/CacheConfig.java rename to src/main/java/com/switcherapi/ac/config/CacheConfig.java index 0e85ff4..1775fe8 100644 --- a/src/main/java/com/github/switcherapi/ac/config/CacheConfig.java +++ b/src/main/java/com/switcherapi/ac/config/CacheConfig.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.config; +package com.switcherapi.ac.config; import com.github.benmanes.caffeine.cache.Caffeine; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/github/switcherapi/ac/config/OpenAPIConfiguration.java b/src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java similarity index 97% rename from src/main/java/com/github/switcherapi/ac/config/OpenAPIConfiguration.java rename to src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java index 4daa9dc..4c4902b 100644 --- a/src/main/java/com/github/switcherapi/ac/config/OpenAPIConfiguration.java +++ b/src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.config; +package com.switcherapi.ac.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/com/github/switcherapi/ac/config/SecurityConfig.java b/src/main/java/com/switcherapi/ac/config/SecurityConfig.java similarity index 91% rename from src/main/java/com/github/switcherapi/ac/config/SecurityConfig.java rename to src/main/java/com/switcherapi/ac/config/SecurityConfig.java index 628e4fc..b323644 100644 --- a/src/main/java/com/github/switcherapi/ac/config/SecurityConfig.java +++ b/src/main/java/com/switcherapi/ac/config/SecurityConfig.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.config; +package com.switcherapi.ac.config; -import com.github.switcherapi.ac.repository.AdminRepository; -import com.github.switcherapi.ac.service.security.JwtTokenAuthenticationFilter; -import com.github.switcherapi.ac.service.security.JwtTokenService; -import com.github.switcherapi.ac.util.Roles; +import com.switcherapi.ac.repository.AdminRepository; +import com.switcherapi.ac.service.security.JwtTokenAuthenticationFilter; +import com.switcherapi.ac.service.security.JwtTokenService; +import com.switcherapi.ac.util.Roles; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.ReactiveAuthenticationManager; diff --git a/src/main/java/com/github/switcherapi/ac/config/ServiceConfig.java b/src/main/java/com/switcherapi/ac/config/ServiceConfig.java similarity index 91% rename from src/main/java/com/github/switcherapi/ac/config/ServiceConfig.java rename to src/main/java/com/switcherapi/ac/config/ServiceConfig.java index 967b53a..f38e481 100644 --- a/src/main/java/com/github/switcherapi/ac/config/ServiceConfig.java +++ b/src/main/java/com/switcherapi/ac/config/ServiceConfig.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.config; +package com.switcherapi.ac.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/github/switcherapi/ac/config/SwitcherFeatures.java b/src/main/java/com/switcherapi/ac/config/SwitcherFeatures.java similarity index 91% rename from src/main/java/com/github/switcherapi/ac/config/SwitcherFeatures.java rename to src/main/java/com/switcherapi/ac/config/SwitcherFeatures.java index 9f9a992..e39d4c9 100644 --- a/src/main/java/com/github/switcherapi/ac/config/SwitcherFeatures.java +++ b/src/main/java/com/switcherapi/ac/config/SwitcherFeatures.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.config; +package com.switcherapi.ac.config; -import com.github.switcherapi.ac.util.FileUtil; +import com.switcherapi.ac.util.FileUtil; import com.switcherapi.client.SnapshotCallback; import com.switcherapi.client.SwitcherContextBase; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/github/switcherapi/ac/controller/AdminController.java b/src/main/java/com/switcherapi/ac/controller/AdminController.java similarity index 87% rename from src/main/java/com/github/switcherapi/ac/controller/AdminController.java rename to src/main/java/com/switcherapi/ac/controller/AdminController.java index be518f0..6043937 100644 --- a/src/main/java/com/github/switcherapi/ac/controller/AdminController.java +++ b/src/main/java/com/switcherapi/ac/controller/AdminController.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.model.dto.AccountDTO; -import com.github.switcherapi.ac.model.dto.GitHubAuthDTO; -import com.github.switcherapi.ac.service.AccountService; -import com.github.switcherapi.ac.service.AdminService; +import com.switcherapi.ac.model.dto.AccountDTO; +import com.switcherapi.ac.model.dto.GitHubAuthDTO; +import com.switcherapi.ac.service.AccountService; +import com.switcherapi.ac.service.AdminService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirements; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/github/switcherapi/ac/controller/ApiController.java b/src/main/java/com/switcherapi/ac/controller/ApiController.java similarity index 89% rename from src/main/java/com/github/switcherapi/ac/controller/ApiController.java rename to src/main/java/com/switcherapi/ac/controller/ApiController.java index a2bc0d1..1f620f5 100644 --- a/src/main/java/com/github/switcherapi/ac/controller/ApiController.java +++ b/src/main/java/com/switcherapi/ac/controller/ApiController.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.config.ServiceConfig; +import com.switcherapi.ac.config.ServiceConfig; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirements; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/github/switcherapi/ac/controller/GlobalExceptionHandler.java b/src/main/java/com/switcherapi/ac/controller/GlobalExceptionHandler.java similarity index 94% rename from src/main/java/com/github/switcherapi/ac/controller/GlobalExceptionHandler.java rename to src/main/java/com/switcherapi/ac/controller/GlobalExceptionHandler.java index 4a120cd..e00e8f4 100644 --- a/src/main/java/com/github/switcherapi/ac/controller/GlobalExceptionHandler.java +++ b/src/main/java/com/switcherapi/ac/controller/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/com/github/switcherapi/ac/controller/PlanController.java b/src/main/java/com/switcherapi/ac/controller/PlanController.java similarity index 86% rename from src/main/java/com/github/switcherapi/ac/controller/PlanController.java rename to src/main/java/com/switcherapi/ac/controller/PlanController.java index b6165d0..bd4d30e 100644 --- a/src/main/java/com/github/switcherapi/ac/controller/PlanController.java +++ b/src/main/java/com/switcherapi/ac/controller/PlanController.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.dto.PlanDTO; -import com.github.switcherapi.ac.model.mapper.DefaultMapper; -import com.github.switcherapi.ac.model.mapper.PlanMapper; -import com.github.switcherapi.ac.service.PlanService; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.dto.PlanDTO; +import com.switcherapi.ac.model.mapper.DefaultMapper; +import com.switcherapi.ac.model.mapper.PlanMapper; +import com.switcherapi.ac.service.PlanService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/github/switcherapi/ac/controller/SwitcherRelayController.java b/src/main/java/com/switcherapi/ac/controller/SwitcherRelayController.java similarity index 86% rename from src/main/java/com/github/switcherapi/ac/controller/SwitcherRelayController.java rename to src/main/java/com/switcherapi/ac/controller/SwitcherRelayController.java index 8aff778..8340ffd 100644 --- a/src/main/java/com/github/switcherapi/ac/controller/SwitcherRelayController.java +++ b/src/main/java/com/switcherapi/ac/controller/SwitcherRelayController.java @@ -1,12 +1,12 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.config.SwitcherFeatures; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.model.dto.RequestRelayDTO; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.service.AccountService; -import com.github.switcherapi.ac.service.ValidatorBasicService; -import com.github.switcherapi.ac.service.validator.ValidatorBuilderService; +import com.switcherapi.ac.config.SwitcherFeatures; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.model.dto.RequestRelayDTO; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.service.AccountService; +import com.switcherapi.ac.service.ValidatorBasicService; +import com.switcherapi.ac.service.validator.ValidatorBuilderService; import com.google.gson.Gson; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cache.annotation.Cacheable; @@ -17,7 +17,7 @@ import java.util.Map; -import static com.github.switcherapi.ac.model.domain.Feature.RATE_LIMIT; +import static com.switcherapi.ac.model.domain.Feature.RATE_LIMIT; @RestController @RequestMapping("switcher/v1") diff --git a/src/main/java/com/github/switcherapi/ac/model/GitHubDetail.java b/src/main/java/com/switcherapi/ac/model/GitHubDetail.java similarity index 90% rename from src/main/java/com/github/switcherapi/ac/model/GitHubDetail.java rename to src/main/java/com/switcherapi/ac/model/GitHubDetail.java index bd13bc9..f20eccc 100644 --- a/src/main/java/com/github/switcherapi/ac/model/GitHubDetail.java +++ b/src/main/java/com/switcherapi/ac/model/GitHubDetail.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model; +package com.switcherapi.ac.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/Account.java b/src/main/java/com/switcherapi/ac/model/domain/Account.java similarity index 92% rename from src/main/java/com/github/switcherapi/ac/model/domain/Account.java rename to src/main/java/com/switcherapi/ac/model/domain/Account.java index f24567b..0e093b7 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/Account.java +++ b/src/main/java/com/switcherapi/ac/model/domain/Account.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/Admin.java b/src/main/java/com/switcherapi/ac/model/domain/Admin.java similarity index 92% rename from src/main/java/com/github/switcherapi/ac/model/domain/Admin.java rename to src/main/java/com/switcherapi/ac/model/domain/Admin.java index 18fa031..b7ae47a 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/Admin.java +++ b/src/main/java/com/switcherapi/ac/model/domain/Admin.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.Indexed; diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/Feature.java b/src/main/java/com/switcherapi/ac/model/domain/Feature.java similarity index 85% rename from src/main/java/com/github/switcherapi/ac/model/domain/Feature.java rename to src/main/java/com/switcherapi/ac/model/domain/Feature.java index 366a521..c8e8876 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/Feature.java +++ b/src/main/java/com/switcherapi/ac/model/domain/Feature.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import lombok.Getter; -import static com.github.switcherapi.ac.util.Constants.MSG_INVALID_FEATURE; +import static com.switcherapi.ac.util.Constants.MSG_INVALID_FEATURE; @Getter public enum Feature { diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/FeaturePayload.java b/src/main/java/com/switcherapi/ac/model/domain/FeaturePayload.java similarity index 85% rename from src/main/java/com/github/switcherapi/ac/model/domain/FeaturePayload.java rename to src/main/java/com/switcherapi/ac/model/domain/FeaturePayload.java index 4265baa..0624503 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/FeaturePayload.java +++ b/src/main/java/com/switcherapi/ac/model/domain/FeaturePayload.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/Plan.java b/src/main/java/com/switcherapi/ac/model/domain/Plan.java similarity index 92% rename from src/main/java/com/github/switcherapi/ac/model/domain/Plan.java rename to src/main/java/com/switcherapi/ac/model/domain/Plan.java index 95fbff4..997d696 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/Plan.java +++ b/src/main/java/com/switcherapi/ac/model/domain/Plan.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -14,8 +14,8 @@ import java.util.Arrays; import java.util.List; -import static com.github.switcherapi.ac.model.domain.Feature.*; -import static com.github.switcherapi.ac.model.domain.PlanDefaults.*; +import static com.switcherapi.ac.model.domain.Feature.*; +import static com.switcherapi.ac.model.domain.PlanDefaults.*; @Generated @JsonInclude(Include.NON_NULL) diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/PlanAttribute.java b/src/main/java/com/switcherapi/ac/model/domain/PlanAttribute.java similarity index 84% rename from src/main/java/com/github/switcherapi/ac/model/domain/PlanAttribute.java rename to src/main/java/com/switcherapi/ac/model/domain/PlanAttribute.java index c322abc..ccb19f3 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/PlanAttribute.java +++ b/src/main/java/com/switcherapi/ac/model/domain/PlanAttribute.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/github/switcherapi/ac/model/domain/PlanDefaults.java b/src/main/java/com/switcherapi/ac/model/domain/PlanDefaults.java similarity index 89% rename from src/main/java/com/github/switcherapi/ac/model/domain/PlanDefaults.java rename to src/main/java/com/switcherapi/ac/model/domain/PlanDefaults.java index 1d066ce..698facb 100644 --- a/src/main/java/com/github/switcherapi/ac/model/domain/PlanDefaults.java +++ b/src/main/java/com/switcherapi/ac/model/domain/PlanDefaults.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.domain; +package com.switcherapi.ac.model.domain; import lombok.Getter; diff --git a/src/main/java/com/switcherapi/ac/model/domain/PlanType.java b/src/main/java/com/switcherapi/ac/model/domain/PlanType.java new file mode 100644 index 0000000..f040c1e --- /dev/null +++ b/src/main/java/com/switcherapi/ac/model/domain/PlanType.java @@ -0,0 +1,5 @@ +package com.switcherapi.ac.model.domain; + +public enum PlanType { + DEFAULT +} diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/AccountDTO.java b/src/main/java/com/switcherapi/ac/model/dto/AccountDTO.java similarity index 83% rename from src/main/java/com/github/switcherapi/ac/model/dto/AccountDTO.java rename to src/main/java/com/switcherapi/ac/model/dto/AccountDTO.java index f816b0f..6f886da 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/AccountDTO.java +++ b/src/main/java/com/switcherapi/ac/model/dto/AccountDTO.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/AdminDTO.java b/src/main/java/com/switcherapi/ac/model/dto/AdminDTO.java similarity index 82% rename from src/main/java/com/github/switcherapi/ac/model/dto/AdminDTO.java rename to src/main/java/com/switcherapi/ac/model/dto/AdminDTO.java index cbe7653..ac43b09 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/AdminDTO.java +++ b/src/main/java/com/switcherapi/ac/model/dto/AdminDTO.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/GitHubAuthDTO.java b/src/main/java/com/switcherapi/ac/model/dto/GitHubAuthDTO.java similarity index 84% rename from src/main/java/com/github/switcherapi/ac/model/dto/GitHubAuthDTO.java rename to src/main/java/com/switcherapi/ac/model/dto/GitHubAuthDTO.java index 235bce5..4f23fcf 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/GitHubAuthDTO.java +++ b/src/main/java/com/switcherapi/ac/model/dto/GitHubAuthDTO.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/Metadata.java b/src/main/java/com/switcherapi/ac/model/dto/Metadata.java similarity index 84% rename from src/main/java/com/github/switcherapi/ac/model/dto/Metadata.java rename to src/main/java/com/switcherapi/ac/model/dto/Metadata.java index b2cea51..b1bf25f 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/Metadata.java +++ b/src/main/java/com/switcherapi/ac/model/dto/Metadata.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/PlanDTO.java b/src/main/java/com/switcherapi/ac/model/dto/PlanDTO.java similarity index 71% rename from src/main/java/com/github/switcherapi/ac/model/dto/PlanDTO.java rename to src/main/java/com/switcherapi/ac/model/dto/PlanDTO.java index 2e10b74..03da149 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/PlanDTO.java +++ b/src/main/java/com/switcherapi/ac/model/dto/PlanDTO.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.github.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.domain.PlanAttribute; import java.util.List; diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/RequestRelayDTO.java b/src/main/java/com/switcherapi/ac/model/dto/RequestRelayDTO.java similarity index 82% rename from src/main/java/com/github/switcherapi/ac/model/dto/RequestRelayDTO.java rename to src/main/java/com/switcherapi/ac/model/dto/RequestRelayDTO.java index 3fbb0ac..5bd3af2 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/RequestRelayDTO.java +++ b/src/main/java/com/switcherapi/ac/model/dto/RequestRelayDTO.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/dto/ResponseRelayDTO.java b/src/main/java/com/switcherapi/ac/model/dto/ResponseRelayDTO.java similarity index 92% rename from src/main/java/com/github/switcherapi/ac/model/dto/ResponseRelayDTO.java rename to src/main/java/com/switcherapi/ac/model/dto/ResponseRelayDTO.java index 2faf2eb..30ee27e 100644 --- a/src/main/java/com/github/switcherapi/ac/model/dto/ResponseRelayDTO.java +++ b/src/main/java/com/switcherapi/ac/model/dto/ResponseRelayDTO.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.dto; +package com.switcherapi.ac.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/github/switcherapi/ac/model/mapper/AccountMapper.java b/src/main/java/com/switcherapi/ac/model/mapper/AccountMapper.java similarity index 58% rename from src/main/java/com/github/switcherapi/ac/model/mapper/AccountMapper.java rename to src/main/java/com/switcherapi/ac/model/mapper/AccountMapper.java index 713544a..bada822 100644 --- a/src/main/java/com/github/switcherapi/ac/model/mapper/AccountMapper.java +++ b/src/main/java/com/switcherapi/ac/model/mapper/AccountMapper.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.ac.model.mapper; +package com.switcherapi.ac.model.mapper; -import com.github.switcherapi.ac.model.domain.Account; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.dto.AccountDTO; +import com.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.dto.AccountDTO; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/github/switcherapi/ac/model/mapper/DefaultMapper.java b/src/main/java/com/switcherapi/ac/model/mapper/DefaultMapper.java similarity index 96% rename from src/main/java/com/github/switcherapi/ac/model/mapper/DefaultMapper.java rename to src/main/java/com/switcherapi/ac/model/mapper/DefaultMapper.java index c0cb981..a220e0b 100644 --- a/src/main/java/com/github/switcherapi/ac/model/mapper/DefaultMapper.java +++ b/src/main/java/com/switcherapi/ac/model/mapper/DefaultMapper.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.model.mapper; +package com.switcherapi.ac.model.mapper; import com.switcherapi.client.exception.SwitcherException; import lombok.experimental.UtilityClass; diff --git a/src/main/java/com/github/switcherapi/ac/model/mapper/GitHubAuthMapper.java b/src/main/java/com/switcherapi/ac/model/mapper/GitHubAuthMapper.java similarity index 66% rename from src/main/java/com/github/switcherapi/ac/model/mapper/GitHubAuthMapper.java rename to src/main/java/com/switcherapi/ac/model/mapper/GitHubAuthMapper.java index ce53034..25570d3 100644 --- a/src/main/java/com/github/switcherapi/ac/model/mapper/GitHubAuthMapper.java +++ b/src/main/java/com/switcherapi/ac/model/mapper/GitHubAuthMapper.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.ac.model.mapper; +package com.switcherapi.ac.model.mapper; -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.model.dto.AdminDTO; -import com.github.switcherapi.ac.model.dto.GitHubAuthDTO; +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.model.dto.AdminDTO; +import com.switcherapi.ac.model.dto.GitHubAuthDTO; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/github/switcherapi/ac/model/mapper/PlanMapper.java b/src/main/java/com/switcherapi/ac/model/mapper/PlanMapper.java similarity index 85% rename from src/main/java/com/github/switcherapi/ac/model/mapper/PlanMapper.java rename to src/main/java/com/switcherapi/ac/model/mapper/PlanMapper.java index 1e4c352..f18844c 100644 --- a/src/main/java/com/github/switcherapi/ac/model/mapper/PlanMapper.java +++ b/src/main/java/com/switcherapi/ac/model/mapper/PlanMapper.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.model.mapper; +package com.switcherapi.ac.model.mapper; -import com.github.switcherapi.ac.model.domain.Feature; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanAttribute; -import com.github.switcherapi.ac.model.dto.PlanDTO; +import com.switcherapi.ac.model.domain.Feature; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.dto.PlanDTO; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/github/switcherapi/ac/repository/AccountDao.java b/src/main/java/com/switcherapi/ac/repository/AccountDao.java similarity index 93% rename from src/main/java/com/github/switcherapi/ac/repository/AccountDao.java rename to src/main/java/com/switcherapi/ac/repository/AccountDao.java index 75d46a9..210131d 100644 --- a/src/main/java/com/github/switcherapi/ac/repository/AccountDao.java +++ b/src/main/java/com/switcherapi/ac/repository/AccountDao.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.repository; +package com.switcherapi.ac.repository; -import com.github.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.Account; import lombok.Getter; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; diff --git a/src/main/java/com/github/switcherapi/ac/repository/AccountRepository.java b/src/main/java/com/switcherapi/ac/repository/AccountRepository.java similarity index 71% rename from src/main/java/com/github/switcherapi/ac/repository/AccountRepository.java rename to src/main/java/com/switcherapi/ac/repository/AccountRepository.java index 719f908..e8d44ed 100644 --- a/src/main/java/com/github/switcherapi/ac/repository/AccountRepository.java +++ b/src/main/java/com/switcherapi/ac/repository/AccountRepository.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.repository; +package com.switcherapi.ac.repository; -import com.github.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.Account; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/github/switcherapi/ac/repository/AdminRepository.java b/src/main/java/com/switcherapi/ac/repository/AdminRepository.java similarity index 74% rename from src/main/java/com/github/switcherapi/ac/repository/AdminRepository.java rename to src/main/java/com/switcherapi/ac/repository/AdminRepository.java index 5429efc..2ade38d 100644 --- a/src/main/java/com/github/switcherapi/ac/repository/AdminRepository.java +++ b/src/main/java/com/switcherapi/ac/repository/AdminRepository.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.repository; +package com.switcherapi.ac.repository; -import com.github.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.model.domain.Admin; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/github/switcherapi/ac/repository/PlanDao.java b/src/main/java/com/switcherapi/ac/repository/PlanDao.java similarity index 92% rename from src/main/java/com/github/switcherapi/ac/repository/PlanDao.java rename to src/main/java/com/switcherapi/ac/repository/PlanDao.java index 9a313d3..267b1fc 100644 --- a/src/main/java/com/github/switcherapi/ac/repository/PlanDao.java +++ b/src/main/java/com/switcherapi/ac/repository/PlanDao.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.repository; +package com.switcherapi.ac.repository; -import com.github.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.Plan; import com.mongodb.client.result.DeleteResult; import lombok.Getter; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; diff --git a/src/main/java/com/github/switcherapi/ac/repository/PlanRepository.java b/src/main/java/com/switcherapi/ac/repository/PlanRepository.java similarity index 62% rename from src/main/java/com/github/switcherapi/ac/repository/PlanRepository.java rename to src/main/java/com/switcherapi/ac/repository/PlanRepository.java index 324f956..a396698 100644 --- a/src/main/java/com/github/switcherapi/ac/repository/PlanRepository.java +++ b/src/main/java/com/switcherapi/ac/repository/PlanRepository.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.repository; +package com.switcherapi.ac.repository; -import com.github.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.Plan; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; public interface PlanRepository extends ReactiveMongoRepository { diff --git a/src/main/java/com/github/switcherapi/ac/service/AccountService.java b/src/main/java/com/switcherapi/ac/service/AccountService.java similarity index 80% rename from src/main/java/com/github/switcherapi/ac/service/AccountService.java rename to src/main/java/com/switcherapi/ac/service/AccountService.java index b553e2f..1970096 100644 --- a/src/main/java/com/github/switcherapi/ac/service/AccountService.java +++ b/src/main/java/com/switcherapi/ac/service/AccountService.java @@ -1,19 +1,19 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.Account; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.model.dto.AccountDTO; -import com.github.switcherapi.ac.model.mapper.AccountMapper; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.model.dto.AccountDTO; +import com.switcherapi.ac.model.mapper.AccountMapper; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import static com.github.switcherapi.ac.util.Constants.ACCOUNT_NAME_NOT_FOUND; -import static com.github.switcherapi.ac.util.Constants.PLAN_NAME_NOT_FOUND; +import static com.switcherapi.ac.util.Constants.ACCOUNT_NAME_NOT_FOUND; +import static com.switcherapi.ac.util.Constants.PLAN_NAME_NOT_FOUND; @Service public class AccountService { diff --git a/src/main/java/com/github/switcherapi/ac/service/AdminService.java b/src/main/java/com/switcherapi/ac/service/AdminService.java similarity index 88% rename from src/main/java/com/github/switcherapi/ac/service/AdminService.java rename to src/main/java/com/switcherapi/ac/service/AdminService.java index ebbbe1b..72a4b8f 100644 --- a/src/main/java/com/github/switcherapi/ac/service/AdminService.java +++ b/src/main/java/com/switcherapi/ac/service/AdminService.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.ac.service; - -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.model.dto.GitHubAuthDTO; -import com.github.switcherapi.ac.model.mapper.GitHubAuthMapper; -import com.github.switcherapi.ac.repository.AdminRepository; -import com.github.switcherapi.ac.service.security.JwtTokenService; -import com.github.switcherapi.ac.util.Roles; +package com.switcherapi.ac.service; + +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.model.dto.GitHubAuthDTO; +import com.switcherapi.ac.model.mapper.GitHubAuthMapper; +import com.switcherapi.ac.repository.AdminRepository; +import com.switcherapi.ac.service.security.JwtTokenService; +import com.switcherapi.ac.util.Roles; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.ReactiveAuthenticationManager; @@ -18,9 +18,9 @@ import java.util.List; import java.util.Objects; -import static com.github.switcherapi.ac.config.SwitcherFeatures.SWITCHER_AC_ADM; -import static com.github.switcherapi.ac.config.SwitcherFeatures.getSwitcher; -import static com.github.switcherapi.ac.util.Constants.BEARER; +import static com.switcherapi.ac.config.SwitcherFeatures.SWITCHER_AC_ADM; +import static com.switcherapi.ac.config.SwitcherFeatures.getSwitcher; +import static com.switcherapi.ac.util.Constants.BEARER; @Slf4j @Service diff --git a/src/main/java/com/github/switcherapi/ac/service/GitHubService.java b/src/main/java/com/switcherapi/ac/service/GitHubService.java similarity index 82% rename from src/main/java/com/github/switcherapi/ac/service/GitHubService.java rename to src/main/java/com/switcherapi/ac/service/GitHubService.java index 7ab1135..23982e3 100644 --- a/src/main/java/com/github/switcherapi/ac/service/GitHubService.java +++ b/src/main/java/com/switcherapi/ac/service/GitHubService.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.GitHubDetail; -import com.github.switcherapi.ac.service.facades.GitHubFacade; +import com.switcherapi.ac.model.GitHubDetail; +import com.switcherapi.ac.service.facades.GitHubFacade; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; diff --git a/src/main/java/com/github/switcherapi/ac/service/PlanService.java b/src/main/java/com/switcherapi/ac/service/PlanService.java similarity index 88% rename from src/main/java/com/github/switcherapi/ac/service/PlanService.java rename to src/main/java/com/switcherapi/ac/service/PlanService.java index b565a82..2ef61ea 100644 --- a/src/main/java/com/github/switcherapi/ac/service/PlanService.java +++ b/src/main/java/com/switcherapi/ac/service/PlanService.java @@ -1,16 +1,16 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.model.mapper.PlanMapper; -import com.github.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.model.mapper.PlanMapper; +import com.switcherapi.ac.repository.PlanDao; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import static com.github.switcherapi.ac.util.Constants.PLAN_NAME_NOT_FOUND; +import static com.switcherapi.ac.util.Constants.PLAN_NAME_NOT_FOUND; @Service public class PlanService { diff --git a/src/main/java/com/github/switcherapi/ac/service/ValidatorBasicService.java b/src/main/java/com/switcherapi/ac/service/ValidatorBasicService.java similarity index 83% rename from src/main/java/com/github/switcherapi/ac/service/ValidatorBasicService.java rename to src/main/java/com/switcherapi/ac/service/ValidatorBasicService.java index 5cdecf6..00643bc 100644 --- a/src/main/java/com/github/switcherapi/ac/service/ValidatorBasicService.java +++ b/src/main/java/com/switcherapi/ac/service/ValidatorBasicService.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.*; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; -import com.github.switcherapi.ac.service.validator.AbstractValidatorService; +import com.switcherapi.ac.model.domain.*; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.service.validator.AbstractValidatorService; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -12,8 +12,8 @@ import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Mono; -import static com.github.switcherapi.ac.service.validator.SwitcherValidatorParams.*; -import static com.github.switcherapi.ac.util.Constants.*; +import static com.switcherapi.ac.service.validator.SwitcherValidatorParams.*; +import static com.switcherapi.ac.util.Constants.*; @Slf4j @Service diff --git a/src/main/java/com/github/switcherapi/ac/service/facades/GitHubFacade.java b/src/main/java/com/switcherapi/ac/service/facades/GitHubFacade.java similarity index 94% rename from src/main/java/com/github/switcherapi/ac/service/facades/GitHubFacade.java rename to src/main/java/com/switcherapi/ac/service/facades/GitHubFacade.java index ddf612c..984b049 100644 --- a/src/main/java/com/github/switcherapi/ac/service/facades/GitHubFacade.java +++ b/src/main/java/com/switcherapi/ac/service/facades/GitHubFacade.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.service.facades; +package com.switcherapi.ac.service.facades; -import com.github.switcherapi.ac.model.GitHubDetail; +import com.switcherapi.ac.model.GitHubDetail; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.function.Function; -import static com.github.switcherapi.ac.util.Sanitizer.*; +import static com.switcherapi.ac.util.Sanitizer.*; @Component @Slf4j diff --git a/src/main/java/com/github/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java b/src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java similarity index 97% rename from src/main/java/com/github/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java rename to src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java index e520480..0fa1f2e 100644 --- a/src/main/java/com/github/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java +++ b/src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.ac.service.security; +package com.switcherapi.ac.service.security; -import com.github.switcherapi.ac.util.Roles; +import com.switcherapi.ac.util.Roles; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/github/switcherapi/ac/service/security/JwtTokenService.java b/src/main/java/com/switcherapi/ac/service/security/JwtTokenService.java similarity index 96% rename from src/main/java/com/github/switcherapi/ac/service/security/JwtTokenService.java rename to src/main/java/com/switcherapi/ac/service/security/JwtTokenService.java index ed9a641..49a1706 100644 --- a/src/main/java/com/github/switcherapi/ac/service/security/JwtTokenService.java +++ b/src/main/java/com/switcherapi/ac/service/security/JwtTokenService.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.service.security; +package com.switcherapi.ac.service.security; -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.repository.AdminRepository; +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.repository.AdminRepository; import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/AbstractValidatorService.java b/src/main/java/com/switcherapi/ac/service/validator/AbstractValidatorService.java similarity index 78% rename from src/main/java/com/github/switcherapi/ac/service/validator/AbstractValidatorService.java rename to src/main/java/com/switcherapi/ac/service/validator/AbstractValidatorService.java index 8c74eb0..36d6b09 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/AbstractValidatorService.java +++ b/src/main/java/com/switcherapi/ac/service/validator/AbstractValidatorService.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.ac.service.validator; +package com.switcherapi.ac.service.validator; -import com.github.switcherapi.ac.model.domain.Account; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Mono; @@ -12,8 +12,8 @@ import java.util.EnumMap; import java.util.Map; -import static com.github.switcherapi.ac.service.validator.SwitcherValidatorParams.ADMINID; -import static com.github.switcherapi.ac.util.Constants.ACCOUNT_NOT_FOUND; +import static com.switcherapi.ac.service.validator.SwitcherValidatorParams.ADMINID; +import static com.switcherapi.ac.util.Constants.ACCOUNT_NOT_FOUND; public abstract class AbstractValidatorService { diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/SwitcherValidator.java b/src/main/java/com/switcherapi/ac/service/validator/SwitcherValidator.java similarity index 87% rename from src/main/java/com/github/switcherapi/ac/service/validator/SwitcherValidator.java rename to src/main/java/com/switcherapi/ac/service/validator/SwitcherValidator.java index 9a81134..1dcbfc1 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/SwitcherValidator.java +++ b/src/main/java/com/switcherapi/ac/service/validator/SwitcherValidator.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.service.validator; +package com.switcherapi.ac.service.validator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/SwitcherValidatorParams.java b/src/main/java/com/switcherapi/ac/service/validator/SwitcherValidatorParams.java similarity index 56% rename from src/main/java/com/github/switcherapi/ac/service/validator/SwitcherValidatorParams.java rename to src/main/java/com/switcherapi/ac/service/validator/SwitcherValidatorParams.java index 74a1e68..340af2d 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/SwitcherValidatorParams.java +++ b/src/main/java/com/switcherapi/ac/service/validator/SwitcherValidatorParams.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.service.validator; +package com.switcherapi.ac.service.validator; public enum SwitcherValidatorParams { ADMINID, diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/ValidatorBuilderService.java b/src/main/java/com/switcherapi/ac/service/validator/ValidatorBuilderService.java similarity index 76% rename from src/main/java/com/github/switcherapi/ac/service/validator/ValidatorBuilderService.java rename to src/main/java/com/switcherapi/ac/service/validator/ValidatorBuilderService.java index 2a4f735..a87873d 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/ValidatorBuilderService.java +++ b/src/main/java/com/switcherapi/ac/service/validator/ValidatorBuilderService.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.service.validator; +package com.switcherapi.ac.service.validator; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/ValidatorNativeBuilder.java b/src/main/java/com/switcherapi/ac/service/validator/ValidatorNativeBuilder.java similarity index 64% rename from src/main/java/com/github/switcherapi/ac/service/validator/ValidatorNativeBuilder.java rename to src/main/java/com/switcherapi/ac/service/validator/ValidatorNativeBuilder.java index 034ccdf..2ba2363 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/ValidatorNativeBuilder.java +++ b/src/main/java/com/switcherapi/ac/service/validator/ValidatorNativeBuilder.java @@ -1,13 +1,13 @@ -package com.github.switcherapi.ac.service.validator; +package com.switcherapi.ac.service.validator; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; -import com.github.switcherapi.ac.service.validator.beans.ValidateRateLimit; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.service.validator.beans.ValidateRateLimit; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import static com.github.switcherapi.ac.service.validator.beans.ValidateRateLimit.RATE_LIMIT_VALIDATOR; +import static com.switcherapi.ac.service.validator.beans.ValidateRateLimit.RATE_LIMIT_VALIDATOR; @Slf4j @Component diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/ValidatorRuntimeBuilder.java b/src/main/java/com/switcherapi/ac/service/validator/ValidatorRuntimeBuilder.java similarity index 89% rename from src/main/java/com/github/switcherapi/ac/service/validator/ValidatorRuntimeBuilder.java rename to src/main/java/com/switcherapi/ac/service/validator/ValidatorRuntimeBuilder.java index c6ef0bf..442d491 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/ValidatorRuntimeBuilder.java +++ b/src/main/java/com/switcherapi/ac/service/validator/ValidatorRuntimeBuilder.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.service.validator; +package com.switcherapi.ac.service.validator; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -17,7 +17,7 @@ @ConditionalOnProperty(value = "service.validators.native", havingValue = "false") public class ValidatorRuntimeBuilder extends ValidatorBuilderService { - private static final String VALIDATORS_PATH = "com.github.switcherapi.ac.service.validator.beans"; + private static final String VALIDATORS_PATH = "com.switcherapi.ac.service.validator.beans"; private final AutowireCapableBeanFactory autowireCapableBeanFactory; diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/beans/AbstractActiveCheckValidator.java b/src/main/java/com/switcherapi/ac/service/validator/beans/AbstractActiveCheckValidator.java similarity index 60% rename from src/main/java/com/github/switcherapi/ac/service/validator/beans/AbstractActiveCheckValidator.java rename to src/main/java/com/switcherapi/ac/service/validator/beans/AbstractActiveCheckValidator.java index fd64e9b..a8ac269 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/beans/AbstractActiveCheckValidator.java +++ b/src/main/java/com/switcherapi/ac/service/validator/beans/AbstractActiveCheckValidator.java @@ -1,17 +1,17 @@ -package com.github.switcherapi.ac.service.validator.beans; +package com.switcherapi.ac.service.validator.beans; -import static com.github.switcherapi.ac.service.validator.SwitcherValidatorParams.ADMINID; +import static com.switcherapi.ac.service.validator.SwitcherValidatorParams.ADMINID; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; import org.springframework.http.HttpStatus; import org.springframework.util.Assert; import org.springframework.web.server.ResponseStatusException; -import com.github.switcherapi.ac.model.domain.Account; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.service.validator.AbstractValidatorService; +import com.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.service.validator.AbstractValidatorService; import reactor.core.publisher.Mono; public abstract class AbstractActiveCheckValidator extends AbstractValidatorService { diff --git a/src/main/java/com/github/switcherapi/ac/service/validator/beans/ValidateRateLimit.java b/src/main/java/com/switcherapi/ac/service/validator/beans/ValidateRateLimit.java similarity index 59% rename from src/main/java/com/github/switcherapi/ac/service/validator/beans/ValidateRateLimit.java rename to src/main/java/com/switcherapi/ac/service/validator/beans/ValidateRateLimit.java index fd83b89..1f6c9e7 100644 --- a/src/main/java/com/github/switcherapi/ac/service/validator/beans/ValidateRateLimit.java +++ b/src/main/java/com/switcherapi/ac/service/validator/beans/ValidateRateLimit.java @@ -1,13 +1,13 @@ -package com.github.switcherapi.ac.service.validator.beans; +package com.switcherapi.ac.service.validator.beans; -import com.github.switcherapi.ac.model.domain.Account; -import com.github.switcherapi.ac.model.domain.Feature; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.dto.Metadata; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.repository.AccountDao; -import com.github.switcherapi.ac.repository.PlanDao; -import com.github.switcherapi.ac.service.validator.SwitcherValidator; +import com.switcherapi.ac.model.domain.Account; +import com.switcherapi.ac.model.domain.Feature; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.dto.Metadata; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.repository.AccountDao; +import com.switcherapi.ac.repository.PlanDao; +import com.switcherapi.ac.service.validator.SwitcherValidator; import reactor.core.publisher.Mono; @SwitcherValidator(ValidateRateLimit.RATE_LIMIT_VALIDATOR) diff --git a/src/main/java/com/github/switcherapi/ac/util/Constants.java b/src/main/java/com/switcherapi/ac/util/Constants.java similarity index 93% rename from src/main/java/com/github/switcherapi/ac/util/Constants.java rename to src/main/java/com/switcherapi/ac/util/Constants.java index 0f017c4..a61d941 100644 --- a/src/main/java/com/github/switcherapi/ac/util/Constants.java +++ b/src/main/java/com/switcherapi/ac/util/Constants.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.util; +package com.switcherapi.ac.util; import lombok.Getter; diff --git a/src/main/java/com/github/switcherapi/ac/util/FileUtil.java b/src/main/java/com/switcherapi/ac/util/FileUtil.java similarity index 91% rename from src/main/java/com/github/switcherapi/ac/util/FileUtil.java rename to src/main/java/com/switcherapi/ac/util/FileUtil.java index cc27d5d..dd91030 100644 --- a/src/main/java/com/github/switcherapi/ac/util/FileUtil.java +++ b/src/main/java/com/switcherapi/ac/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.util; +package com.switcherapi.ac.util; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; diff --git a/src/main/java/com/github/switcherapi/ac/util/Roles.java b/src/main/java/com/switcherapi/ac/util/Roles.java similarity index 62% rename from src/main/java/com/github/switcherapi/ac/util/Roles.java rename to src/main/java/com/switcherapi/ac/util/Roles.java index fdc23bf..c59f2e3 100644 --- a/src/main/java/com/github/switcherapi/ac/util/Roles.java +++ b/src/main/java/com/switcherapi/ac/util/Roles.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.util; +package com.switcherapi.ac.util; public enum Roles { ADMIN, ROLE_ADMIN, diff --git a/src/main/java/com/github/switcherapi/ac/util/Sanitizer.java b/src/main/java/com/switcherapi/ac/util/Sanitizer.java similarity index 95% rename from src/main/java/com/github/switcherapi/ac/util/Sanitizer.java rename to src/main/java/com/switcherapi/ac/util/Sanitizer.java index ef08c23..46ce880 100644 --- a/src/main/java/com/github/switcherapi/ac/util/Sanitizer.java +++ b/src/main/java/com/switcherapi/ac/util/Sanitizer.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.util; +package com.switcherapi.ac.util; import lombok.experimental.UtilityClass; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/resources/META-INF/native-image/reflect-config.json b/src/main/resources/META-INF/native-image/reflect-config.json index fb40dc2..a2f08c4 100644 --- a/src/main/resources/META-INF/native-image/reflect-config.json +++ b/src/main/resources/META-INF/native-image/reflect-config.json @@ -1,6 +1,6 @@ [ { - "name": "com.github.switcherapi.ac.model.domain.FeaturePayload", + "name": "com.switcherapi.ac.model.domain.FeaturePayload", "allDeclaredFields": true, "allPublicMethods": true, "methods": [ @@ -15,7 +15,7 @@ ] }, { - "name": "com.github.switcherapi.ac.model.GitHubDetail", + "name": "com.switcherapi.ac.model.GitHubDetail", "allDeclaredFields": true, "allPublicMethods": true, "methods": [ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 29793f4..c499431 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,8 @@ spring.profiles.active=@spring.profiles.active@ # Logging -logging.level.com.github.switcherapi.ac=INFO -logging.level.com.github.switcherapi.client=INFO +logging.level.com.switcherapi.ac=INFO +logging.level.com.switcherapi.client=INFO # Server settings spring.application.name=switcher-ac @@ -45,7 +45,7 @@ management.endpoint.health.group.custom.show-details=always # Switcher API settings switcher.relay_code=${SWITCHER_RELAY_CODE:[relay_code]} -switcher.contextLocation=com.github.switcherapi.ac.config.SwitcherFeatures +switcher.contextLocation=com.switcherapi.ac.config.SwitcherFeatures switcher.url=${SWITCHER_URL} switcher.apikey=${SWITCHER_KEY} switcher.domain=Switcher API diff --git a/src/test/java/com/github/switcherapi/ac/AcMockWebServer.java b/src/test/java/com/switcherapi/ac/AcMockWebServer.java similarity index 96% rename from src/test/java/com/github/switcherapi/ac/AcMockWebServer.java rename to src/test/java/com/switcherapi/ac/AcMockWebServer.java index 3a4448b..222dd27 100644 --- a/src/test/java/com/github/switcherapi/ac/AcMockWebServer.java +++ b/src/test/java/com/switcherapi/ac/AcMockWebServer.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.ac; +package com.switcherapi.ac; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.switcherapi.ac.model.GitHubDetail; +import com.switcherapi.ac.model.GitHubDetail; import lombok.extern.slf4j.Slf4j; import mockwebserver3.MockResponse; import mockwebserver3.MockWebServer; diff --git a/src/test/java/com/github/switcherapi/ac/PlanUtilsTests.java b/src/test/java/com/switcherapi/ac/PlanUtilsTests.java similarity index 83% rename from src/test/java/com/github/switcherapi/ac/PlanUtilsTests.java rename to src/test/java/com/switcherapi/ac/PlanUtilsTests.java index 09f3722..0875628 100644 --- a/src/test/java/com/github/switcherapi/ac/PlanUtilsTests.java +++ b/src/test/java/com/switcherapi/ac/PlanUtilsTests.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.ac; +package com.switcherapi.ac; -import com.github.switcherapi.ac.model.domain.PlanAttribute; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.dto.PlanDTO; -import com.github.switcherapi.ac.model.mapper.PlanMapper; +import com.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.dto.PlanDTO; +import com.switcherapi.ac.model.mapper.PlanMapper; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.List; -import static com.github.switcherapi.ac.model.domain.Feature.*; +import static com.switcherapi.ac.model.domain.Feature.*; import static org.assertj.core.api.Assertions.assertThat; @Execution(ExecutionMode.CONCURRENT) diff --git a/src/test/java/com/github/switcherapi/ac/controller/AdminAccountControllerTest.java b/src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java similarity index 91% rename from src/test/java/com/github/switcherapi/ac/controller/AdminAccountControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java index 4b68f27..ec1e9fe 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/AdminAccountControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java @@ -1,14 +1,14 @@ -package com.github.switcherapi.ac.controller; - -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.model.dto.AccountDTO; -import com.github.switcherapi.ac.service.AccountService; -import com.github.switcherapi.ac.service.AdminService; -import com.github.switcherapi.ac.service.PlanService; -import com.github.switcherapi.ac.service.security.JwtTokenService; -import com.github.switcherapi.ac.util.Roles; +package com.switcherapi.ac.controller; + +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.model.dto.AccountDTO; +import com.switcherapi.ac.service.AccountService; +import com.switcherapi.ac.service.AdminService; +import com.switcherapi.ac.service.PlanService; +import com.switcherapi.ac.service.security.JwtTokenService; +import com.switcherapi.ac.util.Roles; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/ac/controller/AdminAuthControllerTest.java b/src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/ac/controller/AdminAuthControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java index 23c9f62..de5e1e9 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/AdminAuthControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.ac.controller; - -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.model.dto.GitHubAuthDTO; -import com.github.switcherapi.ac.repository.AdminRepository; -import com.github.switcherapi.ac.service.AdminService; -import com.github.switcherapi.ac.service.security.JwtTokenService; -import com.github.switcherapi.ac.util.Roles; +package com.switcherapi.ac.controller; + +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.model.dto.GitHubAuthDTO; +import com.switcherapi.ac.repository.AdminRepository; +import com.switcherapi.ac.service.AdminService; +import com.switcherapi.ac.service.security.JwtTokenService; +import com.switcherapi.ac.util.Roles; import com.switcherapi.client.test.SwitcherTest; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java b/src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java index 08c6747..6376b09 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.AcMockWebServer; -import com.github.switcherapi.ac.config.SwitcherFeatures; -import com.github.switcherapi.ac.model.dto.GitHubAuthDTO; -import com.github.switcherapi.ac.service.facades.GitHubFacade; +import com.switcherapi.ac.AcMockWebServer; +import com.switcherapi.ac.config.SwitcherFeatures; +import com.switcherapi.ac.model.dto.GitHubAuthDTO; +import com.switcherapi.ac.service.facades.GitHubFacade; import com.switcherapi.client.test.SwitcherTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/ac/controller/AdminPlanControllerErrorTest.java b/src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/ac/controller/AdminPlanControllerErrorTest.java rename to src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java index e98c0d2..6473701 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/AdminPlanControllerErrorTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.service.PlanService; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.service.PlanService; import com.google.gson.Gson; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/ac/controller/ApiControllerTest.java b/src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java similarity index 95% rename from src/test/java/com/github/switcherapi/ac/controller/ApiControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java index c84ab43..a103736 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/ApiControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; diff --git a/src/test/java/com/github/switcherapi/ac/controller/ApiResourcesTest.java b/src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java similarity index 91% rename from src/test/java/com/github/switcherapi/ac/controller/ApiResourcesTest.java rename to src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java index a02aba5..e4e3902 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/ApiResourcesTest.java +++ b/src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.service.AdminService; -import com.github.switcherapi.ac.service.security.JwtTokenService; -import com.github.switcherapi.ac.util.Roles; +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.service.AdminService; +import com.switcherapi.ac.service.security.JwtTokenService; +import com.switcherapi.ac.util.Roles; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/ac/controller/PlanControllerTest.java b/src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java similarity index 92% rename from src/test/java/com/github/switcherapi/ac/controller/PlanControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java index 08f0271..5b2b6bf 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/PlanControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java @@ -1,13 +1,13 @@ -package com.github.switcherapi.ac.controller; - -import com.github.switcherapi.ac.controller.fixture.ControllerTestUtils; -import com.github.switcherapi.ac.model.domain.Admin; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.service.AdminService; -import com.github.switcherapi.ac.service.PlanService; -import com.github.switcherapi.ac.service.security.JwtTokenService; -import com.github.switcherapi.ac.util.Roles; +package com.switcherapi.ac.controller; + +import com.switcherapi.ac.controller.fixture.ControllerTestUtils; +import com.switcherapi.ac.model.domain.Admin; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.service.AdminService; +import com.switcherapi.ac.service.PlanService; +import com.switcherapi.ac.service.security.JwtTokenService; +import com.switcherapi.ac.util.Roles; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ import java.util.List; import java.util.Objects; -import static com.github.switcherapi.ac.model.domain.Feature.HISTORY; +import static com.switcherapi.ac.model.domain.Feature.HISTORY; import static org.junit.jupiter.api.Assertions.*; @SpringBootTest diff --git a/src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java similarity index 82% rename from src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java index f127f49..768c7bb 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.ac.controller; - -import com.github.switcherapi.ac.controller.fixture.ControllerTestUtils; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanAttribute; -import com.github.switcherapi.ac.model.dto.Metadata; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.service.PlanService; +package com.switcherapi.ac.controller; + +import com.switcherapi.ac.controller.fixture.ControllerTestUtils; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.dto.Metadata; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.service.PlanService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; @@ -19,8 +19,8 @@ import java.util.List; -import static com.github.switcherapi.ac.model.domain.Feature.DOMAIN; -import static com.github.switcherapi.ac.model.domain.Feature.RATE_LIMIT; +import static com.switcherapi.ac.model.domain.Feature.DOMAIN; +import static com.switcherapi.ac.model.domain.Feature.RATE_LIMIT; @SpringBootTest @AutoConfigureDataMongo diff --git a/src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java similarity index 84% rename from src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java rename to src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java index 1c07c03..c50fdf8 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java +++ b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.ac.controller; +package com.switcherapi.ac.controller; -import com.github.switcherapi.ac.config.SwitcherFeatures; -import com.github.switcherapi.ac.model.dto.RequestRelayDTO; -import com.github.switcherapi.ac.service.AccountService; -import com.github.switcherapi.ac.service.ValidatorBasicService; -import com.github.switcherapi.ac.service.validator.ValidatorBuilderService; +import com.switcherapi.ac.config.SwitcherFeatures; +import com.switcherapi.ac.model.dto.RequestRelayDTO; +import com.switcherapi.ac.service.AccountService; +import com.switcherapi.ac.service.ValidatorBasicService; +import com.switcherapi.ac.service.validator.ValidatorBuilderService; import com.google.gson.Gson; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayControllerTest.java b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java similarity index 91% rename from src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayControllerTest.java rename to src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java index 9be0f46..56a8159 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/SwitcherRelayControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java @@ -1,12 +1,12 @@ -package com.github.switcherapi.ac.controller; - -import com.github.switcherapi.ac.controller.fixture.ControllerTestUtils; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanAttribute; -import com.github.switcherapi.ac.model.dto.Metadata; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.service.AccountService; -import com.github.switcherapi.ac.service.PlanService; +package com.switcherapi.ac.controller; + +import com.switcherapi.ac.controller.fixture.ControllerTestUtils; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.dto.Metadata; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.service.AccountService; +import com.switcherapi.ac.service.PlanService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; @@ -20,8 +20,8 @@ import java.util.List; -import static com.github.switcherapi.ac.model.domain.Feature.DOMAIN; -import static com.github.switcherapi.ac.model.domain.Feature.SWITCHER; +import static com.switcherapi.ac.model.domain.Feature.DOMAIN; +import static com.switcherapi.ac.model.domain.Feature.SWITCHER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/com/github/switcherapi/ac/controller/fixture/ControllerTestUtils.java b/src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java similarity index 89% rename from src/test/java/com/github/switcherapi/ac/controller/fixture/ControllerTestUtils.java rename to src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java index 9ba12c0..a4244f3 100644 --- a/src/test/java/com/github/switcherapi/ac/controller/fixture/ControllerTestUtils.java +++ b/src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java @@ -1,14 +1,14 @@ -package com.github.switcherapi.ac.controller.fixture; +package com.switcherapi.ac.controller.fixture; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.model.dto.PlanDTO; -import com.github.switcherapi.ac.model.dto.RequestRelayDTO; -import com.github.switcherapi.ac.model.dto.ResponseRelayDTO; -import com.github.switcherapi.ac.service.AccountService; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.model.dto.PlanDTO; +import com.switcherapi.ac.model.dto.RequestRelayDTO; +import com.switcherapi.ac.model.dto.ResponseRelayDTO; +import com.switcherapi.ac.service.AccountService; import com.google.gson.Gson; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/com/github/switcherapi/ac/service/AccountServiceTest.java b/src/test/java/com/switcherapi/ac/service/AccountServiceTest.java similarity index 85% rename from src/test/java/com/github/switcherapi/ac/service/AccountServiceTest.java rename to src/test/java/com/switcherapi/ac/service/AccountServiceTest.java index 79b25bc..de280e6 100644 --- a/src/test/java/com/github/switcherapi/ac/service/AccountServiceTest.java +++ b/src/test/java/com/switcherapi/ac/service/AccountServiceTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.PlanAttribute; -import com.github.switcherapi.ac.model.domain.PlanType; -import com.github.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.domain.PlanType; +import com.switcherapi.ac.model.domain.Plan; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -12,8 +12,8 @@ import java.util.List; -import static com.github.switcherapi.ac.model.domain.Feature.DOMAIN; -import static com.github.switcherapi.ac.util.Constants.PLAN_NAME_NOT_FOUND; +import static com.switcherapi.ac.model.domain.Feature.DOMAIN; +import static com.switcherapi.ac.util.Constants.PLAN_NAME_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; @SpringBootTest diff --git a/src/test/java/com/github/switcherapi/ac/service/GitHubServiceTest.java b/src/test/java/com/switcherapi/ac/service/GitHubServiceTest.java similarity index 94% rename from src/test/java/com/github/switcherapi/ac/service/GitHubServiceTest.java rename to src/test/java/com/switcherapi/ac/service/GitHubServiceTest.java index 2e3a682..4de6c52 100644 --- a/src/test/java/com/github/switcherapi/ac/service/GitHubServiceTest.java +++ b/src/test/java/com/switcherapi/ac/service/GitHubServiceTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.AcMockWebServer; -import com.github.switcherapi.ac.service.facades.GitHubFacade; +import com.switcherapi.ac.AcMockWebServer; +import com.switcherapi.ac.service.facades.GitHubFacade; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; diff --git a/src/test/java/com/github/switcherapi/ac/service/ValidatorBasicServiceTest.java b/src/test/java/com/switcherapi/ac/service/ValidatorBasicServiceTest.java similarity index 92% rename from src/test/java/com/github/switcherapi/ac/service/ValidatorBasicServiceTest.java rename to src/test/java/com/switcherapi/ac/service/ValidatorBasicServiceTest.java index fa18587..60c3403 100644 --- a/src/test/java/com/github/switcherapi/ac/service/ValidatorBasicServiceTest.java +++ b/src/test/java/com/switcherapi/ac/service/ValidatorBasicServiceTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.Feature; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.model.domain.Plan; -import com.github.switcherapi.ac.model.domain.PlanAttribute; +import com.switcherapi.ac.model.domain.Feature; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.model.domain.Plan; +import com.switcherapi.ac.model.domain.PlanAttribute; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -17,9 +17,9 @@ import java.util.List; import java.util.stream.Stream; -import static com.github.switcherapi.ac.model.domain.Feature.*; -import static com.github.switcherapi.ac.model.domain.PlanDefaults.*; -import static com.github.switcherapi.ac.util.Constants.*; +import static com.switcherapi.ac.model.domain.Feature.*; +import static com.switcherapi.ac.model.domain.PlanDefaults.*; +import static com.switcherapi.ac.util.Constants.*; import static org.junit.jupiter.api.Assertions.*; @SpringBootTest diff --git a/src/test/java/com/github/switcherapi/ac/service/ValidatorNativeBuilderServiceTest.java b/src/test/java/com/switcherapi/ac/service/ValidatorNativeBuilderServiceTest.java similarity index 85% rename from src/test/java/com/github/switcherapi/ac/service/ValidatorNativeBuilderServiceTest.java rename to src/test/java/com/switcherapi/ac/service/ValidatorNativeBuilderServiceTest.java index 00f6802..e62be2a 100644 --- a/src/test/java/com/github/switcherapi/ac/service/ValidatorNativeBuilderServiceTest.java +++ b/src/test/java/com/switcherapi/ac/service/ValidatorNativeBuilderServiceTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.service.validator.ValidatorBuilderService; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.service.validator.ValidatorBuilderService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.web.server.ResponseStatusException; -import static com.github.switcherapi.ac.model.domain.Feature.RATE_LIMIT; +import static com.switcherapi.ac.model.domain.Feature.RATE_LIMIT; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/com/github/switcherapi/ac/service/ValidatorRuntimeBuilderServiceTest.java b/src/test/java/com/switcherapi/ac/service/ValidatorRuntimeBuilderServiceTest.java similarity index 85% rename from src/test/java/com/github/switcherapi/ac/service/ValidatorRuntimeBuilderServiceTest.java rename to src/test/java/com/switcherapi/ac/service/ValidatorRuntimeBuilderServiceTest.java index 622e8ae..59211e6 100644 --- a/src/test/java/com/github/switcherapi/ac/service/ValidatorRuntimeBuilderServiceTest.java +++ b/src/test/java/com/switcherapi/ac/service/ValidatorRuntimeBuilderServiceTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.ac.service; +package com.switcherapi.ac.service; -import com.github.switcherapi.ac.model.domain.FeaturePayload; -import com.github.switcherapi.ac.service.validator.ValidatorBuilderService; +import com.switcherapi.ac.model.domain.FeaturePayload; +import com.switcherapi.ac.service.validator.ValidatorBuilderService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.web.server.ResponseStatusException; -import static com.github.switcherapi.ac.model.domain.Feature.RATE_LIMIT; +import static com.switcherapi.ac.model.domain.Feature.RATE_LIMIT; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/com/github/switcherapi/ac/util/FileUtilTest.java b/src/test/java/com/switcherapi/ac/util/FileUtilTest.java similarity index 94% rename from src/test/java/com/github/switcherapi/ac/util/FileUtilTest.java rename to src/test/java/com/switcherapi/ac/util/FileUtilTest.java index feedf8e..547dd0b 100644 --- a/src/test/java/com/github/switcherapi/ac/util/FileUtilTest.java +++ b/src/test/java/com/switcherapi/ac/util/FileUtilTest.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.util; +package com.switcherapi.ac.util; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/ac/util/SanitizerTest.java b/src/test/java/com/switcherapi/ac/util/SanitizerTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/ac/util/SanitizerTest.java rename to src/test/java/com/switcherapi/ac/util/SanitizerTest.java index 395d8f9..b26c644 100644 --- a/src/test/java/com/github/switcherapi/ac/util/SanitizerTest.java +++ b/src/test/java/com/switcherapi/ac/util/SanitizerTest.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.ac.util; +package com.switcherapi.ac.util; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; @@ -7,7 +7,7 @@ import java.util.List; -import static com.github.switcherapi.ac.util.Sanitizer.*; +import static com.switcherapi.ac.util.Sanitizer.*; import static org.junit.jupiter.api.Assertions.assertEquals; @Execution(ExecutionMode.CONCURRENT) diff --git a/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java b/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java index ed2b21f..52ea496 100644 --- a/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java +++ b/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java @@ -27,7 +27,7 @@ static void readReflectConfig() throws Exception { @Test void shouldReadReflectConfig() { - assertTrue(reflectContent.contains("com.github.switcherapi.ac")); + assertTrue(reflectContent.contains("com.switcherapi.ac")); } @Test diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties index 98541cc..050dbd6 100644 --- a/src/test/resources/application-test.properties +++ b/src/test/resources/application-test.properties @@ -1,4 +1,4 @@ -logging.level.com.github.switcherapi.ac=DEBUG +logging.level.com.switcherapi.ac=DEBUG server.port=8070 de.flapdoodle.mongodb.embedded.version=8.0.3