Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.switcherac</groupId>
<groupId>com.switcherac</groupId>
<artifactId>switcher-ac</artifactId>
<version>2.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -58,7 +58,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>

<switcher-client.version>2.4.0</switcher-client.version>
<switcher-client.version>2.4.1</switcher-client.version>
<jsonwebtoken.version>0.12.6</jsonwebtoken.version>
<joda-time.version>2.14.0</joda-time.version>
<gson.version>2.13.1</gson.version>
Expand Down Expand Up @@ -103,7 +103,7 @@
<artifactId>native-maven-plugin</artifactId>
<version>${native-image-plugin.version}</version>
<configuration>
<mainClass>com.github.switcherapi.ac.SwitcherAcApplication</mainClass>
<mainClass>com.switcherapi.ac.SwitcherAcApplication</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,7 +11,7 @@

@SpringBootApplication
@ConfigurationPropertiesScan
@ComponentScan(basePackages = { "com.github.switcherapi.ac" })
@ComponentScan(basePackages = { "com.switcherapi.ac" })
@Slf4j
public class SwitcherAcApplication implements CommandLineRunner {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.switcherapi.ac.config;
package com.switcherapi.ac.config;

import org.springframework.boot.context.properties.ConfigurationProperties;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.switcherapi.ac.model.domain;
package com.switcherapi.ac.model.domain;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.switcherapi.ac.model.domain;
package com.switcherapi.ac.model.domain;

import lombok.Getter;

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/switcherapi/ac/model/domain/PlanType.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.switcherapi.ac.model.domain;

public enum PlanType {
DEFAULT
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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<Plan, String> {
Expand Down
Loading