Skip to content

Commit a402dfb

Browse files
codeboyzhoucodeboyzhou
committed
build(plugin): Introduce google-java-format to unify code style
1 parent fa47337 commit a402dfb

File tree

58 files changed

+1288
-1265
lines changed

Some content is hidden

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

58 files changed

+1288
-1265
lines changed

‎pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
5151
<maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
5252
<sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
53+
<spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
5354
<!--==================== dependency versions ======================-->
5455
<annotations.version>24.0.0</annotations.version>
5556
<guice.version>6.0.0</guice.version>
@@ -128,6 +129,27 @@
128129

129130
<build>
130131
<plugins>
132+
<plugin>
133+
<groupId>com.diffplug.spotless</groupId>
134+
<artifactId>spotless-maven-plugin</artifactId>
135+
<version>${spotless-maven-plugin.version}</version>
136+
<configuration>
137+
<java>
138+
<googleJavaFormat>
139+
<style>GOOGLE</style>
140+
<groupArtifact>com.google.googlejavaformat:google-java-format</groupArtifact>
141+
</googleJavaFormat>
142+
</java>
143+
</configuration>
144+
<executions>
145+
<execution>
146+
<goals>
147+
<goal>apply</goal>
148+
</goals>
149+
<phase>compile</phase>
150+
</execution>
151+
</executions>
152+
</plugin>
131153
<plugin>
132154
<groupId>com.github.ekryd.sortpom</groupId>
133155
<artifactId>sortpom-maven-plugin</artifactId>

‎src/main/java/com/github/codeboyzhou/mcp/declarative/McpServers.java‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,58 +23,57 @@
2323

