Skip to content

Commit 4683232

Browse files
akenraakenra
committed
refactor: fix FieldMayBeFinal warnings across modules
- Mark fields as final where applicable (FieldMayBeFinal inspection) - Remove unnecessary wrappedFunctionDefinitionsCacheSize field in SimpleFunctionRegistry; constructor parameter captured by anonymous class - Make wrappedFunctionDefinitionsCacheSize configurable via property spring.cloud.function.registry.cache-size (default 1000) - Rename private static final fields to UPPER_CASE convention (BREEDS, NAMES, RESULTS, WEBFLUX, ERROR_ATTRIBUTES, HEADERS) Signed-off-by: akenra <37288280+akenra@users.noreply.github.com>
1 parent f415142 commit 4683232

62 files changed

Lines changed: 260 additions & 239 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.

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*/
5151
public final class AWSLambdaUtils {
5252

53-
private static Log logger = LogFactory.getLog(AWSLambdaUtils.class);
53+
private static final Log logger = LogFactory.getLog(AWSLambdaUtils.class);
5454

5555
static final String AWS_API_GATEWAY = "aws-api-gateway";
5656

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
*/
6868
public final class CustomRuntimeEventLoop implements SmartLifecycle {
6969

70-
private static Log logger = LogFactory.getLog(CustomRuntimeEventLoop.class);
70+
private static final Log logger = LogFactory.getLog(CustomRuntimeEventLoop.class);
7171

7272
static final String LAMBDA_VERSION_DATE = "2018-06-01";
7373
private static final String LAMBDA_ERROR_URL_TEMPLATE = "http://{0}/{1}/runtime/invocation/{2}/error";
@@ -84,7 +84,7 @@ public final class CustomRuntimeEventLoop implements SmartLifecycle {
8484

8585
private volatile boolean running;
8686

87-
private ExecutorService executor = Executors.newSingleThreadExecutor();
87+
private final ExecutorService executor = Executors.newSingleThreadExecutor();
8888

8989
private FunctionInvocationWrapper routingFunction;
9090

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeInitializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
public class CustomRuntimeInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
3333

34-
private static Log logger = LogFactory.getLog(CustomRuntimeInitializer.class);
34+
private static final Log logger = LogFactory.getLog(CustomRuntimeInitializer.class);
3535

3636
@Override
3737
public void initialize(GenericApplicationContext context) {

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
*/
5656
public class FunctionInvoker implements RequestStreamHandler {
5757

58-
private static Log logger = LogFactory.getLog(FunctionInvoker.class);
58+
private static final Log logger = LogFactory.getLog(FunctionInvoker.class);
5959

6060
private JsonMapper jsonMapper;
6161

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/LambdaDestinationResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
public class LambdaDestinationResolver implements DestinationResolver {
3737

38-
private static Log logger = LogFactory.getLog(LambdaDestinationResolver.class);
38+
private static final Log logger = LogFactory.getLog(LambdaDestinationResolver.class);
3939

4040
@Override
4141
public String destination(Supplier<?> supplier, String name, Object value) {

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoopTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*/
4444
public class CustomRuntimeEventLoopTest {
4545

46-
private String API_EVENT = "{\n"
46+
private final String API_EVENT = "{\n"
4747
+ " \"version\": \"1.0\",\n"
4848
+ " \"resource\": \"$default\",\n"
4949
+ " \"path\": \"/question\",\n"

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/test/java/org/springframework/cloud/function/adapter/azure/web/AzureWebProxyInvokerTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public Builder createResponseBuilder(HttpStatus status) {
121121
public static class BuilderStub implements Builder {
122122

123123
private HttpStatusType status;
124-
private Map<String, String> headers = new HashMap<>();
124+
private final Map<String, String> headers = new HashMap<>();
125125
private Object body;
126126

127127
@Override
@@ -151,9 +151,9 @@ public HttpResponseMessage build() {
151151

152152
public static class HttpResponseMessageStub implements HttpResponseMessage {
153153

154-
private HttpStatusType status;
155-
private Map<String, String> headers = new HashMap<>();
156-
private Object body;
154+
private final HttpStatusType status;
155+
private final Map<String, String> headers;
156+
private final Object body;
157157

158158
HttpResponseMessageStub(HttpStatusType status, Map<String, String> headers,
159159
Object body) {

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/test/java/org/springframework/cloud/function/adapter/azure/web/PetData.java‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -28,81 +28,81 @@ public final class PetData {
2828
private PetData() {
2929

3030
}
31-
private static List<String> breeds = new ArrayList<>();
31+
private static final List<String> BREEDS = new ArrayList<>();
3232
static {
33-
breeds.add("Afghan Hound");
34-
breeds.add("Beagle");
35-
breeds.add("Bernese Mountain Dog");
36-
breeds.add("Bloodhound");
37-
breeds.add("Dalmatian");
38-
breeds.add("Jack Russell Terrier");
39-
breeds.add("Norwegian Elkhound");
33+
BREEDS.add("Afghan Hound");
34+
BREEDS.add("Beagle");
35+
BREEDS.add("Bernese Mountain Dog");
36+
BREEDS.add("Bloodhound");
37+
BREEDS.add("Dalmatian");
38+
BREEDS.add("Jack Russell Terrier");
39+
BREEDS.add("Norwegian Elkhound");
4040
}
4141

42-
private static List<String> names = new ArrayList<>();
42+
private static final List<String> NAMES = new ArrayList<>();
4343
static {
44-
names.add("Bailey");
45-
names.add("Bella");
46-
names.add("Max");
47-
names.add("Lucy");
48-
names.add("Charlie");
49-
names.add("Molly");
50-
names.add("Buddy");
51-
names.add("Daisy");
52-
names.add("Rocky");
53-
names.add("Maggie");
54-
names.add("Jake");
55-
names.add("Sophie");
56-
names.add("Jack");
57-
names.add("Sadie");
58-
names.add("Toby");
59-
names.add("Chloe");
60-
names.add("Cody");
61-
names.add("Bailey");
62-
names.add("Buster");
63-
names.add("Lola");
64-
names.add("Duke");
65-
names.add("Zoe");
66-
names.add("Cooper");
67-
names.add("Abby");
68-
names.add("Riley");
69-
names.add("Ginger");
70-
names.add("Harley");
71-
names.add("Roxy");
72-
names.add("Bear");
73-
names.add("Gracie");
74-
names.add("Tucker");
75-
names.add("Coco");
76-
names.add("Murphy");
77-
names.add("Sasha");
78-
names.add("Lucky");
79-
names.add("Lily");
80-
names.add("Oliver");
81-
names.add("Angel");
82-
names.add("Sam");
83-
names.add("Princess");
84-
names.add("Oscar");
85-
names.add("Emma");
86-
names.add("Teddy");
87-
names.add("Annie");
88-
names.add("Winston");
89-
names.add("Rosie");
44+
NAMES.add("Bailey");
45+
NAMES.add("Bella");
46+
NAMES.add("Max");
47+
NAMES.add("Lucy");
48+
NAMES.add("Charlie");
49+
NAMES.add("Molly");
50+
NAMES.add("Buddy");
51+
NAMES.add("Daisy");
52+
NAMES.add("Rocky");
53+
NAMES.add("Maggie");
54+
NAMES.add("Jake");
55+
NAMES.add("Sophie");
56+
NAMES.add("Jack");
57+
NAMES.add("Sadie");
58+
NAMES.add("Toby");
59+
NAMES.add("Chloe");
60+
NAMES.add("Cody");
61+
NAMES.add("Bailey");
62+
NAMES.add("Buster");
63+
NAMES.add("Lola");
64+
NAMES.add("Duke");
65+
NAMES.add("Zoe");
66+
NAMES.add("Cooper");
67+
NAMES.add("Abby");
68+
NAMES.add("Riley");
69+
NAMES.add("Ginger");
70+
NAMES.add("Harley");
71+
NAMES.add("Roxy");
72+
NAMES.add("Bear");
73+
NAMES.add("Gracie");
74+
NAMES.add("Tucker");
75+
NAMES.add("Coco");
76+
NAMES.add("Murphy");
77+
NAMES.add("Sasha");
78+
NAMES.add("Lucky");
79+
NAMES.add("Lily");
80+
NAMES.add("Oliver");
81+
NAMES.add("Angel");
82+
NAMES.add("Sam");
83+
NAMES.add("Princess");
84+
NAMES.add("Oscar");
85+
NAMES.add("Emma");
86+
NAMES.add("Teddy");
87+
NAMES.add("Annie");
88+
NAMES.add("Winston");
89+
NAMES.add("Rosie");
9090
}
9191

9292
public static List<String> getBreeds() {
93-
return breeds;
93+
return BREEDS;
9494
}
9595

9696
public static List<String> getNames() {
97-
return names;
97+
return NAMES;
9898
}
9999

100100
public static String getRandomBreed() {
101-
return breeds.get(ThreadLocalRandom.current().nextInt(0, breeds.size() - 1));
101+
return BREEDS.get(ThreadLocalRandom.current().nextInt(0, BREEDS.size() - 1));
102102
}
103103

104104
public static String getRandomName() {
105-
return names.get(ThreadLocalRandom.current().nextInt(0, names.size() - 1));
105+
return NAMES.get(ThreadLocalRandom.current().nextInt(0, NAMES.size() - 1));
106106
}
107107

108108
public static Date getRandomDoB() {

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/test/java/org/springframework/cloud/function/adapter/azure/web/TestExecutionContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
public class TestExecutionContext implements ExecutionContext {
2525

26-
private String name;
26+
private final String name;
2727

2828
public TestExecutionContext(String name) {
2929
this.name = name;

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureFunctionInstanceInjector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
public class AzureFunctionInstanceInjector implements FunctionInstanceInjector {
4444

45-
private static Log logger = LogFactory.getLog(AzureFunctionInstanceInjector.class);
45+
private static final Log logger = LogFactory.getLog(AzureFunctionInstanceInjector.class);
4646

4747
private static ConfigurableApplicationContext APPLICATION_CONTEXT;
4848

0 commit comments

Comments
 (0)