Skip to content

Commit ba7ff57

Browse files
committed
Refactor
1 parent 9e04622 commit ba7ff57

307 files changed

Lines changed: 1183 additions & 1338 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

backend/src/main/java/net/modtale/config/auth/ApiKeyAuthFilter.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
import jakarta.servlet.ServletException;
55
import jakarta.servlet.http.HttpServletRequest;
66
import jakarta.servlet.http.HttpServletResponse;
7+
import java.io.IOException;
8+
import java.util.ArrayList;
9+
import java.util.EnumSet;
10+
import java.util.List;
11+
import java.util.Map;
12+
import java.util.Set;
713
import net.modtale.exception.UnauthorizedException;
814
import net.modtale.model.user.ApiKey;
915
import net.modtale.model.user.User;
@@ -15,15 +21,8 @@
1521
import org.springframework.security.core.authority.SimpleGrantedAuthority;
1622
import org.springframework.security.core.context.SecurityContextHolder;
1723
import org.springframework.stereotype.Component;
18-
import org.springframework.web.servlet.HandlerExceptionResolver;
1924
import org.springframework.web.filter.OncePerRequestFilter;
20-
21-
import java.io.IOException;
22-
import java.util.ArrayList;
23-
import java.util.EnumSet;
24-
import java.util.List;
25-
import java.util.Map;
26-
import java.util.Set;
25+
import org.springframework.web.servlet.HandlerExceptionResolver;
2726

2827
@Component
2928
public class ApiKeyAuthFilter extends OncePerRequestFilter {

backend/src/main/java/net/modtale/config/auth/OAuth2Config.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ public class OAuth2Config {
1212
public OAuth2AuthorizedClientRepository authorizedClientRepository() {
1313
return new HttpSessionOAuth2AuthorizedClientRepository();
1414
}
15-
}
15+
}

backend/src/main/java/net/modtale/config/auth/PasswordEncoderConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ public class PasswordEncoderConfig {
1212
public PasswordEncoder passwordEncoder() {
1313
return new BCryptPasswordEncoder();
1414
}
15-
}
15+
}

backend/src/main/java/net/modtale/config/auth/SessionConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package net.modtale.config.auth;
22

3+
import java.time.Duration;
34
import org.slf4j.Logger;
45
import org.slf4j.LoggerFactory;
56
import org.springframework.context.annotation.Bean;
67
import org.springframework.context.annotation.Configuration;
78
import org.springframework.session.data.mongo.JdkMongoSessionConverter;
89
import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
910

10-
import java.time.Duration;
11-
1211
@Configuration
1312
@EnableMongoHttpSession(maxInactiveIntervalInSeconds = 2592000, collectionName = "modtale_sessions") // 30 days
1413
public class SessionConfig {
@@ -20,4 +19,4 @@ public JdkMongoSessionConverter mongoSessionConverter() {
2019
logger.info("Initialized JdkMongoSessionConverter for robust binary session storage.");
2120
return new JdkMongoSessionConverter(Duration.ofDays(30));
2221
}
23-
}
22+
}

backend/src/main/java/net/modtale/config/core/AsyncConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package net.modtale.config.core;
22

3+
import java.util.concurrent.Executor;
34
import org.springframework.context.annotation.Bean;
45
import org.springframework.context.annotation.Configuration;
56
import org.springframework.scheduling.annotation.EnableAsync;
67
import org.springframework.scheduling.annotation.EnableScheduling;
78
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
89

9-
import java.util.concurrent.Executor;
10-
1110
@Configuration
1211
@EnableAsync
1312
@EnableScheduling
@@ -23,4 +22,4 @@ public Executor taskExecutor() {
2322
executor.initialize();
2423
return executor;
2524
}
26-
}
25+
}

backend/src/main/java/net/modtale/config/core/CacheConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package net.modtale.config.core;
22

