Skip to content

Commit eb0384a

Browse files
tzolovtzolov
committed
checkstyle fixes
Signed-off-by: Christian Tzolov <[email protected]>
1 parent 5ab9b18 commit eb0384a

File tree

6 files changed

+69
-38
lines changed

6 files changed

+69
-38
lines changed

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/annotations/McpClientAnnotationScannerAutoConfiguration.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@
1616

1717
package org.springframework.ai.mcp.client.common.autoconfigure.annotations;
1818

19+
import java.lang.annotation.Annotation;
20+
import java.util.Set;
21+
1922
import org.springaicommunity.mcp.annotation.McpElicitation;
2023
import org.springaicommunity.mcp.annotation.McpLogging;
2124
import org.springaicommunity.mcp.annotation.McpProgress;
2225
import org.springaicommunity.mcp.annotation.McpSampling;
26+
2327
import org.springframework.ai.mcp.annotation.spring.scan.AbstractAnnotatedMethodBeanFactoryInitializationAotProcessor;
2428
import org.springframework.ai.mcp.annotation.spring.scan.AbstractAnnotatedMethodBeanPostProcessor;
2529
import org.springframework.ai.mcp.annotation.spring.scan.AbstractMcpAnnotatedBeans;
@@ -34,9 +38,6 @@
3438
import org.springframework.context.annotation.Bean;
3539
import org.springframework.context.annotation.ImportRuntimeHints;
3640

37-
import java.lang.annotation.Annotation;
38-
import java.util.Set;
39-
4041
/**
4142
* @author Christian Tzolov
4243
* @author Josh Long
@@ -52,15 +53,6 @@ public class McpClientAnnotationScannerAutoConfiguration {
5253
private static final Set<Class<? extends Annotation>> CLIENT_MCP_ANNOTATIONS = Set.of(McpLogging.class,
5354
McpSampling.class, McpElicitation.class, McpProgress.class);
5455

55-
static class AnnotationHints implements RuntimeHintsRegistrar {
56-
57-
@Override
58-
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
59-
CLIENT_MCP_ANNOTATIONS.forEach(an -> hints.reflection().registerType(an, MemberCategory.values()));
60-
}
61-
62-
}
63-
6456
@Bean
6557
@ConditionalOnMissingBean
6658
public ClientMcpAnnotatedBeans clientAnnotatedBeans() {
@@ -102,4 +94,13 @@ public ClientAnnotatedMethodBeanPostProcessor(ClientMcpAnnotatedBeans clientMcpA
10294

10395
}
10496

97+
static class AnnotationHints implements RuntimeHintsRegistrar {
98+
99+
@Override
100+
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
101+
CLIENT_MCP_ANNOTATIONS.forEach(an -> hints.reflection().registerType(an, MemberCategory.values()));
102+
}
103+
104+
}
105+
105106
}

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/java/org/springframework/ai/mcp/server/common/autoconfigure/annotations/McpServerAnnotationScannerAutoConfiguration.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@
1616

1717
package org.springframework.ai.mcp.server.common.autoconfigure.annotations;
1818

19+
import java.lang.annotation.Annotation;
20+
import java.util.Set;
21+
1922
import org.springaicommunity.mcp.annotation.McpComplete;
2023
import org.springaicommunity.mcp.annotation.McpPrompt;
2124
import org.springaicommunity.mcp.annotation.McpResource;
2225
import org.springaicommunity.mcp.annotation.McpTool;
26+
2327
import org.springframework.ai.mcp.annotation.spring.scan.AbstractAnnotatedMethodBeanFactoryInitializationAotProcessor;
2428
import org.springframework.ai.mcp.annotation.spring.scan.AbstractAnnotatedMethodBeanPostProcessor;
2529
import org.springframework.ai.mcp.annotation.spring.scan.AbstractMcpAnnotatedBeans;
@@ -34,9 +38,6 @@
3438
import org.springframework.context.annotation.Bean;
3539
import org.springframework.context.annotation.ImportRuntimeHints;
3640

37-
import java.lang.annotation.Annotation;
38-
import java.util.Set;
39-
4041
/**
4142
* @author Christian Tzolov
4243
* @author Josh Long
@@ -52,15 +53,6 @@ public class McpServerAnnotationScannerAutoConfiguration {
5253
private static final Set<Class<? extends Annotation>> SERVER_MCP_ANNOTATIONS = Set.of(McpTool.class,
5354
McpResource.class, McpPrompt.class, McpComplete.class);
5455

55-
static class AnnotationHints implements RuntimeHintsRegistrar {
56-
57-
@Override
58-
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
59-
SERVER_MCP_ANNOTATIONS.forEach(an -> hints.reflection().registerType(an, MemberCategory.values()));
60-
}
61-
62-
}
63-
6456
@Bean
6557
@ConditionalOnMissingBean
6658
public ServerMcpAnnotatedBeans serverAnnotatedBeanRegistry() {
@@ -102,4 +94,13 @@ public ServerAnnotatedMethodBeanPostProcessor(ServerMcpAnnotatedBeans serverMcpA
10294

10395
}
10496

97+
static class AnnotationHints implements RuntimeHintsRegistrar {
98+
99+
@Override
100+
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
101+
SERVER_MCP_ANNOTATIONS.forEach(an -> hints.reflection().registerType(an, MemberCategory.values()));
102+
}
103+
104+
}
105+
105106
}

‎mcp/common/src/main/java/org/springframework/ai/mcp/aot/McpHints.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import org.springframework.aot.hint.TypeReference;
2828
import org.springframework.lang.Nullable;
2929

30-
import static org.springframework.ai.aot.AiRuntimeHints.findInnerClassesFor;
31-
3230
/**
3331
* Runtime hints registrar for Model Context Protocol (MCP) schema classes.
3432
* <p>
@@ -65,7 +63,6 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
6563
var mcs = MemberCategory.values();
6664

6765
Set<TypeReference> typeReferences = AiRuntimeHints.findInnerClassesFor(McpSchema.class);
68-
System.out.println("typeReferences: " + typeReferences + "(" + typeReferences.size() + ")");
6966
for (var tr : typeReferences) {
7067
hints.reflection().registerType(tr, mcs);
7168
}

‎mcp/mcp-annotations-spring/src/main/java/org/springframework/ai/mcp/annotation/spring/scan/AbstractAnnotatedMethodBeanFactoryInitializationAotProcessor.java‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,33 @@
1+
/*
2+
* Copyright 2025-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package org.springframework.ai.mcp.annotation.spring.scan;
218

19+
import java.lang.annotation.Annotation;
20+
import java.util.ArrayList;
21+
import java.util.List;
22+
import java.util.Set;
23+
324
import org.springframework.aot.hint.MemberCategory;
425
import org.springframework.aot.hint.RuntimeHints;
526
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
627
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
728
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
829
import org.springframework.core.log.LogAccessor;
930

10-
import java.lang.annotation.Annotation;
11-
import java.util.ArrayList;
12-
import java.util.List;
13-
import java.util.Set;
14-
1531
/**
1632
* @author Josh Long
1733
*/

