Skip to content

http-client-java, fix format on module-info.java #9135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 3 commits into from
Dec 4, 2025
Merged

http-client-java, fix format on module-info.java #9135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f8344b
http-client-java, fix format on module-info.java
weidongxu-microsoft Dec 4, 2025
df7b648
clean up spotless in resources/pom.xml
weidongxu-microsoft Dec 4, 2025
a30ee1f
version bump to 0.6.0
weidongxu-microsoft Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/http-client-java/generator/http-client-generator-clientcore-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typespec/spec-api": "0.1.0-alpha.10",
"@typespec/http-specs": "0.1.0-alpha.28",
"@typespec/json-schema": "1.6.0",
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.5.1.tgz",
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.6.0.tgz",
"@typespec/http-client-java-tests": "file:"
},
"overrides": {
Expand Down
10 changes: 9 additions & 1 deletion ...t/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,15 @@ private static String importToString(ImportDeclaration importDeclaration) {
private static String formatCode(String file, String fileName, CodeFormatter codeFormatter) throws Exception {
IDocument doc = new Document(file);

boolean isModuleInfo = IModule.MODULE_INFO_JAVA.equals(fileName);
boolean isModuleInfo = fileName.endsWith(IModule.MODULE_INFO_JAVA);
if (isModuleInfo) {
// candidate module-info.java, confirm by check file content about module declaration
CompilationUnit compilationUnit = StaticJavaParser.parse(file);
if (compilationUnit.getModule().isEmpty()) {
// not module-info.java
isModuleInfo = false;
}
}
int kind = isModuleInfo ? CodeFormatter.K_MODULE_INFO : CodeFormatter.K_COMPILATION_UNIT;
kind |= CodeFormatter.F_INCLUDE_COMMENTS;
TextEdit edit = codeFormatter.format(kind, file, 0, file.length(), 0, Constants.NEW_LINE);
Expand Down
41 changes: 0 additions & 41 deletions ...http-client-java/generator/http-client-generator-mgmt/src/main/resources/spotless-pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/http-client-java/generator/http-client-generator-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typespec/spec-api": "0.1.0-alpha.10",
"@typespec/http-specs": "0.1.0-alpha.28",
"@azure-tools/azure-http-specs": "0.1.0-alpha.32",
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.5.1.tgz",
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.6.0.tgz",
"@typespec/http-client-java-tests": "file:"
},
"overrides": {
Expand Down
38 changes: 0 additions & 38 deletions packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,4 @@
<version>1.0.0-beta.1</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>spotless</id>
<activation>
<property>
<name>spotless</name>
</property>
</activation>

<build>
<plugins>
<!-- All configuration, except the plugin version, in this plugin must be aligned with the Spotless -->
<!-- configurations used in azure-sdk-for-java -->
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.40.0</version>
<configuration>
<java>
<includes>
<include>src/main/java/**/*.java</include>
<include>src/samples/java/**/*.java</include>
<include>src/test/java/**/*.java</include>
</includes>

<importOrder/>
<eclipse>
<version>4.21</version>
<file>../eclipse-format-azure-sdk-for-java.xml</file>
</eclipse>
</java>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions packages/http-client-java/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/http-client-java/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typespec/http-client-java",
"version": "0.5.1",
"version": "0.6.0",
"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
"keywords": [
"TypeSpec"
Expand Down
Loading