diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlBlock.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlBlock.java index 72296cdcbf..cfde5b196c 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlBlock.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/xmlmodel/XmlBlock.java @@ -46,11 +46,12 @@ public final void block(String text, Consumer bodyAction) { } public final void tagWithInlineComment(String tag, String value, String comment) { - contents.line("<%1$s>%2$s ", tag, CodeNamer.escapeXmlComment(value), - CodeNamer.escapeXmlComment(comment)); + String escapedValue = CodeNamer.escapeXmlComment(value); + String escapedComment = CodeNamer.escapeXmlComment(comment); + contents.line("<" + tag + ">" + escapedValue + " "); } public final void tagCData(String tag, String value) { - contents.line("<%1$s>", tag, value); + contents.line("<" + tag + ">"); } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java index aa4ebd3d4d..cfed128e1c 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/PomTemplate.java @@ -119,6 +119,7 @@ public final void write(Pom pom, XmlFile xmlFile) { propertiesBlock.tag("project.build.sourceEncoding", "UTF-8"); writeJacoco(propertiesBlock); writeRevapi(propertiesBlock, pom); + writeSpotless(propertiesBlock); }); if (!CoreUtils.isNullOrEmpty(pom.getDependencyIdentifiers())) { @@ -179,6 +180,16 @@ protected void writeRevapi(XmlBlock propertiesBlock, Pom pom) { // NOOP for data-plane } + /** + * Extension for writing Spotless configuration. + * + * @param propertiesBlock The {@code } XML block within the {@code pom.xml}. + */ + protected void writeSpotless(XmlBlock propertiesBlock) { + // For now all generation will enable Spotless running. + propertiesBlock.tag("spotless.skip", "false"); + } + /** * Extension for writing a "build" block, with array of "plugin" within. * diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java index 85b66ca05e..1e1cfd757c 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java @@ -43,7 +43,7 @@ public ProtocolTestWriter(TestContext testContext) { HttpLogOptions.class.getName(), Configuration.class.getName(), "com.azure.core.test.utils.MockTokenCredential", "com.azure.identity.DefaultAzureCredentialBuilder", "com.azure.core.test.TestProxyTestBase", "com.azure.core.test.TestMode", -// "com.azure.core.test.annotation.DoNotRecord", + // "com.azure.core.test.annotation.DoNotRecord", "org.junit.jupiter.api.Disabled", "org.junit.jupiter.api.Test")); // client and builder syncClients.forEach(c -> {