Skip to content

Commit ef7db15

Browse files
sunyuhan1998sunyuhan1998
committed
fix: Fix code format
Signed-off-by: Sun Yuhan <[email protected]>
1 parent d7829e8 commit ef7db15

File tree

5 files changed

+80
-66
lines changed

5 files changed

+80
-66
lines changed

‎mcp/mcp-annotations-spring/src/test/java/org/springframework/ai/mcp/annotation/spring/AnnotationProviderUtilTests.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@
1616

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

19+
import java.lang.reflect.Method;
20+
import java.util.Arrays;
21+
1922
import org.junit.jupiter.api.Test;
2023
import org.junit.jupiter.api.extension.ExtendWith;
2124
import org.mockito.MockedStatic;
2225
import org.mockito.junit.jupiter.MockitoExtension;
23-
import org.springframework.aop.framework.ProxyFactory;
24-
import org.springframework.aop.support.AopUtils;
25-
26-
import java.lang.reflect.Method;
27-
import java.util.Arrays;
2826

2927
import static org.assertj.core.api.Assertions.assertThat;
3028
import static org.mockito.Mockito.mock;
3129
import static org.mockito.Mockito.mockStatic;
3230

31+
import org.springframework.aop.framework.ProxyFactory;
32+
import org.springframework.aop.support.AopUtils;
33+
3334
/**
3435
* Unit Tests for {@link AnnotationProviderUtil}.
3536
*

‎mcp/mcp-annotations-spring/src/test/java/org/springframework/ai/mcp/annotation/spring/AsyncMcpAnnotationProvidersTests.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,18 @@
1616

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

19+
import java.util.ArrayList;
20+
import java.util.List;
21+
1922
import io.modelcontextprotocol.server.McpServerFeatures;
2023
import io.modelcontextprotocol.server.McpStatelessServerFeatures;
2124
import org.junit.jupiter.api.Test;
2225
import org.junit.jupiter.api.extension.ExtendWith;
2326
import org.mockito.junit.jupiter.MockitoExtension;
27+
28+
import static org.junit.jupiter.api.Assertions.assertNotNull;
29+
import static org.junit.jupiter.api.Assertions.assertTrue;
30+
2431
import org.springaicommunity.mcp.method.changed.prompt.AsyncPromptListChangedSpecification;
2532
import org.springaicommunity.mcp.method.changed.resource.AsyncResourceListChangedSpecification;
2633
import org.springaicommunity.mcp.method.changed.tool.AsyncToolListChangedSpecification;
@@ -29,12 +36,6 @@
2936
import org.springaicommunity.mcp.method.progress.AsyncProgressSpecification;
3037
import org.springaicommunity.mcp.method.sampling.AsyncSamplingSpecification;
3138

32-
import java.util.ArrayList;
33-
import java.util.List;
34-
35-
import static org.junit.jupiter.api.Assertions.assertNotNull;
36-
import static org.junit.jupiter.api.Assertions.assertTrue;
37-
3839
/**
3940
* Unit Tests for {@link AsyncMcpAnnotationProviders}.
4041
*

‎mcp/mcp-annotations-spring/src/test/java/org/springframework/ai/mcp/annotation/spring/SyncMcpAnnotationProvidersTests.java‎

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

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

19+
import java.lang.reflect.Method;
20+
import java.util.ArrayList;
21+
import java.util.List;
22+
1923
import io.modelcontextprotocol.server.McpServerFeatures;
2024
import io.modelcontextprotocol.server.McpStatelessServerFeatures;
2125
import org.junit.jupiter.api.Test;
2226
import org.junit.jupiter.api.extension.ExtendWith;
2327
import org.mockito.MockedStatic;
2428
import org.mockito.junit.jupiter.MockitoExtension;
29+
30+
import static org.junit.jupiter.api.Assertions.assertNotNull;
31+
import static org.junit.jupiter.api.Assertions.assertTrue;
32+
import static org.mockito.ArgumentMatchers.any;
33+
import static org.mockito.Mockito.mockStatic;
34+
2535
import org.springaicommunity.mcp.method.changed.prompt.SyncPromptListChangedSpecification;
2636
import org.springaicommunity.mcp.method.changed.resource.SyncResourceListChangedSpecification;
2737
import org.springaicommunity.mcp.method.changed.tool.SyncToolListChangedSpecification;
@@ -30,15 +40,6 @@
3040
import org.springaicommunity.mcp.method.progress.SyncProgressSpecification;
3141
import org.springaicommunity.mcp.method.sampling.SyncSamplingSpecification;
3242

33-
import java.lang.reflect.Method;
34-
import java.util.ArrayList;
35-
import java.util.List;
36-
37-
import static org.junit.jupiter.api.Assertions.assertNotNull;
38-
import static org.junit.jupiter.api.Assertions.assertTrue;
39-
import static org.mockito.ArgumentMatchers.any;
40-
import static org.mockito.Mockito.mockStatic;
41-
4243
/**
4344
* Unit Tests for {@link SyncMcpAnnotationProviders}.
4445
*

‎mcp/mcp-annotations-spring/src/test/java/org/springframework/ai/mcp/annotation/spring/scan/AbstractAnnotatedMethodBeanPostProcessorTests.java‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,33 @@
1616

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

19+
import java.lang.annotation.Annotation;
20+
import java.lang.annotation.ElementType;
21+
import java.lang.annotation.Retention;
22+
import java.lang.annotation.RetentionPolicy;
23+
import java.lang.annotation.Target;
24+
import java.util.Collections;
25+
import java.util.HashSet;
26+
import java.util.Set;
27+
1928
import org.junit.jupiter.api.BeforeEach;
2029
import org.junit.jupiter.api.Test;
2130
import org.junit.jupiter.api.extension.ExtendWith;
2231
import org.mockito.ArgumentCaptor;
2332
import org.mockito.Mock;
2433
import org.mockito.junit.jupiter.MockitoExtension;
25-
import org.springframework.aop.framework.ProxyFactory;
2634

27-
import java.lang.annotation.*;
28-
import java.util.Collections;
29-
import java.util.HashSet;
30-
import java.util.Set;
31-
32-
import static org.junit.jupiter.api.Assertions.*;
35+
import static org.junit.jupiter.api.Assertions.assertEquals;
36+
import static org.junit.jupiter.api.Assertions.assertSame;
37+
import static org.junit.jupiter.api.Assertions.assertThrows;
38+
import static org.junit.jupiter.api.Assertions.assertTrue;
3339
import static org.mockito.ArgumentMatchers.any;
34-
import static org.mockito.Mockito.*;
40+
import static org.mockito.Mockito.never;
41+
import static org.mockito.Mockito.same;
42+
import static org.mockito.Mockito.times;
43+
import static org.mockito.Mockito.verify;
44+
45+
import org.springframework.aop.framework.ProxyFactory;
3546

3647
/**
3748
* Unit Tests for {@link AbstractAnnotatedMethodBeanPostProcessor}.
@@ -50,17 +61,17 @@ class AbstractAnnotatedMethodBeanPostProcessorTests {
5061

5162
@BeforeEach
5263
void setUp() {
53-
targetAnnotations = new HashSet<>();
54-
targetAnnotations.add(TestAnnotation.class);
64+
this.targetAnnotations = new HashSet<>();
65+
this.targetAnnotations.add(TestAnnotation.class);
5566

56-
processor = new AbstractAnnotatedMethodBeanPostProcessor(registry, targetAnnotations) {
67+
this.processor = new AbstractAnnotatedMethodBeanPostProcessor(this.registry, this.targetAnnotations) {
5768
};
5869
}
5970

6071
@Test
6172
void testConstructorWithNullRegistry() {
6273
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
63-
new AbstractAnnotatedMethodBeanPostProcessor(null, targetAnnotations) {
74+
new AbstractAnnotatedMethodBeanPostProcessor(null, this.targetAnnotations) {
6475
};
6576
});
6677
assertEquals("AnnotatedBeanRegistry must not be null", exception.getMessage());
@@ -69,7 +80,7 @@ void testConstructorWithNullRegistry() {
6980
@Test
7081
void testConstructorWithEmptyTargetAnnotations() {
7182
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
72-
new AbstractAnnotatedMethodBeanPostProcessor(registry, Collections.emptySet()) {
83+
new AbstractAnnotatedMethodBeanPostProcessor(this.registry, Collections.emptySet()) {
7384
};
7485
});
7586
assertEquals("Target annotations must not be empty", exception.getMessage());
@@ -79,30 +90,30 @@ void testConstructorWithEmptyTargetAnnotations() {
7990
void testPostProcessAfterInitializationWithoutAnnotations() {
8091
NoAnnotationBean bean = new NoAnnotationBean();
8192

82-
Object result = processor.postProcessAfterInitialization(bean, "testBean");
93+
Object result = this.processor.postProcessAfterInitialization(bean, "testBean");
8394

8495
assertSame(bean, result);
85-
verify(registry, never()).addMcpAnnotatedBean(any(), any());
96+
verify(this.registry, never()).addMcpAnnotatedBean(any(), any());
8697
}
8798

8899
@Test
89100
void testPostProcessAfterInitializationWithAnnotations() {
90101
AnnotatedBean bean = new AnnotatedBean();
91102

92-
Object result = processor.postProcessAfterInitialization(bean, "testBean");
103+
Object result = this.processor.postProcessAfterInitialization(bean, "testBean");
93104

94105
assertSame(bean, result);
95-
verify(registry, times(1)).addMcpAnnotatedBean(any(), any());
106+
verify(this.registry, times(1)).addMcpAnnotatedBean(any(), any());
96107
}
97108

98109
@Test
99110
void testPostProcessAfterInitializationWithMultipleMethods() {
100111
MultipleAnnotationBean bean = new MultipleAnnotationBean();
101112

102-
Object result = processor.postProcessAfterInitialization(bean, "testBean");
113+
Object result = this.processor.postProcessAfterInitialization(bean, "testBean");
103114

104115
assertSame(bean, result);
105-
verify(registry, times(1)).addMcpAnnotatedBean(any(), any());
116+
verify(this.registry, times(1)).addMcpAnnotatedBean(any(), any());
106117
}
107118

108119
@Test
@@ -112,20 +123,20 @@ void testPostProcessAfterInitializationWithProxy() {
112123
proxyFactory.setProxyTargetClass(true);
113124
Object proxy = proxyFactory.getProxy();
114125

115-
Object result = processor.postProcessAfterInitialization(proxy, "testBean");
126+
Object result = this.processor.postProcessAfterInitialization(proxy, "testBean");
116127

117128
assertSame(proxy, result);
118-
verify(registry, times(1)).addMcpAnnotatedBean(any(), any());
129+
verify(this.registry, times(1)).addMcpAnnotatedBean(any(), any());
119130
}
120131

121132
@Test
122133
void testCorrectAnnotationsAreCaptured() {
123134
AnnotatedBean bean = new AnnotatedBean();
124135

125-
processor.postProcessAfterInitialization(bean, "testBean");
136+
this.processor.postProcessAfterInitialization(bean, "testBean");
126137

127138
ArgumentCaptor<Set<Class<? extends Annotation>>> annotationsCaptor = ArgumentCaptor.forClass(Set.class);
128-
verify(registry).addMcpAnnotatedBean(same(bean), annotationsCaptor.capture());
139+
verify(this.registry).addMcpAnnotatedBean(same(bean), annotationsCaptor.capture());
129140

130141
Set<Class<? extends java.lang.annotation.Annotation>> capturedAnnotations = annotationsCaptor.getValue();
131142
assertEquals(1, capturedAnnotations.size());

‎mcp/mcp-annotations-spring/src/test/java/org/springframework/ai/mcp/annotation/spring/scan/AbstractMcpAnnotatedBeansTests.java‎

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

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

19-
import org.junit.jupiter.api.BeforeEach;
20-
import org.junit.jupiter.api.Test;
21-
2219
import java.lang.annotation.Annotation;
2320
import java.util.Collections;
2421
import java.util.HashSet;
2522
import java.util.List;
2623
import java.util.Set;
2724

25+
import org.junit.jupiter.api.BeforeEach;
26+
import org.junit.jupiter.api.Test;
27+
2828
import static org.junit.jupiter.api.Assertions.assertEquals;
2929
import static org.junit.jupiter.api.Assertions.assertTrue;
3030

@@ -39,7 +39,7 @@ class AbstractMcpAnnotatedBeansTests {
3939

4040
@BeforeEach
4141
void setUp() {
42-
annotatedBeans = new AbstractMcpAnnotatedBeans() {
42+
this.annotatedBeans = new AbstractMcpAnnotatedBeans() {
4343
};
4444
}
4545

@@ -50,61 +50,61 @@ void testAddMcpAnnotatedBean() {
5050
annotations.add(Deprecated.class);
5151
annotations.add(Override.class);
5252

53-
annotatedBeans.addMcpAnnotatedBean(bean, annotations);
53+
this.annotatedBeans.addMcpAnnotatedBean(bean, annotations);
5454

55-
assertEquals(1, annotatedBeans.getCount());
56-
assertTrue(annotatedBeans.getAllAnnotatedBeans().contains(bean));
57-
assertTrue(annotatedBeans.getBeansByAnnotation(Deprecated.class).contains(bean));
58-
assertTrue(annotatedBeans.getBeansByAnnotation(Override.class).contains(bean));
55+
assertEquals(1, this.annotatedBeans.getCount());
56+
assertTrue(this.annotatedBeans.getAllAnnotatedBeans().contains(bean));
57+
assertTrue(this.annotatedBeans.getBeansByAnnotation(Deprecated.class).contains(bean));
58+
assertTrue(this.annotatedBeans.getBeansByAnnotation(Override.class).contains(bean));
5959
}
6060

6161
@Test
6262
void testGetAllAnnotatedBeans() {
6363
Object bean1 = new Object();
6464
Object bean2 = new Object();
6565

66-
annotatedBeans.addMcpAnnotatedBean(bean1, Collections.singleton(Deprecated.class));
67-
annotatedBeans.addMcpAnnotatedBean(bean2, Collections.singleton(Override.class));
66+
this.annotatedBeans.addMcpAnnotatedBean(bean1, Collections.singleton(Deprecated.class));
67+
this.annotatedBeans.addMcpAnnotatedBean(bean2, Collections.singleton(Override.class));
6868

69-
List<Object> allBeans = annotatedBeans.getAllAnnotatedBeans();
69+
List<Object> allBeans = this.annotatedBeans.getAllAnnotatedBeans();
7070
assertEquals(2, allBeans.size());
7171
assertTrue(allBeans.contains(bean1));
7272
assertTrue(allBeans.contains(bean2));
7373

7474
allBeans.clear();
75-
assertEquals(2, annotatedBeans.getCount());
75+
assertEquals(2, this.annotatedBeans.getCount());
7676
}
7777

7878
@Test
7979
void testGetBeansByAnnotation() {
8080
Object bean1 = new Object();
8181
Object bean2 = new Object();
8282

83-
annotatedBeans.addMcpAnnotatedBean(bean1, Collections.singleton(Deprecated.class));
84-
annotatedBeans.addMcpAnnotatedBean(bean2, Set.of(Deprecated.class, Override.class));
83+
this.annotatedBeans.addMcpAnnotatedBean(bean1, Collections.singleton(Deprecated.class));
84+
this.annotatedBeans.addMcpAnnotatedBean(bean2, Set.of(Deprecated.class, Override.class));
8585

86-
List<Object> deprecatedBeans = annotatedBeans.getBeansByAnnotation(Deprecated.class);
86+
List<Object> deprecatedBeans = this.annotatedBeans.getBeansByAnnotation(Deprecated.class);
8787
assertEquals(2, deprecatedBeans.size());
8888
assertTrue(deprecatedBeans.contains(bean1));
8989
assertTrue(deprecatedBeans.contains(bean2));
9090

91-
List<Object> overrideBeans = annotatedBeans.getBeansByAnnotation(Override.class);
91+
List<Object> overrideBeans = this.annotatedBeans.getBeansByAnnotation(Override.class);
9292
assertEquals(1, overrideBeans.size());
9393
assertTrue(overrideBeans.contains(bean2));
9494

95-
List<Object> emptyList = annotatedBeans.getBeansByAnnotation(SuppressWarnings.class);
95+
List<Object> emptyList = this.annotatedBeans.getBeansByAnnotation(SuppressWarnings.class);
9696
assertTrue(emptyList.isEmpty());
9797
}
9898

9999
@Test
100100
void testGetCount() {
101-
assertEquals(0, annotatedBeans.getCount());
101+
assertEquals(0, this.annotatedBeans.getCount());
102102

103-
annotatedBeans.addMcpAnnotatedBean(new Object(), Collections.singleton(Deprecated.class));
104-
assertEquals(1, annotatedBeans.getCount());
103+
this.annotatedBeans.addMcpAnnotatedBean(new Object(), Collections.singleton(Deprecated.class));
104+
assertEquals(1, this.annotatedBeans.getCount());
105105

106-
annotatedBeans.addMcpAnnotatedBean(new Object(), Collections.singleton(Override.class));
107-
assertEquals(2, annotatedBeans.getCount());
106+
this.annotatedBeans.addMcpAnnotatedBean(new Object(), Collections.singleton(Override.class));
107+
assertEquals(2, this.annotatedBeans.getCount());
108108
}
109109

110110
}

0 commit comments

Comments
 (0)