2424
public class McpServers {
2525

26-
private static final Logger logger = LoggerFactory.getLogger(McpServers.class);
26+
private static final Logger logger = LoggerFactory.getLogger(McpServers.class);
2727

28-
private static final McpServers INSTANCE = new McpServers();
28+
private static final McpServers INSTANCE = new McpServers();
2929

30-
private static Injector injector;
30+
private static Injector injector;
3131

32-
public static McpServers run(Class<?> applicationMainClass, String[] args) {
33-
injector = Guice.createInjector(new GuiceInjectorModule(applicationMainClass));
34-
return INSTANCE;
35-
}
36-
37-
public void startStdioServer(McpServerInfo serverInfo) {
38-
McpStdioServerFactory factory = new McpStdioServerFactory();
39-
McpAsyncServer server = factory.create(serverInfo);
40-
registerComponents(server);
41-
}
32+
public static McpServers run(Class<?> applicationMainClass, String[] args) {
33+
injector = Guice.createInjector(new GuiceInjectorModule(applicationMainClass));
34+
return INSTANCE;
35+
}
4236

43-
public void startSseServer(McpSseServerInfo serverInfo) {
44-
McpHttpSseServerFactory factory = new McpHttpSseServerFactory();
45-
McpAsyncServer server = factory.create(serverInfo);
46-
registerComponents(server);
47-
}
37+
public void startStdioServer(McpServerInfo serverInfo) {
38+
McpStdioServerFactory factory = new McpStdioServerFactory();
39+
McpAsyncServer server = factory.create(serverInfo);
40+
registerComponents(server);
41+
}
4842

49-
public void startServer(String configFileName) {
50-
Assert.notNull(configFileName, "configFileName must not be null");
51-
doStartServer(new YAMLConfigurationLoader(configFileName).getConfig());
52-
}
43+
public void startSseServer(McpSseServerInfo serverInfo) {
44+
McpHttpSseServerFactory factory = new McpHttpSseServerFactory();
45+
McpAsyncServer server = factory.create(serverInfo);
46+
registerComponents(server);
47+
}
5348

54-
public void startServer() {
55-
doStartServer(new YAMLConfigurationLoader().getConfig());
56-
}
49+
public void startServer(String configFileName) {
50+
Assert.notNull(configFileName, "configFileName must not be null");
51+
doStartServer(new YAMLConfigurationLoader(configFileName).getConfig());
52+
}
5753

58-
private void doStartServer(McpServerConfiguration configuration) {
59-
if (!configuration.enabled()) {
60-
logger.warn("MCP server is disabled, please check your configuration file.");
61-
return;
62-
}
54+
public void startServer() {
55+
doStartServer(new YAMLConfigurationLoader().getConfig());
56+
}
6357

64-
ConfigurableMcpServerFactory<? extends McpServerTransportProvider> factory;
65-
if (configuration.stdio()) {
66-
factory = new ConfigurableMcpStdioServerFactory(configuration);
67-
} else {
68-
factory = new ConfigurableMcpHttpSseServerFactory(configuration);
69-
}
70-
McpAsyncServer server = factory.create();
71-
registerComponents(server);
58+
private void doStartServer(McpServerConfiguration configuration) {
59+
if (!configuration.enabled()) {
60+
logger.warn("MCP server is disabled, please check your configuration file.");
61+
return;
7262
}
7363

74-
private void registerComponents(McpAsyncServer server) {
75-
injector.getInstance(McpServerResourceFactory.class).registerTo(server);
76-
injector.getInstance(McpServerPromptFactory.class).registerTo(server);
77-
injector.getInstance(McpServerToolFactory.class).registerTo(server);
64+
ConfigurableMcpServerFactory<? extends McpServerTransportProvider> factory;
65+
if (configuration.stdio()) {
66+
factory = new ConfigurableMcpStdioServerFactory(configuration);
67+
} else {
68+
factory = new ConfigurableMcpHttpSseServerFactory(configuration);
7869
}
70+
McpAsyncServer server = factory.create();
71+
registerComponents(server);
72+
}
7973

74+
private void registerComponents(McpAsyncServer server) {
75+
injector.getInstance(McpServerResourceFactory.class).registerTo(server);
76+
injector.getInstance(McpServerPromptFactory.class).registerTo(server);
77+
injector.getInstance(McpServerToolFactory.class).registerTo(server);
78+
}
8079
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpComponentScan.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

33
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
4-
54
import java.lang.annotation.ElementType;
65
import java.lang.annotation.Retention;
76
import java.lang.annotation.RetentionPolicy;
@@ -11,7 +10,7 @@
1110
@Retention(RetentionPolicy.RUNTIME)
1211
@Deprecated(since = "0.6.0", forRemoval = true)
1312
public @interface McpComponentScan {
14-
String basePackage() default StringHelper.EMPTY;
13+
String basePackage() default StringHelper.EMPTY;
1514

16-
Class<?> basePackageClass() default Object.class;
15+
Class<?> basePackageClass() default Object.class;
1716
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpI18nEnabled.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
@Target(ElementType.TYPE)
99
@Retention(RetentionPolicy.RUNTIME)
10-
public @interface McpI18nEnabled {
11-
}
10+
public @interface McpI18nEnabled {}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpJsonSchemaDefinition.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
@Target(ElementType.TYPE)
99
@Retention(RetentionPolicy.RUNTIME)
10-
public @interface McpJsonSchemaDefinition {
11-
}
10+
public @interface McpJsonSchemaDefinition {}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpJsonSchemaDefinitionProperty.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

33
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
4-
54
import java.lang.annotation.ElementType;
65
import java.lang.annotation.Retention;
76
import java.lang.annotation.RetentionPolicy;
@@ -10,13 +9,12 @@
109
@Target(ElementType.FIELD)
1110
@Retention(RetentionPolicy.RUNTIME)
1211
public @interface McpJsonSchemaDefinitionProperty {
13-
String name() default StringHelper.EMPTY;
14-
15-
String description() default StringHelper.EMPTY;
12+
String name() default StringHelper.EMPTY;
1613

17-
@Deprecated(since = "0.6.0", forRemoval = true)
18-
String descriptionI18nKey() default StringHelper.EMPTY;
14+
String description() default StringHelper.EMPTY;
1915

20-
boolean required() default false;
16+
@Deprecated(since = "0.6.0", forRemoval = true)
17+
String descriptionI18nKey() default StringHelper.EMPTY;
2118

19+
boolean required() default false;
2220
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpPrompt.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

33
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
4-
54
import java.lang.annotation.ElementType;
65
import java.lang.annotation.Retention;
76
import java.lang.annotation.RetentionPolicy;
@@ -11,13 +10,12 @@
1110
@Retention(RetentionPolicy.RUNTIME)
1211
public @interface McpPrompt {
1312

14-
String name() default StringHelper.EMPTY;
15-
16-
String title() default StringHelper.EMPTY;
13+
String name() default StringHelper.EMPTY;
1714

18-
String description() default StringHelper.EMPTY;
15+
String title() default StringHelper.EMPTY;
1916

20-
@Deprecated(since = "0.6.0", forRemoval = true)
21-
String descriptionI18nKey() default StringHelper.EMPTY;
17+
String description() default StringHelper.EMPTY;
2218

19+
@Deprecated(since = "0.6.0", forRemoval = true)
20+
String descriptionI18nKey() default StringHelper.EMPTY;
2321
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpPromptParam.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.codeboyzhou.mcp.declarative.annotation;
22

33
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
4-
54
import java.lang.annotation.ElementType;
65
import java.lang.annotation.Retention;
76
import java.lang.annotation.RetentionPolicy;
@@ -11,15 +10,14 @@
1110
@Retention(RetentionPolicy.RUNTIME)
1211
public @interface McpPromptParam {
1312

14-
String name();
15-
16-
String title() default StringHelper.EMPTY;
13+
String name();
1714

18-
String description() default StringHelper.EMPTY;
15+
String title() default StringHelper.EMPTY;
1916

20-
@Deprecated(since = "0.6.0", forRemoval = true)
21-
String descriptionI18nKey() default StringHelper.EMPTY;
17+
String description() default StringHelper.EMPTY;
2218

23-
boolean required() default false;
19+
@Deprecated(since = "0.6.0", forRemoval = true)
20+
String descriptionI18nKey() default StringHelper.EMPTY;
2421

22+
boolean required() default false;
2523
}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpPrompts.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
@Target(ElementType.TYPE)
99
@Retention(RetentionPolicy.RUNTIME)
10-
public @interface McpPrompts {
11-
}
10+
public @interface McpPrompts {}

‎src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpResource.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.github.codeboyzhou.mcp.declarative.util.StringHelper;
44
import io.modelcontextprotocol.spec.McpSchema;
5-
65
import java.lang.annotation.ElementType;
76
import java.lang.annotation.Retention;
87
import java.lang.annotation.RetentionPolicy;
@@ -11,21 +10,20 @@
1110
@Target(ElementType.METHOD)
1211
@Retention(RetentionPolicy.RUNTIME)
1312
public @interface McpResource {
14-
String uri();
15-
16-
String name() default StringHelper.EMPTY;
13+
String uri();
1714

18-
String title() default StringHelper.EMPTY;
15+
String name() default StringHelper.EMPTY;
1916

20-
String description() default StringHelper.EMPTY;
17+
String title() default StringHelper.EMPTY;
2118

22-
@Deprecated(since = "0.6.0", forRemoval = true)
23-
String descriptionI18nKey() default StringHelper.EMPTY;
19+
String description() default StringHelper.EMPTY;
2420

25-
String mimeType() default "text/plain";
21+
@Deprecated(since = "0.6.0", forRemoval = true)
22+
String descriptionI18nKey() default StringHelper.EMPTY;
2623

27-
McpSchema.Role[] roles() default {McpSchema.Role.ASSISTANT, McpSchema.Role.USER};
24+
String mimeType() default "text/plain";
2825

29-
double priority() default 1.0;
26+
McpSchema.Role[] roles() default {McpSchema.Role.ASSISTANT, McpSchema.Role.USER};
3027

28+
double priority() default 1.0;
3129
}

0 commit comments

Comments
 (0)