33
import com.github.benmanes.caffeine.cache.Caffeine;
4+
import java.util.concurrent.TimeUnit;
45
import org.springframework.cache.CacheManager;
56
import org.springframework.cache.annotation.EnableCaching;
67
import org.springframework.cache.caffeine.CaffeineCacheManager;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.context.annotation.Configuration;
910

10-
import java.util.concurrent.TimeUnit;
11-
1211
@Configuration
1312
@EnableCaching
1413
public class CacheConfig {

backend/src/main/java/net/modtale/config/core/OpenApiConfig.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@
66
import io.swagger.v3.oas.models.Paths;
77
import io.swagger.v3.oas.models.info.Info;
88
import io.swagger.v3.oas.models.info.License;
9-
import io.swagger.v3.oas.models.media.Content;
10-
import io.swagger.v3.oas.models.media.MediaType;
119
import io.swagger.v3.oas.models.media.ArraySchema;
1210
import io.swagger.v3.oas.models.media.ComposedSchema;
11+
import io.swagger.v3.oas.models.media.Content;
1312
import io.swagger.v3.oas.models.media.MapSchema;
13+
import io.swagger.v3.oas.models.media.MediaType;
1414
import io.swagger.v3.oas.models.media.Schema;
1515
import io.swagger.v3.oas.models.responses.ApiResponse;
1616
import io.swagger.v3.oas.models.security.SecurityScheme;
1717
import io.swagger.v3.oas.models.servers.Server;
1818
import io.swagger.v3.oas.models.tags.Tag;
19-
import org.springdoc.core.customizers.OpenApiCustomizer;
20-
import org.springframework.context.annotation.Bean;
21-
import org.springframework.context.annotation.Configuration;
22-
2319
import java.util.ArrayList;
2420
import java.util.LinkedHashMap;
2521
import java.util.LinkedHashSet;
2622
import java.util.List;
2723
import java.util.Locale;
2824
import java.util.Map;
2925
import java.util.Set;
26+
import org.springdoc.core.customizers.OpenApiCustomizer;
27+
import org.springframework.context.annotation.Bean;
28+
import org.springframework.context.annotation.Configuration;
3029

3130
@Configuration
3231
public class OpenApiConfig {

backend/src/main/java/net/modtale/config/db/DataSeeder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.mongodb.client.MongoDatabase;
77
import com.mongodb.client.model.Aggregates;
88
import com.mongodb.client.model.Filters;
9+
import java.util.stream.Collectors;
910
import net.modtale.config.properties.AppSeedingProperties;
1011
import net.modtale.model.project.ProjectClassification;
1112
import net.modtale.model.project.ProjectStatus;
@@ -24,7 +25,6 @@
2425
import org.springframework.stereotype.Component;
2526

2627
import java.util.*;
27-
import java.util.stream.Collectors;
2828

2929
@Component
3030
public class DataSeeder implements CommandLineRunner {

backend/src/main/java/net/modtale/config/db/MongoConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package net.modtale.config.db;
22

3+
import java.util.List;
34
import net.modtale.model.user.OAuthProvider;
45
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
67
import org.springframework.core.convert.converter.Converter;
78
import org.springframework.data.convert.ReadingConverter;
89
import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
910

10-
import java.util.List;
11-
1211
@Configuration
1312
public class MongoConfig {
1413

@@ -35,4 +34,4 @@ public OAuthProvider convert(String source) {
3534
}
3635
}
3736
}
38-
}
37+
}

backend/src/main/java/net/modtale/config/r2/R2Config.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.modtale.config.r2;
22

3+
import java.net.URI;
34
import net.modtale.config.properties.AppR2Properties;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
@@ -11,8 +12,6 @@
1112
import software.amazon.awssdk.services.s3.S3Client;
1213
import software.amazon.awssdk.services.s3.S3Configuration;
1314

14-
import java.net.URI;
15-
1615
@Configuration
1716
public class R2Config {
1817

0 commit comments

Comments
 (0)