‎mcp/mcp-annotations-spring/src/main/java/org/springframework/ai/mcp/annotation/spring/scan/AbstractAnnotatedMethodBeanPostProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package org.springframework.ai.mcp.annotation.spring.scan;
1818

19+
import java.lang.annotation.Annotation;
20+
import java.util.Set;
21+
1922
import org.springframework.aop.support.AopUtils;
2023
import org.springframework.beans.BeansException;
2124
import org.springframework.beans.factory.config.BeanPostProcessor;
2225
import org.springframework.util.Assert;
2326

24-
import java.lang.annotation.Annotation;
25-
import java.util.Set;
26-
2727
/**
2828
* @author Christian Tzolov
2929
* @author Josh Long

‎mcp/mcp-annotations-spring/src/main/java/org/springframework/ai/mcp/annotation/spring/scan/AnnotatedMethodDiscovery.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
1-
package org.springframework.ai.mcp.annotation.spring.scan;
1+
/*
2+
* Copyright 2025-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
216

3-
import org.springframework.core.annotation.AnnotationUtils;
4-
import org.springframework.util.ReflectionUtils;
17+
package org.springframework.ai.mcp.annotation.spring.scan;
518

619
import java.lang.annotation.Annotation;
720
import java.util.HashSet;
821
import java.util.Set;
922

23+
import org.springframework.core.annotation.AnnotationUtils;
24+
import org.springframework.util.ReflectionUtils;
25+
1026
class AnnotatedMethodDiscovery {
1127

1228
protected final Set<Class<? extends Annotation>> targetAnnotations;

0 commit comments

Comments
 (0)