From e719e526766b2de65547443e2e218dc5008f71cf Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 10 Sep 2026 13:12:03 -0400 Subject: [PATCH 1/5] Improve generation time by cleaning up heavyweight processes --- ...-java-generation-performance-2026-09-10.md | 7 + packages/http-client-java/generator/README.md | 15 + .../http-client-generator-core/pom.xml | 6 +- .../customization/ClassCustomization.java | 5 +- .../core/customization/Customization.java | 12 +- .../generator/core/customization/Editor.java | 107 ++++- .../util/PartialUpdateHandler.java | 72 ++-- .../core/postprocessor/Postprocessor.java | 145 ++++--- .../implementation/CodeFormatterUtil.java | 375 ++++++++++++++---- .../template/ClientMethodTemplateBase.java | 4 + .../util/PartialUpdateHandlerTest.java | 13 + .../postprocessor/PostprocessorTests.java | 264 ++++++++++++ .../CodeFormatterUtilTests.java | 171 ++++++++ .../client/generator/mgmt/FluentNamer.java | 30 +- .../generator/mgmt/FluentNamerTests.java | 55 +++ .../fluent/TypeSpecFluentPlugin.java | 2 + .../client/generator/model/DevOptions.java | 24 +- .../generator/model/EmitterOptionsTests.java | 17 + 18 files changed, 1130 insertions(+), 194 deletions(-) create mode 100644 .chronus/changes/http-client-java-generation-performance-2026-09-10.md create mode 100644 packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/PostprocessorTests.java create mode 100644 packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamerTests.java diff --git a/.chronus/changes/http-client-java-generation-performance-2026-09-10.md b/.chronus/changes/http-client-java-generation-performance-2026-09-10.md new file mode 100644 index 00000000000..514593c6783 --- /dev/null +++ b/.chronus/changes/http-client-java-generation-performance-2026-09-10.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Improve Java generation performance by compiling customizations in memory, sharing parsed Java files across customization, partial update, and import ordering, tokenizing import headers for untouched files, using bounded parallel formatting, preserving schema Javadocs without parsing their contents as Java, and writing ARM debug code models only when debugging is enabled. Customizations continue to run before partial update. Formatter parallelism can be limited when generating multiple clients concurrently. \ No newline at end of file diff --git a/packages/http-client-java/generator/README.md b/packages/http-client-java/generator/README.md index a48f0837409..a84359519e6 100644 --- a/packages/http-client-java/generator/README.md +++ b/packages/http-client-java/generator/README.md @@ -7,6 +7,7 @@ The **Microsoft Java client generator** tool generates client libraries for acce - [Prerequisites](#prerequisites) - [Build](#build) - [Test](#test) +- [Formatting Performance](#formatting-performance) ## Prerequisites @@ -21,6 +22,20 @@ The **Microsoft Java client generator** tool generates client libraries for acce 1. `mvn clean test` (from packages/http-client-java/generator directory) +## Formatting Performance + +Files that have not needed customization or partial merging use header-only tokenization for import ordering instead of a full JavaParser AST. Commented or unusual import headers fall back to JavaParser; already parsed files continue to reuse their AST. Customization still runs before partial update. + +Unused-import removal and Eclipse formatting run with at most four workers, each with its own formatter. Automatic parallelism allows one worker per 32 files, capped by the available processors. Small batches run sequentially. Results, diagnostics, and file writes retain their input order. + +Set `TYPESPEC_JAVA_FORMATTER_PARALLELISM=1` when using spec-level parallel generation, such as the `Generate.ps1` scripts at their default processor-count parallelism, to avoid multiplying the number of CPU workers. A positive integer overrides the automatic setting, still capped at four workers and the available processors. The JVM property `-Dcodegen.java.formatter.parallelism=` takes precedence over the environment variable. + +For example, in PowerShell before invoking a regeneration script: + +```powershell +$env:TYPESPEC_JAVA_FORMATTER_PARALLELISM = "1" +``` + ## Debug ### Debugging Java Code diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml index 967250d04ef..49b31484ae9 100644 --- a/packages/http-client-java/generator/http-client-generator-core/pom.xml +++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml @@ -81,13 +81,13 @@ com.github.javaparser javaparser-core - 3.27.0 + 3.28.2 - + com.google.googlejavaformat google-java-format - 1.24.0 + 1.28.0 diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/ClassCustomization.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/ClassCustomization.java index df6e0d828cb..ee5773cd3b7 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/ClassCustomization.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/ClassCustomization.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.customization; -import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.CompilationUnit; import java.util.function.Consumer; @@ -34,9 +33,7 @@ public String getClassName() { * @return This ClassCustomization with the abstract syntax tree changes applied. */ public ClassCustomization customizeAst(Consumer astCustomization) { - CompilationUnit astToEdit = StaticJavaParser.parse(editor.getFileContent(fileName)); - astCustomization.accept(astToEdit); - editor.replaceFile(fileName, astToEdit.toString()); + editor.customizeAst(fileName, astCustomization); return this; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Customization.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Customization.java index d6006efb762..f89b3baa263 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Customization.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Customization.java @@ -18,7 +18,17 @@ public abstract class Customization { * @return the map of files after customization */ public final Map run(Map files, Logger logger) { - Editor editor = new Editor(files); + return run(new Editor(files), logger); + } + + /** + * Applies customization while retaining parsed files for partial update and formatting. + * + * @param editor the editor shared by the postprocessing stages + * @param logger the logger + * @return the customized file contents + */ + public final Map run(Editor editor, Logger logger) { customize(new LibraryCustomization(editor), logger); return editor.getContents(); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Editor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Editor.java index 34e400152be..65bf68fc948 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Editor.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/customization/Editor.java @@ -3,11 +3,15 @@ package com.microsoft.typespec.http.client.generator.core.customization; +import com.github.javaparser.StaticJavaParser; +import com.github.javaparser.ast.CompilationUnit; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Scanner; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -16,6 +20,7 @@ public final class Editor { private final Map contents; private final Map> lines; + private final Map parsedFiles = new HashMap<>(); /** * Creates an editor instance with the file contents and the root directory path. @@ -23,11 +28,8 @@ public final class Editor { * @param contents the map from file relative paths (starting with "src/main/java") and file contents */ public Editor(Map contents) { - this.contents = new HashMap<>(contents); + this.contents = new LinkedHashMap<>(contents); this.lines = new HashMap<>(); - for (Map.Entry entry : contents.entrySet()) { - lines.put(entry.getKey(), splitContentIntoLines(entry.getValue())); - } } /** @@ -78,6 +80,81 @@ public Map getContents() { return contents; } + /** + * Gets the shared AST for the current file content. Text replacements invalidate the cached parse. + * Commit AST changes with {@link #setCompilationUnit(String, CompilationUnit)} before reading the file as text. + * + * @param name the relative file path + * @return the parsed compilation unit + */ + public CompilationUnit getCompilationUnit(String name) { + String content = contents.get(name); + ParsedFile parsedFile = parsedFiles.get(name); + if (parsedFile == null || !parsedFile.content.equals(content)) { + parsedFile = new ParsedFile(content, StaticJavaParser.parse(content), false); + parsedFiles.put(name, parsedFile); + } + return parsedFile.compilationUnit; + } + + /** + * Gets an existing AST without parsing a file that has not needed AST processing. + * + * @param name the relative file path + * @return the cached compilation unit, or null if the current text has not been parsed + */ + public CompilationUnit getCachedCompilationUnit(String name) { + ParsedFile parsedFile = parsedFiles.get(name); + return parsedFile != null && parsedFile.content.equals(contents.get(name)) ? parsedFile.compilationUnit : null; + } + + /** + * Indicates whether AST edits have made the original source positions unsuitable for text replacements. + * + * @param name the relative file path + * @return whether the current AST has been edited + */ + public boolean isCompilationUnitModified(String name) { + ParsedFile parsedFile = parsedFiles.get(name); + return parsedFile != null && parsedFile.modified && parsedFile.content.equals(contents.get(name)); + } + + /** + * Releases a cached AST after its final use without discarding the file content. + * + * @param name the relative file path + */ + public void releaseCompilationUnit(String name) { + parsedFiles.remove(name); + } + + /** + * Updates the file content while retaining the edited AST for subsequent processing. + * + * @param name the relative file path + * @param compilationUnit the edited compilation unit + */ + public void setCompilationUnit(String name, CompilationUnit compilationUnit) { + String content = compilationUnit.toString(); + if (compilationUnit.getModule().isPresent()) { + content = compilationUnit.getOrphanComments().stream().map(Object::toString).collect(Collectors.joining()) + + "\n" + content; + } + replaceFile(name, content); + parsedFiles.put(name, new ParsedFile(content, compilationUnit, true)); + } + + void customizeAst(String name, Consumer customization) { + CompilationUnit compilationUnit = getCompilationUnit(name); + try { + customization.accept(compilationUnit); + setCompilationUnit(name, compilationUnit); + } catch (RuntimeException | Error exception) { + parsedFiles.remove(name); + throw exception; + } + } + /** * Adds a new file. * @@ -101,7 +178,8 @@ public void replaceFile(String name, String content) { private void addOrReplaceFile(String name, String content, boolean isReplace) { if (isReplace || !contents.containsKey(name)) { contents.put(name, content); - lines.put(name, splitContentIntoLines(content)); + lines.remove(name); + parsedFiles.remove(name); } } @@ -113,6 +191,7 @@ private void addOrReplaceFile(String name, String content, boolean isReplace) { public void removeFile(String name) { contents.remove(name); lines.remove(name); + parsedFiles.remove(name); } /** @@ -132,7 +211,9 @@ public String getFileContent(String name) { * @return the file content split into lines */ public List getFileLines(String name) { - return lines.get(name); + return contents.containsKey(name) + ? lines.computeIfAbsent(name, fileName -> splitContentIntoLines(contents.get(fileName))) + : null; } /** @@ -143,7 +224,7 @@ public List getFileLines(String name) { * @return the file content in this line */ public String getFileLine(String name, int line) { - return lines.get(name).get(line); + return getFileLines(name).get(line); } private static List splitContentIntoLines(String content) { @@ -158,4 +239,16 @@ private static List splitContentIntoLines(String content) { return res; } + private static final class ParsedFile { + private final String content; + private final CompilationUnit compilationUnit; + private final boolean modified; + + private ParsedFile(String content, CompilationUnit compilationUnit, boolean modified) { + this.content = content; + this.compilationUnit = compilationUnit; + this.modified = modified; + } + } + } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java index 1754ab3a5c6..21024cdac01 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandler.java @@ -17,6 +17,7 @@ import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; +import com.github.javaparser.ast.comments.TraditionalJavadocComment; import com.github.javaparser.ast.expr.SimpleName; import com.github.javaparser.ast.modules.ModuleDeclaration; import com.github.javaparser.ast.modules.ModuleDirective; @@ -24,11 +25,14 @@ import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.printer.DefaultPrettyPrinterVisitor; +import com.microsoft.typespec.http.client.generator.core.customization.Editor; import java.io.BufferedReader; import java.io.StringReader; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -101,31 +105,42 @@ public class PartialUpdateHandler { * @return the file content after handling partial update */ public static String handlePartialUpdateForFile(String generatedFileContent, String existingFileContent) { - // 1. Parse existing file content and generated file content using JavaParser - CompilationUnit compilationUnitForGeneratedFile = StaticJavaParser.parse(generatedFileContent); - CompilationUnit compilationUnitForExistingFile = StaticJavaParser.parse(existingFileContent); + Editor editor = new Editor(Map.of("generated", generatedFileContent)); + mergeCompilationUnits(editor.getCompilationUnit("generated"), StaticJavaParser.parse(existingFileContent)) + .ifPresent(compilationUnit -> editor.setCompilationUnit("generated", compilationUnit)); + return editor.getFileContent("generated"); + } + /** + * Merges existing manual changes into an already customized generated AST without reparsing either input. + * + * @param compilationUnitForGeneratedFile the customized generated AST + * @param compilationUnitForExistingFile the existing file AST + * @return the merged AST, or empty when the file is outside the scope of partial update + */ + public static Optional mergeCompilationUnits(CompilationUnit compilationUnitForGeneratedFile, + CompilationUnit compilationUnitForExistingFile) { // 2. If it's module-info.java file, then go to handlePartialUpdateForModuleInfoFile if (compilationUnitForExistingFile.getModule().isPresent() && compilationUnitForGeneratedFile.getModule().isPresent()) { - return handlePartialUpdateForModuleInfoFile(compilationUnitForGeneratedFile, - compilationUnitForExistingFile); + return Optional.of( + handlePartialUpdateForModuleInfoFile(compilationUnitForGeneratedFile, compilationUnitForExistingFile)); } // 3. If it's package-info.java file, then go to handlePartialUpdateForPackageInfoFile if (isPackageInfoFile(compilationUnitForExistingFile) && isPackageInfoFile(compilationUnitForGeneratedFile)) { - return handlePartialUpdateForPackageInfoFile(compilationUnitForGeneratedFile, - compilationUnitForExistingFile); + return Optional.of( + handlePartialUpdateForPackageInfoFile(compilationUnitForGeneratedFile, compilationUnitForExistingFile)); } // 4. If it's class or interface file, handle partial update for class or interface file if (isClassOrInterfaceFile(compilationUnitForExistingFile) && isClassOrInterfaceFile(compilationUnitForGeneratedFile)) { - return handlePartialUpdateForClassOrInterfaceFile(compilationUnitForGeneratedFile, generatedFileContent, + return handlePartialUpdateForClassOrInterfaceFile(compilationUnitForGeneratedFile, compilationUnitForExistingFile); } - return generatedFileContent; + return Optional.empty(); } /** @@ -146,12 +161,11 @@ && isClassOrInterfaceFile(compilationUnitForGeneratedFile)) { * * * @param compilationUnitForGeneratedFile the newly generated file content - * @param generatedFileContent the newly generated file content * @param compilationUnitForExistingFile the existing file content that contains user's manual update code * @return the file content after handling partial update */ - private static String handlePartialUpdateForClassOrInterfaceFile(CompilationUnit compilationUnitForGeneratedFile, - String generatedFileContent, CompilationUnit compilationUnitForExistingFile) { + private static Optional handlePartialUpdateForClassOrInterfaceFile( + CompilationUnit compilationUnitForGeneratedFile, CompilationUnit compilationUnitForExistingFile) { // 1. Parse existing file content and generated file content using JavaParser ClassOrInterfaceDeclaration generatedClazz = getClassOrInterfaceDeclaration(compilationUnitForGeneratedFile); ClassOrInterfaceDeclaration existingClazz = getClassOrInterfaceDeclaration(compilationUnitForExistingFile); @@ -176,7 +190,7 @@ private static String handlePartialUpdateForClassOrInterfaceFile(CompilationUnit = generatedFileMembers.stream().anyMatch(PartialUpdateHandler::hasGeneratedAnnotation); if (!hasGeneratedAnnotations) { - return generatedFileContent; + return Optional.empty(); } // TODO (weidxu): for now, formatter:on/off is not added by codegen -- hence the commented out block @@ -245,7 +259,7 @@ private static String handlePartialUpdateForClassOrInterfaceFile(CompilationUnit // 8. Update imports compilationUnitForGeneratedFile.getImports().addAll(compilationUnitForExistingFile.getImports()); - return compilationUnitForGeneratedFile.toString(); + return Optional.of(compilationUnitForGeneratedFile); } /** @@ -348,7 +362,7 @@ private static void validateGeneratedClassOrInterface(List> g * @param compilationUnitForExistingFile the existing file content that contains user's manual update code * @return the content after handling partial update */ - private static String handlePartialUpdateForModuleInfoFile(CompilationUnit compilationUnitForGeneratedFile, + private static CompilationUnit handlePartialUpdateForModuleInfoFile(CompilationUnit compilationUnitForGeneratedFile, CompilationUnit compilationUnitForExistingFile) { return mergeModuleFileContent(compilationUnitForGeneratedFile, compilationUnitForExistingFile); } @@ -363,7 +377,7 @@ private static String handlePartialUpdateForModuleInfoFile(CompilationUnit compi * @param compilationUnitForExistingFile the existing file content that contains user's manual update code * @return merged module-info.java file content */ - private static String mergeModuleFileContent(CompilationUnit compilationUnitForGeneratedFile, + private static CompilationUnit mergeModuleFileContent(CompilationUnit compilationUnitForGeneratedFile, CompilationUnit compilationUnitForExistingFile) { if (!compilationUnitForExistingFile.getModule().isPresent() || !compilationUnitForGeneratedFile.getModule().isPresent()) { @@ -423,13 +437,7 @@ private static String mergeModuleFileContent(CompilationUnit compilationUnitForG compilationUnitForGeneratedFile.setModule(moduleDeclaration); - // add comments as compilationUnitForGeneratedFile.toString() does not include comments - StringBuilder comments = new StringBuilder(); - for (Comment comment : compilationUnitForGeneratedFile.getOrphanComments()) { - comments.append(comment.toString()); - } - - return comments + "\n" + compilationUnitForGeneratedFile; + return compilationUnitForGeneratedFile; } /** @@ -439,8 +447,8 @@ private static String mergeModuleFileContent(CompilationUnit compilationUnitForG * @param compilationUnitForExistingFile the existing file content that contains user's manual update code * @return the content after handling partial update */ - private static String handlePartialUpdateForPackageInfoFile(CompilationUnit compilationUnitForGeneratedFile, - CompilationUnit compilationUnitForExistingFile) { + private static CompilationUnit handlePartialUpdateForPackageInfoFile( + CompilationUnit compilationUnitForGeneratedFile, CompilationUnit compilationUnitForExistingFile) { if (!isPackageInfoFile(compilationUnitForExistingFile) || !isPackageInfoFile(compilationUnitForGeneratedFile)) { throw new RuntimeException("Generated file or existing file is not package-info file"); } @@ -457,7 +465,7 @@ private static String handlePartialUpdateForPackageInfoFile(CompilationUnit comp // If the existing file has no Javadocs just return the generated file. if (existingJavadoc == null) { - return compilationUnitForGeneratedFile.toString(); + return compilationUnitForGeneratedFile; } // Use JavadocComment.parse and get the description text as this doesn't contain the leading '*' character. @@ -470,7 +478,7 @@ private static String handlePartialUpdateForPackageInfoFile(CompilationUnit comp if (existingGeneratedDocStartPosition == -1 && existingGeneratedDocEndPosition == -1) { // If the existing file has no generated doc, just return the existing file. compilationUnitForGeneratedFile.getPackageDeclaration().get().setComment(existingJavadoc); - return compilationUnitForExistingFile.toString(); + return compilationUnitForExistingFile; } if (existingGeneratedDocEndPosition == -1) { @@ -543,16 +551,18 @@ private static String handlePartialUpdateForPackageInfoFile(CompilationUnit comp .collect(Collectors.toList()); if (lines.isEmpty()) { - compilationUnitForGeneratedFile.getPackageDeclaration().get().setComment(new JavadocComment()); + compilationUnitForGeneratedFile.getPackageDeclaration().get().setComment(new TraditionalJavadocComment()); } else if (lines.size() == 1) { - compilationUnitForGeneratedFile.getPackageDeclaration().get().setComment(new JavadocComment(lines.get(0))); + compilationUnitForGeneratedFile.getPackageDeclaration() + .get() + .setComment(new TraditionalJavadocComment(lines.get(0))); } else { compilationUnitForGeneratedFile.getPackageDeclaration() .get() - .setComment(new JavadocComment(String.join(lineEnding, lines))); + .setComment(new TraditionalJavadocComment(String.join(lineEnding, lines))); } - return compilationUnitForGeneratedFile.toString(); + return compilationUnitForGeneratedFile; } /** diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java index 75f67f26a24..0b1d28827f9 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java @@ -3,28 +3,41 @@ package com.microsoft.typespec.http.client.generator.core.postprocessor; +import com.github.javaparser.StaticJavaParser; import com.microsoft.typespec.http.client.generator.core.customization.Customization; -import com.microsoft.typespec.http.client.generator.core.customization.implementation.Utils; -import com.microsoft.typespec.http.client.generator.core.extension.base.util.FileUtils; +import com.microsoft.typespec.http.client.generator.core.customization.Editor; import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; import com.microsoft.typespec.http.client.generator.core.extension.plugin.NewPlugin; import com.microsoft.typespec.http.client.generator.core.extension.plugin.PluginLogger; import com.microsoft.typespec.http.client.generator.core.partialupdate.util.PartialUpdateHandler; import com.microsoft.typespec.http.client.generator.core.postprocessor.implementation.CodeFormatterUtil; import io.clientcore.core.serialization.json.JsonReader; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.io.OutputStream; import java.io.UncheckedIOException; import java.net.URI; import java.net.URL; import java.net.URLClassLoader; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; -import java.util.UUID; -import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import javax.tools.DiagnosticCollector; +import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.slf4j.Logger; public class Postprocessor { @@ -38,12 +51,13 @@ public Postprocessor(NewPlugin plugin) { @SuppressWarnings("unchecked") public void postProcess(Map fileContents) { + Editor editor = new Editor(fileContents); String jarPath = JavaSettings.getInstance().getCustomizationJarPath(); String className = JavaSettings.getInstance().getCustomizationClass(); if (className == null) { try { - writeToFiles(fileContents, plugin, logger); + writeToFiles(editor, plugin, logger); } catch (Exception e) { logger.error("Failed to complete postprocessing.", e); throw new RuntimeException("Failed to complete postprocessing.", e); @@ -99,14 +113,14 @@ public void postProcess(Map fileContents) { try { Customization customization = customizationClass.getConstructor().newInstance(); logger.info("Running customization, this may take a while..."); - fileContents = customization.run(fileContents, logger); + customization.run(editor, logger); } catch (Exception e) { logger.error("Unable to complete customization", e); throw new RuntimeException("Unable to complete customization", e); } // Step 2: Print to files - writeToFiles(fileContents, plugin, logger); + writeToFiles(editor, plugin, logger); } catch (Exception e) { logger.error("Failed to complete postprocessing.", e); throw new RuntimeException("Failed to complete postprocessing.", e); @@ -114,12 +128,16 @@ public void postProcess(Map fileContents) { } public static void writeToFiles(Map javaFiles, NewPlugin plugin, Logger logger) { + writeToFiles(new Editor(javaFiles), plugin, logger); + } + + public static void writeToFiles(Editor editor, NewPlugin plugin, Logger logger) { JavaSettings settings = JavaSettings.getInstance(); if (settings.isHandlePartialUpdate()) { - handlePartialUpdate(javaFiles, plugin, logger); + handlePartialUpdate(editor, plugin, logger); } - CodeFormatterUtil.formatCode(javaFiles, plugin, logger); + CodeFormatterUtil.formatCode(editor, plugin, logger); } private static String getReadme(NewPlugin plugin) { @@ -161,40 +179,72 @@ public static Class loadCustomizationClassFromJavaCode( } } - @SuppressWarnings("unchecked") public static Class loadCustomizationClass(String className, String code) { - Path customizationCompile = null; - try { - customizationCompile = FileUtils.createTempDirectory("customizationCompile" + UUID.randomUUID()); - - Path pomPath = customizationCompile.resolve("compile-pom.xml"); - Files.copy(Postprocessor.class.getClassLoader().getResourceAsStream("readme/pom.xml"), pomPath); - - Path sourcePath = customizationCompile.resolve("src/main/java/" + className + ".java"); - Files.createDirectories(sourcePath.getParent()); + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + if (compiler == null) { + throw new IllegalStateException( + "A Java Development Kit (JDK) is required to compile customization source files."); + } - Files.writeString(sourcePath, code); + DiagnosticCollector diagnostics = new DiagnosticCollector<>(); + Map compiledClasses = new HashMap<>(); + JavaFileObject source = new SimpleJavaFileObject( + URI.create("string:///" + className.replace('.', '/') + JavaFileObject.Kind.SOURCE.extension), + JavaFileObject.Kind.SOURCE) { + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return code; + } + }; - attemptMavenInstall(pomPath); + try (JavaFileManager fileManager = new ForwardingJavaFileManager( + compiler.getStandardFileManager(diagnostics, Locale.ROOT, StandardCharsets.UTF_8)) { + @Override + public JavaFileObject getJavaFileForOutput(Location location, String binaryName, JavaFileObject.Kind kind, + FileObject sibling) { + return new SimpleJavaFileObject(URI.create("bytes:///" + binaryName.replace('.', '/') + kind.extension), + kind) { + @Override + public OutputStream openOutputStream() { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + compiledClasses.put(binaryName, output); + return output; + } + }; + } + }) { + List options = List.of("-classpath", System.getProperty("java.class.path"), "-proc:none"); + if (!compiler.getTask(null, fileManager, diagnostics, options, null, List.of(source)).call()) { + throw new IllegalStateException("Failed to compile customization class " + className + ":\n" + + diagnostics.getDiagnostics().stream().map(Object::toString).collect(Collectors.joining("\n"))); + } + } catch (IOException ex) { + throw new UncheckedIOException("Failed to compile customization class " + className, ex); + } - URL fileUrl = customizationCompile.resolve("target/classes").toUri().toURL(); - URLClassLoader classLoader - = URLClassLoader.newInstance(new URL[] { fileUrl }, ClassLoader.getSystemClassLoader()); - return (Class) Class.forName(className, true, classLoader); - } catch (Exception ex) { - throw new RuntimeException(ex); - } finally { - if (customizationCompile != null) { - Utils.deleteDirectory(customizationCompile.toFile()); + ClassLoader classLoader = new ClassLoader(Customization.class.getClassLoader()) { + @Override + protected Class findClass(String binaryName) throws ClassNotFoundException { + ByteArrayOutputStream output = compiledClasses.get(binaryName); + if (output == null) { + throw new ClassNotFoundException(binaryName); + } + byte[] bytes = output.toByteArray(); + return defineClass(binaryName, bytes, 0, bytes.length); } + }; + try { + return Class.forName(className, true, classLoader).asSubclass(Customization.class); + } catch (ClassNotFoundException | ClassCastException ex) { + throw new IllegalStateException("Unable to load compiled customization class " + className, ex); } } - private static void handlePartialUpdate(Map fileContents, NewPlugin plugin, Logger logger) { + private static void handlePartialUpdate(Editor editor, NewPlugin plugin, Logger logger) { logger.info("Begin handle partial update..."); // handle partial update // currently only support add additional interface or overload a generated method in sync and async client - fileContents.replaceAll((path, generatedFileContent) -> { + for (String path : editor.getContents().keySet()) { if (path.endsWith(".java")) { // only handle for .java file // get existing file path // use output-folder from autorest, if exists and is absolute path @@ -212,39 +262,18 @@ private static void handlePartialUpdate(Map fileContents, NewPlu if (Files.exists(existingFilePath)) { try { String existingFileContent = Files.readString(existingFilePath); - return PartialUpdateHandler.handlePartialUpdateForFile(generatedFileContent, - existingFileContent); + PartialUpdateHandler + .mergeCompilationUnits(editor.getCompilationUnit(path), + StaticJavaParser.parse(existingFileContent)) + .ifPresent(compilationUnit -> editor.setCompilationUnit(path, compilationUnit)); } catch (IOException e) { logger.error("Unable to get content from file path", e); throw new UncheckedIOException(e); } } } - return generatedFileContent; - }); + } logger.info("Finish handle partial update."); } - private static void attemptMavenInstall(Path pomPath) { - String[] command = Utils.isWindows() - ? new String[] { "cmd", "/c", "mvn", "compiler:compile", "-f", pomPath.toString() } - : new String[] { "mvn", "compiler:compile", "-f", pomPath.toString() }; - - try { - File outputFile = Files.createTempFile(pomPath.getParent(), "compile", ".log").toFile(); - Process process = new ProcessBuilder(command).redirectErrorStream(true) - .redirectOutput(ProcessBuilder.Redirect.to(outputFile)) - .start(); - process.waitFor(60, TimeUnit.SECONDS); - - if (process.isAlive() || process.exitValue() != 0) { - process.destroyForcibly(); - throw new RuntimeException("Compile failed to complete within 60 seconds or failed with an error code. " - + Files.readString(outputFile.toPath()) + "If this happens 'mvn compile -f " + pomPath - + "' to install dependencies manually."); - } - } catch (IOException | InterruptedException ex) { - throw new RuntimeException("Failed to run compile on generated code.", ex); - } - } } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java index 73df476ceb2..5b6d9c546b3 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java @@ -3,7 +3,6 @@ package com.microsoft.typespec.http.client.generator.core.postprocessor.implementation; -import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.ImportDeclaration; import com.github.javaparser.printer.configuration.ImportOrderingStrategy; @@ -11,19 +10,32 @@ import com.google.googlejavaformat.FormatterDiagnostic; import com.google.googlejavaformat.java.FormatterException; import com.google.googlejavaformat.java.RemoveUnusedImports; +import com.microsoft.typespec.http.client.generator.core.customization.Editor; import com.microsoft.typespec.http.client.generator.core.extension.plugin.NewPlugin; import com.microsoft.typespec.http.client.generator.core.util.Constants; -import java.util.AbstractMap; import java.util.ArrayList; -import java.util.Collection; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.eclipse.jdt.core.ToolFactory; +import org.eclipse.jdt.core.compiler.IScanner; +import org.eclipse.jdt.core.compiler.ITerminalSymbols; +import org.eclipse.jdt.core.compiler.InvalidInputException; import org.eclipse.jdt.core.formatter.CodeFormatter; import org.eclipse.jdt.internal.compiler.env.IModule; import org.eclipse.jface.text.Document; @@ -36,6 +48,8 @@ * Utility class that handles code formatting. */ public final class CodeFormatterUtil { + private static final int MAX_FORMATTER_WORKERS = 4; + private static final int FILES_PER_FORMATTER_WORKER = 32; /** * Formats the given files by removing unused imports and applying Eclipse code formatting. @@ -44,7 +58,11 @@ public final class CodeFormatterUtil { * @param plugin The plugin to use to write the formatted files. */ public static void formatCode(Map files, NewPlugin plugin, Logger logger) { - formatCodeInternal(files, logger).forEach(entry -> plugin.writeFile(entry.getKey(), entry.getValue(), null)); + formatCode(new Editor(files), plugin, logger); + } + + public static void formatCode(Editor editor, NewPlugin plugin, Logger logger) { + formatCodeInternal(editor, logger).forEach(entry -> plugin.writeFile(entry.getKey(), entry.getValue(), null)); } /** @@ -55,30 +73,278 @@ public static void formatCode(Map files, NewPlugin plugin, Logge * @throws RuntimeException If code formatting fails. */ public static List formatCode(Map files) { - return formatCodeInternal(files, null).map(Map.Entry::getValue).collect(Collectors.toList()); + return formatCode(new Editor(files)); + } + + public static List formatCode(Editor editor) { + return formatCodeInternal(editor, null).map(Map.Entry::getValue).collect(Collectors.toList()); } - private static Stream> formatCodeInternal(Map files, Logger logger) { + private static Stream> formatCodeInternal(Editor editor, Logger logger) { + String configuredWorkers = System.getProperty("codegen.java.formatter.parallelism"); + if (configuredWorkers == null) { + configuredWorkers = System.getenv("TYPESPEC_JAVA_FORMATTER_PARALLELISM"); + } + int parallelism = resolveParallelism(editor.getContents().size(), Runtime.getRuntime().availableProcessors(), + configuredWorkers); + return formatCodeInternal(editor, logger, parallelism); + } + + static int resolveParallelism(int fileCount, int availableProcessors, String configuredWorkers) { + int workers = Math.max(1, fileCount / FILES_PER_FORMATTER_WORKER); + if (configuredWorkers != null) { + try { + workers = Integer.parseInt(configuredWorkers); + } catch (NumberFormatException exception) { + throw new IllegalArgumentException( + "Formatter parallelism must be a positive integer: " + configuredWorkers, exception); + } + if (workers < 1) { + throw new IllegalArgumentException( + "Formatter parallelism must be a positive integer: " + configuredWorkers); + } + } + return Math.max(1, + Math.min(Math.min(workers, MAX_FORMATTER_WORKERS), Math.min(fileCount, availableProcessors))); + } + + static Stream> formatCodeInternal(Editor editor, Logger logger, int parallelism) { Map eclipseSettings = loadEclipseSettings(); DefaultImportOrderingStrategy orderingStrategy = new DefaultImportOrderingStrategy(); orderingStrategy.setSortImportsAlphabetically(true); - return removeUnusedImports(files.entrySet(), logger).stream().map(entry -> { + Map files = new LinkedHashMap<>(); + Map parseFailures = new HashMap<>(); + Set moduleInfoFiles = new HashSet<>(); + for (Map.Entry entry : editor.getContents().entrySet()) { try { - String file = reorderImports(entry.getValue(), orderingStrategy); - file = formatCode(file, entry.getKey(), ToolFactory.createCodeFormatter(eclipseSettings)); - return Map.entry(entry.getKey(), file); - } catch (Exception e) { - // print file content - String errorMessage - = "Failed to format file: " + entry.getKey() + ". File content: \n" + entry.getValue(); + CompilationUnit compilationUnit = editor.getCachedCompilationUnit(entry.getKey()); + String reordered = null; + if (compilationUnit == null) { + reordered = reorderUntouchedImports(entry.getValue()); + if (reordered == null) { + compilationUnit = editor.getCompilationUnit(entry.getKey()); + } + } + if (entry.getKey().endsWith(IModule.MODULE_INFO_JAVA) + && (compilationUnit == null || compilationUnit.getModule().isPresent())) { + moduleInfoFiles.add(entry.getKey()); + } + if (compilationUnit != null) { + reordered = reorderImports(entry.getValue(), compilationUnit, + editor.isCompilationUnitModified(entry.getKey()), orderingStrategy); + } + files.put(entry.getKey(), reordered); + } catch (Exception exception) { + files.put(entry.getKey(), entry.getValue()); + parseFailures.put(entry.getKey(), exception); + } finally { + editor.releaseCompilationUnit(entry.getKey()); + } + } + + List results = formatFiles(new ArrayList<>(files.entrySet()), moduleInfoFiles, parseFailures, + eclipseSettings, Math.max(1, Math.min(parallelism, MAX_FORMATTER_WORKERS))); + StringBuilder errorCapture = new StringBuilder(); + for (FormattingResult result : results) { + if (result.failure instanceof FormatterException) { + String[] fileLines = result.content.split("\n"); + for (FormatterDiagnostic diagnostic : ((FormatterException) result.failure).diagnostics()) { + appendDiagnosticError(errorCapture, diagnostic, result.fileName, fileLines, logger); + } + } + } + if (errorCapture.length() > 0) { + throw new IllegalStateException("Google Java Formatter encountered errors:\n" + errorCapture); + } + for (FormattingResult result : results) { + if (result.failure != null) { + String message = "Failed to format file: " + result.fileName + ". File content: \n" + result.content; if (logger != null) { - logger.error(errorMessage); + logger.error(message); } + throw new RuntimeException(message, result.failure); + } + } + return results.stream().map(result -> Map.entry(result.fileName, result.content)); + } - throw new RuntimeException(errorMessage, e); + private static List formatFiles(List> files, + Set moduleInfoFiles, Map parseFailures, Map eclipseSettings, + int parallelism) { + if (files.isEmpty()) { + return List.of(); + } + FormattingResult[] results = new FormattingResult[files.size()]; + AtomicInteger nextFile = new AtomicInteger(); + Callable worker = () -> { + CodeFormatter formatter = ToolFactory.createCodeFormatter(new HashMap<>(eclipseSettings)); + int index; + while ((index = nextFile.getAndIncrement()) < files.size()) { + if (Thread.currentThread().isInterrupted()) { + throw new InterruptedException("Formatting was cancelled."); + } + Map.Entry file = files.get(index); + results[index] = formatFile(file, moduleInfoFiles.contains(file.getKey()), + parseFailures.get(file.getKey()), formatter); } - }); + return null; + }; + ExecutorService executor = null; + try { + if (parallelism == 1) { + worker.call(); + } else { + AtomicInteger threadNumber = new AtomicInteger(); + executor = Executors.newFixedThreadPool(Math.min(parallelism, files.size()), task -> { + Thread thread = new Thread(task, "java-codegen-formatter-" + threadNumber.incrementAndGet()); + thread.setDaemon(true); + return thread; + }); + List> workers = new ArrayList<>(); + for (int workerIndex = 0; workerIndex < Math.min(parallelism, files.size()); workerIndex++) { + workers.add(worker); + } + for (Future future : executor.invokeAll(workers)) { + future.get(); + } + } + } catch (InterruptedException exception) { + Thread.currentThread().interrupt(); + throw new IllegalStateException("Interrupted while formatting Java files.", exception); + } catch (ExecutionException exception) { + throw new IllegalStateException("Failed to format Java files.", exception.getCause()); + } catch (Exception exception) { + throw new IllegalStateException("Failed to format Java files.", exception); + } finally { + if (executor != null) { + executor.shutdownNow(); + } + } + return Arrays.asList(results); + } + + private static FormattingResult formatFile(Map.Entry file, boolean moduleInfo, + Exception parseFailure, CodeFormatter formatter) { + String content = file.getValue(); + try { + content = RemoveUnusedImports.removeUnusedImports(content); + if (parseFailure != null) { + return new FormattingResult(file.getKey(), content, parseFailure); + } + return new FormattingResult(file.getKey(), formatCode(content, moduleInfo, formatter), null); + } catch (Exception exception) { + return new FormattingResult(file.getKey(), content, exception); + } + } + + private static final class FormattingResult { + private final String fileName; + private final String content; + private final Exception failure; + + private FormattingResult(String fileName, String content, Exception failure) { + this.fileName = fileName; + this.content = content; + this.failure = failure; + } + } + + private static String reorderUntouchedImports(String file) throws InvalidInputException { + IScanner scanner = ToolFactory.createScanner(true, false, false, "17"); + scanner.setSource(file.toCharArray()); + List imports = new ArrayList<>(); + int importStart = -1; + int importEnd = -1; + int parentheses = 0; + boolean commentAfterImport = false; + int token; + while ((token = scanner.getNextToken()) != ITerminalSymbols.TokenNameEOF) { + if (isComment(token)) { + if (importEnd >= 0) { + String gap = file.substring(importEnd, scanner.getCurrentTokenStartPosition()); + if (gap.indexOf('\n') < 0 && gap.indexOf('\r') < 0) { + return null; + } + commentAfterImport = true; + } + } else if (token == ITerminalSymbols.TokenNameLPAREN) { + parentheses++; + } else if (token == ITerminalSymbols.TokenNameRPAREN) { + parentheses--; + } else if (parentheses == 0 && token == ITerminalSymbols.TokenNameimport) { + int declarationStart = scanner.getCurrentTokenStartPosition(); + int lineStart + = Math.max(file.lastIndexOf('\n', declarationStart), file.lastIndexOf('\r', declarationStart)) + 1; + if (commentAfterImport || !file.substring(lineStart, declarationStart).isBlank()) { + return null; + } + if (importStart < 0) { + importStart = declarationStart; + } + StringBuilder declaration = new StringBuilder(); + boolean expectName = true; + boolean canBeStatic = true; + boolean wildcard = false; + while ((token = scanner.getNextToken()) != ITerminalSymbols.TokenNameSEMICOLON) { + if (token == ITerminalSymbols.TokenNameEOF + || isComment(token) + || !Arrays.equals(scanner.getRawTokenSource(), scanner.getCurrentTokenSource())) { + return null; + } + if (token == ITerminalSymbols.TokenNamestatic && canBeStatic) { + canBeStatic = false; + declaration.append("static "); + continue; + } + canBeStatic = false; + if (expectName && token == ITerminalSymbols.TokenNameIdentifier) { + expectName = false; + } else if (expectName + && token == ITerminalSymbols.TokenNameMULTIPLY + && declaration.length() > 0 + && declaration.charAt(declaration.length() - 1) == '.') { + expectName = false; + wildcard = true; + } else if (!expectName && !wildcard && token == ITerminalSymbols.TokenNameDOT) { + expectName = true; + } else { + return null; + } + declaration.append(scanner.getCurrentTokenSource()); + } + if (expectName) { + return null; + } + imports.add(declaration.toString()); + importEnd = scanner.getCurrentTokenEndPosition() + 1; + } else if (parentheses == 0 + && (token == ITerminalSymbols.TokenNameclass + || token == ITerminalSymbols.TokenNameinterface + || token == ITerminalSymbols.TokenNameenum + || token == ITerminalSymbols.TokenNameLBRACE)) { + break; + } + } + if (imports.isEmpty()) { + return file; + } + imports.sort(Comparator.comparing((String declaration) -> !declaration.startsWith("static ")) + .thenComparing(declaration -> declaration.endsWith(".*") + ? declaration.substring(0, declaration.length() - 2) + : declaration)); + String ordered = imports.stream() + .distinct() + .map(declaration -> "import " + declaration + ";") + .collect(Collectors.joining("\n")); + return (file.substring(0, importStart) + ordered + file.substring(importEnd)).replace("\r\n", "\n") + .replace('\r', '\n'); + } + + private static boolean isComment(int token) { + return token == ITerminalSymbols.TokenNameCOMMENT_LINE + || token == ITerminalSymbols.TokenNameCOMMENT_BLOCK + || token == ITerminalSymbols.TokenNameCOMMENT_JAVADOC; } /** @@ -115,18 +381,26 @@ private static Map loadEclipseSettings() { * results in newline removal and trailing space removal which is just noise for us. * * @param file The Java file to reorder imports for. + * @param compilationUnit The shared parsed file. + * @param modified Whether AST edits have invalidated the original import positions. * @param orderingStrategy The import ordering strategy to use. * @return The Java file with reordered imports, or if the file has no imports the file as-is. */ @SuppressWarnings("OptionalGetWithoutIsPresent") - private static String reorderImports(String file, ImportOrderingStrategy orderingStrategy) { - CompilationUnit compilationUnit = StaticJavaParser.parse(file); + private static String reorderImports(String file, CompilationUnit compilationUnit, boolean modified, + ImportOrderingStrategy orderingStrategy) { com.github.javaparser.ast.NodeList imports = compilationUnit.getImports(); if (imports.isEmpty()) { // File has no imports, nothing to reorder. return file; } + if (modified) { + compilationUnit.setImports(new com.github.javaparser.ast.NodeList<>( + distinctImports(orderingStrategy.sortImports(imports).get(0)))); + return compilationUnit.toString(); + } + // Positions of the existing imports in the file. // Position uses 1-based indexing, so when we replace imports later we need to adjust this to 0-based indexing // for Java's List. @@ -187,69 +461,22 @@ private static String importToString(ImportDeclaration importDeclaration) { return sb.toString(); } - private static String formatCode(String file, String fileName, CodeFormatter codeFormatter) throws Exception { + private static String formatCode(String file, boolean isModuleInfo, CodeFormatter codeFormatter) throws Exception { IDocument doc = new Document(file); - 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); - edit.apply(doc); - - return doc.get(); - } - - /* - * In previous iterations of code formatting, we let Spotless use Google Java Formatter to remove unused imports. - * This worked well when code was valid, but when there were errors Spotless would halt processing on the first - * issue found. This meant that resolving issues were difficult, as it could take many iterations to resolve the - * regressions introduced. - * - * This then resulted in a new design where when Spotless failed on the entire fileset we would run Spotless - * individually on each file, and log the error message with the file content. This worked, but was tremendously - * slow as it required running many Maven processes, one for each file. - * - * This new implementation takes a dependency on google-java-format to run Google Java Formatter ourselves. This - * allows us to control error handling by processing all files, in-memory (much faster than letting Spotless run - * Google Java Formatter), and capturing all issues before attempting Spotless formatting (which now excludes - * unused import removal). - */ - private static List> removeUnusedImports(Collection> files, - Logger logger) { - List> updatedFiles = new ArrayList<>(files.size()); - - // Tracker for errors encountered while running Google Java Formatter. - StringBuilder errorCapture = new StringBuilder(); - - for (Map.Entry file : files) { - String content = file.getValue(); - try { - // Use Google Java Formatter to remove unused imports. - updatedFiles.add( - new AbstractMap.SimpleEntry<>(file.getKey(), RemoveUnusedImports.removeUnusedImports(content))); - } catch (FormatterException ex) { - String[] fileLines = content.split("\n"); - // Capture the error message and continue processing other files. - for (FormatterDiagnostic diagnostic : ex.diagnostics()) { - appendDiagnosticError(errorCapture, diagnostic, file.getKey(), fileLines, logger); - } - } - file.setValue(content); + if (edit == null && isModuleInfo) { + edit = codeFormatter.format(CodeFormatter.K_COMPILATION_UNIT | CodeFormatter.F_INCLUDE_COMMENTS, file, 0, + file.length(), 0, Constants.NEW_LINE); } - - if (errorCapture.length() > 0) { - throw new IllegalStateException("Google Java Formatter encountered errors:\n" + errorCapture); + if (edit == null) { + throw new IllegalStateException("Eclipse could not format the Java source."); } + edit.apply(doc); - return updatedFiles; + return doc.get(); } private static void appendDiagnosticError(StringBuilder errorCapture, FormatterDiagnostic diagnostic, diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java index 45ff2681ee9..dd64f684519 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ClientMethodTemplateBase.java @@ -221,10 +221,12 @@ private static void requestBodySchemaJavadoc(IType requestBodyType, JavaJavadocC return; } commentBlock.line("

Request Body Schema

"); + commentBlock.line(""); commentBlock.line("
{@code");
         bodySchemaJavadoc(requestBodyType, commentBlock, "", null, typesInJavadoc, isBodyParamRequired,
             isBodyParamRequired, true);
         commentBlock.line("}
"); + commentBlock.line(""); } private static void responseBodySchemaJavadoc(IType responseBodyType, JavaJavadocComment commentBlock, @@ -235,9 +237,11 @@ private static void responseBodySchemaJavadoc(IType responseBodyType, JavaJavado return; } commentBlock.line("

Response Body Schema

"); + commentBlock.line(""); commentBlock.line("
{@code");
         bodySchemaJavadoc(responseBodyType, commentBlock, "", null, typesInJavadoc, true, true, true);
         commentBlock.line("}
"); + commentBlock.line(""); } private static void bodySchemaJavadoc(IType type, JavaJavadocComment commentBlock, String indent, String name, diff --git a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandlerTest.java b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandlerTest.java index b8740567fe4..937cd3134ff 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandlerTest.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/partialupdate/util/PartialUpdateHandlerTest.java @@ -7,6 +7,7 @@ import static com.github.javaparser.StaticJavaParser.parse; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,6 +32,18 @@ public class PartialUpdateHandlerTest { + @Test + public void mergesIntoTheProvidedAst() { + CompilationUnit generated = parse("class Example { @Generated public void generated() {} }"); + CompilationUnit existing = parse("class Example { public void manual() {} }"); + + CompilationUnit merged = PartialUpdateHandler.mergeCompilationUnits(generated, existing).orElseThrow(); + + assertSame(generated, merged); + assertEquals(1, merged.getClassByName("Example").orElseThrow().getMethodsByName("generated").size()); + assertEquals(1, merged.getClassByName("Example").orElseThrow().getMethodsByName("manual").size()); + } + @Test public void testClassOrInterfaceFileToTestAddMemberToExistingFile() throws IOException, URISyntaxException { String existingFileContent = load("partialupdate/StringOperationWithAddedMemberClient.java"); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/PostprocessorTests.java b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/PostprocessorTests.java new file mode 100644 index 00000000000..b3c56aada80 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/PostprocessorTests.java @@ -0,0 +1,264 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.microsoft.typespec.http.client.generator.core.postprocessor; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.github.javaparser.ParseResult; +import com.github.javaparser.ParserConfiguration; +import com.github.javaparser.Processor; +import com.github.javaparser.StaticJavaParser; +import com.github.javaparser.ast.CompilationUnit; +import com.github.javaparser.ast.Node; +import com.microsoft.typespec.http.client.generator.core.Javagen; +import com.microsoft.typespec.http.client.generator.core.customization.Customization; +import com.microsoft.typespec.http.client.generator.core.customization.Editor; +import com.microsoft.typespec.http.client.generator.core.customization.LibraryCustomization; +import com.microsoft.typespec.http.client.generator.core.extension.model.Message; +import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings; +import com.microsoft.typespec.http.client.generator.core.extension.plugin.NewPlugin; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.utils.IOExceptionCheckedFunction; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; +import org.junit.jupiter.api.parallel.Isolated; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Isolated +@Execution(ExecutionMode.SAME_THREAD) +public class PostprocessorTests { + @Test + public void customizesBeforePartialUpdateWithoutReparsing(@TempDir Path tempDir) throws IOException { + String fileName = "src/main/java/sample/Example.java"; + Path existingFile = tempDir.resolve(fileName); + Files.createDirectories(existingFile.getParent()); + Files.writeString(existingFile, + String.join("\n", "package sample;", "import java.util.Map;", "import java.util.List;", + "public class Example {", " public Map> manual() { return null; }", "}")); + Path customizationFile = tempDir.resolve("PipelineCustomization.java"); + Files.writeString(customizationFile, String.join("\n", "import com.github.javaparser.ast.CompilationUnit;", + "import com.microsoft.typespec.http.client.generator.core.customization.Customization;", + "import com.microsoft.typespec.http.client.generator.core.customization.LibraryCustomization;", + "import org.slf4j.Logger;", "public class PipelineCustomization extends Customization {", + " private CompilationUnit original;", + " public void customize(LibraryCustomization library, Logger logger) {", + " library.getClass(\"sample\", \"Example\").customizeAst(ast -> {", + " if (!ast.getClassByName(\"Example\").orElseThrow().getMethodsByName(\"manual\").isEmpty())", + " throw new IllegalStateException(\"Partial update ran before customization\");", + " original = ast;", " ast.addImport(\"java.time.Instant\");", + " ast.getClassByName(\"Example\").orElseThrow().addField(\"Instant\", \"timestamp\");", + " }).customizeAst(ast -> {", + " if (ast != original) throw new IllegalStateException(\"Duplicate parse\");", + " ast.getClassByName(\"Example\").orElseThrow().getMethodsByName(\"generated\").get(0)", + " .setName(\"customized\");", " });", " }", "}")); + Map settings = Map.of("namespace", "sample", "partial-update", true, "customization-class", + customizationFile.toString(), "output-folder", tempDir.toString(), "configurationFiles", + List.of(tempDir.resolve("readme.md").toUri().toString())); + Map output = new HashMap<>(); + NewPlugin plugin = new NewPlugin(null, "test", "test") { + @Override + @SuppressWarnings("unchecked") + public T getValue(String key, IOExceptionCheckedFunction converter) { + return (T) settings.get(key); + } + + @Override + @SuppressWarnings("unchecked") + public T getValueWithJsonReader(String key, IOExceptionCheckedFunction converter) { + return (T) settings.get(key); + } + + @Override + public void message(Message message) { + } + + @Override + public void writeFile(String name, String content, List sourceMap) { + output.put(name, content); + } + + @Override + public boolean processInternal() { + return true; + } + }; + AtomicInteger parseCount = new AtomicInteger(); + Supplier counter = () -> new Processor() { + @Override + public void postProcess(ParseResult result, ParserConfiguration configuration) { + if (result.getResult().orElse(null) instanceof CompilationUnit) { + parseCount.incrementAndGet(); + } + } + }; + NewPlugin previousPlugin = Javagen.getPluginInstance(); + StaticJavaParser.getParserConfiguration().getProcessors().add(counter); + try { + JavaSettings.setHost(plugin); + JavaSettings.clear(); + new Postprocessor(plugin).postProcess(Map.of(fileName, + String.join("\n", "package sample;", "import java.util.Set;", "import java.util.List;", + "import javax.annotation.processing.Generated;", "public class Example {", + " @Generated(\"test\") public void generated() {}", "}"))); + assertEquals(2, parseCount.get()); + } finally { + StaticJavaParser.getParserConfiguration().getProcessors().remove(counter); + JavaSettings.setHost(previousPlugin); + JavaSettings.clear(); + } + String formatted = output.get(fileName); + assertTrue(formatted.contains("void customized()"), formatted); + assertTrue(formatted.contains("Map> manual()"), formatted); + assertTrue(formatted.contains("Instant timestamp;"), formatted); + assertFalse(formatted.contains("import java.util.Set;"), formatted); + assertEquals(1, formatted.split("import java.util.List;", -1).length - 1); + assertTrue(formatted.indexOf("import java.time.Instant;") < formatted.indexOf("import java.util.List;")); + assertTrue(formatted.indexOf("import java.util.List;") < formatted.indexOf("import java.util.Map;")); + } + + @Test + public void reusesAstAcrossCustomizationCallbacks() { + AtomicReference parsed = new AtomicReference<>(); + String fileName = "src/main/java/sample/Example.java"; + Customization customization = new Customization() { + @Override + public void customize(LibraryCustomization library, Logger logger) { + library.getClass("sample", "Example").customizeAst(ast -> { + parsed.set(ast); + ast.getClassByName("Example").orElseThrow().addField("String", "first"); + }).customizeAst(ast -> { + assertSame(parsed.get(), ast); + assertTrue(library.getRawEditor().getFileContent(fileName).contains("String first;")); + ast.getClassByName("Example").orElseThrow().addField("String", "second"); + }); + } + }; + + Map result = customization.run(Map.of(fileName, "package sample; public class Example {}"), + LoggerFactory.getLogger(PostprocessorTests.class)); + + assertTrue(result.get(fileName).contains("String first;")); + assertTrue(result.get(fileName).contains("String second;")); + } + + @Test + public void invalidatesAstAfterTextEdits() { + String fileName = "Example.java"; + Editor editor = new Editor(Map.of(fileName, "class Example {}")); + CompilationUnit original = editor.getCompilationUnit(fileName); + editor.replaceFile(fileName, "class Example { int replaced; }"); + CompilationUnit replaced = editor.getCompilationUnit(fileName); + assertNotSame(original, replaced); + assertTrue(replaced.getClassByName("Example").orElseThrow().getFieldByName("replaced").isPresent()); + + editor.getContents().put(fileName, "class Example { int direct; }"); + CompilationUnit direct = editor.getCompilationUnit(fileName); + assertNotSame(replaced, direct); + assertTrue(direct.getClassByName("Example").orElseThrow().getFieldByName("direct").isPresent()); + + editor.removeFile(fileName); + editor.addFile(fileName, "class Example {}"); + assertNotSame(direct, editor.getCompilationUnit(fileName)); + } + + @Test + public void discardsFailedAstEdits() { + String fileName = "src/main/java/sample/Example.java"; + Editor editor = new Editor(Map.of(fileName, "package sample; public class Example {}")); + Customization customization = new Customization() { + @Override + public void customize(LibraryCustomization library, Logger logger) { + assertThrows(IllegalStateException.class, + () -> library.getClass("sample", "Example").customizeAst(ast -> { + ast.getClassByName("Example").orElseThrow().addField("String", "failed"); + throw new IllegalStateException("Customization failed"); + })); + library.getClass("sample", "Example").customizeAst(ast -> { + assertTrue(ast.getClassByName("Example").orElseThrow().getFieldByName("failed").isEmpty()); + ast.getClassByName("Example").orElseThrow().addField("String", "successful"); + }); + } + }; + + customization.run(editor, LoggerFactory.getLogger(PostprocessorTests.class)); + + assertFalse(editor.getFileContent(fileName).contains("String failed;")); + assertTrue(editor.getFileContent(fileName).contains("String successful;")); + } + + @Test + public void compilesAndRunsCustomizationWithNestedClasses() throws Exception { + String code = String.join("\n", + "import com.microsoft.typespec.http.client.generator.core.customization.Customization;", + "import com.microsoft.typespec.http.client.generator.core.customization.LibraryCustomization;", + "import org.slf4j.Logger;", "public class InMemoryCustomization extends Customization {", + " public void customize(LibraryCustomization library, Logger logger) {", + " library.getClass(\"sample\", \"Example\").customizeAst(ast ->", + " ast.getClassByName(\"Example\").orElseThrow().addField(\"String\", new Helper().fieldName()));", + " }", " private static class Helper {", " String fieldName() { return \"customized\"; }", + " }", "}"); + + Customization customization + = Postprocessor.loadCustomizationClass("InMemoryCustomization", code).getConstructor().newInstance(); + String fileName = "src/main/java/sample/Example.java"; + Map result = customization.run(Map.of(fileName, "package sample; public class Example {}"), + LoggerFactory.getLogger(PostprocessorTests.class)); + + assertTrue(result.get(fileName).contains("String customized;"), result.get(fileName)); + } + + @Test + public void isolatesCompilationsWithTheSameClassName() throws Exception { + String template = String.join("\n", "package example;", + "import com.microsoft.typespec.http.client.generator.core.customization.Customization;", + "import com.microsoft.typespec.http.client.generator.core.customization.LibraryCustomization;", + "import org.slf4j.Logger;", "public class ReusedCustomization extends Customization {", + " public void customize(LibraryCustomization library, Logger logger) {}", + " public static String value() { return \"%s\"; }", "}"); + + Class first + = Postprocessor.loadCustomizationClass("example.ReusedCustomization", String.format(template, "first")); + Class second + = Postprocessor.loadCustomizationClass("example.ReusedCustomization", String.format(template, "second")); + + assertNotSame(first, second); + assertEquals("first", first.getMethod("value").invoke(null)); + assertEquals("second", second.getMethod("value").invoke(null)); + } + + @Test + public void reportsCompilationDiagnostics() { + IllegalStateException exception = assertThrows(IllegalStateException.class, + () -> Postprocessor.loadCustomizationClass("BrokenCustomization", + "public class BrokenCustomization { void broken() { missingSymbol(); } }")); + + assertTrue(exception.getMessage().contains("BrokenCustomization.java:1"), exception.getMessage()); + assertTrue(exception.getMessage().contains("missingSymbol"), exception.getMessage()); + } + + @Test + public void rejectsClassesThatAreNotCustomizations() { + IllegalStateException exception = assertThrows(IllegalStateException.class, + () -> Postprocessor.loadCustomizationClass("NotCustomization", "public class NotCustomization {}")); + + assertTrue(exception.getCause() instanceof ClassCastException); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtilTests.java b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtilTests.java index 4a7fad1c5a9..9723927a1fa 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtilTests.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/test/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtilTests.java @@ -3,14 +3,185 @@ package com.microsoft.typespec.http.client.generator.core.postprocessor.implementation; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import com.github.javaparser.Processor; +import com.github.javaparser.StaticJavaParser; +import com.microsoft.typespec.http.client.generator.core.customization.Editor; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import javax.tools.ToolProvider; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; public class CodeFormatterUtilTests { + @ParameterizedTest + @CsvSource({ "0,20,,1", "17,20,,1", "64,20,,2", "143,20,,4", "143,1,,1", "143,20,1,1", "143,20,100,4", "2,20,4,2" }) + public void boundsFormatterParallelism(int files, int processors, String configured, int expected) { + assertEquals(expected, CodeFormatterUtil.resolveParallelism(files, processors, configured)); + } + + @ParameterizedTest + @ValueSource(strings = { "0", "-1", "invalid" }) + public void rejectsInvalidParallelism(String configured) { + assertThrows(IllegalArgumentException.class, () -> CodeFormatterUtil.resolveParallelism(64, 20, configured)); + } + + @Test + public void parallelFormattingMatchesSequentialFormatting() { + Map files = new LinkedHashMap<>(); + files.put("module-info.java", "module sample { exports sample; }"); + files.put("package-info.java", "/** Sample package. */ package sample;"); + for (int index = 0; index < 64; index++) { + files.put("Example" + index + ".java", + "package sample;\nimport java.util.Set;\nimport java.util.List;\n" + "public class Example" + index + + " { List values; int identity() { return " + index + "; } }"); + } + List> sequential + = CodeFormatterUtil.formatCodeInternal(new Editor(files), null, 1).collect(Collectors.toList()); + + for (int iteration = 0; iteration < 3; iteration++) { + List> parallel + = CodeFormatterUtil.formatCodeInternal(new Editor(files), null, 4).collect(Collectors.toList()); + assertEquals(sequential, parallel); + } + assertEquals(List.copyOf(files.keySet()), + sequential.stream().map(Map.Entry::getKey).collect(Collectors.toList())); + } + + @Test + public void parallelFormattingReportsAllErrorsInOrder() { + Map files = new LinkedHashMap<>(); + files.put("First.java", "class First { void broken( }"); + files.put("Valid.java", "class Valid {}"); + files.put("Second.java", "class Second { void broken( }"); + IllegalStateException sequential = assertThrows(IllegalStateException.class, + () -> CodeFormatterUtil.formatCodeInternal(new Editor(files), null, 1).collect(Collectors.toList())); + IllegalStateException parallel = assertThrows(IllegalStateException.class, + () -> CodeFormatterUtil.formatCodeInternal(new Editor(files), null, 4).collect(Collectors.toList())); + + assertEquals(sequential.getMessage(), parallel.getMessage()); + assertTrue(parallel.getMessage().indexOf("First.java") < parallel.getMessage().indexOf("Second.java")); + } + + @Test + public void preservesInterruption() { + Thread.currentThread().interrupt(); + try { + assertThrows(IllegalStateException.class, () -> CodeFormatterUtil + .formatCodeInternal(new Editor(Map.of("Example.java", "class Example {}")), null, 4)); + assertTrue(Thread.currentThread().isInterrupted()); + } finally { + Thread.interrupted(); + } + assertEquals(1, CodeFormatterUtil.formatCode(Map.of("Example.java", "class Example {}")).size()); + } + + @Test + public void skipsAstParsingForUntouchedFilesIncludingModules() { + AtomicInteger parseCount = new AtomicInteger(); + Supplier counter = () -> { + parseCount.incrementAndGet(); + return new Processor(); + }; + StaticJavaParser.getParserConfiguration().getProcessors().add(counter); + try { + CodeFormatterUtil.formatCode(Map.of("module-info.java", "module sample {}", "nested/module-info.java", + "class NotAModule {}", "Example.java", "class Example {}")); + assertEquals(0, parseCount.get()); + } finally { + StaticJavaParser.getParserConfiguration().getProcessors().remove(counter); + } + } + + @ParameterizedTest + @ValueSource( + strings = { + "import java.util.Set;\nimport java.util.List;\nimport java.util.Map;\n" + + "class Example { List values; Set names; }", + "import java.util.Set;\nimport static java.util.Collections.singleton;\nimport java.util.List;\n" + + "import static java.util.Collections.emptyList;\nimport java.util.Map;\n" + + "class Example { List values = emptyList(); Set names = singleton(\"name\"); }", + "import java.util.*;\nimport static java.util.Collections.*;\n" + + "class Example { List values = emptyList(); }", + "// Header\npackage sample;\nimport java.util.Set;\n// Import note\nimport java.util.List;\n" + + "class Example { List values; Set names; }", + "import java.util.List; // Import note\nclass Example { List values; }", + "import java.util./* Import note */List;\nclass Example { List values; }", + "package sample;\r\n\r\nimport java.util.Set;\r\nimport java.util.\r\nList;\r\n" + + "/** Class documentation. */\r\nclass Example { List values; Set names; }" }) + public void tokenImportOrderingMatchesCachedAst(String source) { + Editor parsed = new Editor(Map.of("Example.java", source)); + parsed.getCompilationUnit("Example.java"); + + assertEquals(CodeFormatterUtil.formatCode(parsed), + CodeFormatterUtil.formatCode(Map.of("Example.java", source))); + } + + @Test + public void collectsSyntaxErrorsAcrossFiles() { + IllegalStateException exception = assertThrows(IllegalStateException.class, () -> CodeFormatterUtil.formatCode( + Map.of("First.java", "class First { void broken( }", "Second.java", "class Second { void broken( }"))); + + assertTrue(exception.getMessage().contains("First.java"), exception.getMessage()); + assertTrue(exception.getMessage().contains("Second.java"), exception.getMessage()); + } + + @ParameterizedTest + @ValueSource( + strings = { + "import java.util List;", + "import java.util.;", + "import static static java.util.List;", + "import java.util.*.List;", + "import ;" }) + public void malformedImportsAreNotRewrittenIntoValidCode(String imports) { + assertThrows(IllegalStateException.class, + () -> CodeFormatterUtil.formatCode(Map.of("Example.java", imports + "\nclass Example {}"))); + } + + @Test + public void schemaJavadocFormatting(@TempDir Path tempDir) throws IOException { + String schema = String.join("\n", " * {", " * nested (Required): {", + " * value: String(/a&b) (Required)", " * }", " * }"); + String initial = String.join("\n", "/**", " * Response body schema.", " * ", + " * 
{@code", schema, " * }
", " * ", " */", + "public class SchemaExample {public void method(){int value=1;}}", ""); + + String formatted = CodeFormatterUtil.formatCode(new HashMap<>(Map.of("SchemaExample.java", initial))).get(0); + + assertTrue(formatted.contains(schema), formatted); + assertTrue(formatted.contains("public void method() {"), formatted); + assertTrue(formatted.contains("int value = 1;"), formatted); + assertEquals(formatted, + CodeFormatterUtil.formatCode(new HashMap<>(Map.of("SchemaExample.java", formatted))).get(0)); + + Path source = tempDir.resolve("SchemaExample.java"); + Files.writeString(source, formatted); + Path documentation = tempDir.resolve("javadoc"); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + assertEquals(0, ToolProvider.getSystemDocumentationTool() + .run(null, output, output, "-quiet", "-Xdoclint:all", "-d", documentation.toString(), source.toString()), + output.toString(StandardCharsets.UTF_8)); + String html = Files.readString(documentation.resolve("SchemaExample.html")); + assertTrue(html.contains("
"), html);
+        assertTrue(html.contains("<value>/a&b"), html);
+    }
+
     @ParameterizedTest
     @ValueSource(strings = { "module-info.java", "src/main/module-info.java" })
     public void moduleInfoFormatting(String fileName) {
diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamer.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamer.java
index 4d1c20e49cd..ce49fc6a1e2 100644
--- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamer.java
+++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamer.java
@@ -52,24 +52,26 @@ public CodeModel processCodeModel() {
 
         try {
 
-            Path codeModelFolder;
-            try {
-                codeModelFolder = FileUtils.createTempDirectory("code-model" + UUID.randomUUID());
-                logger.info("Created temp directory for code model: {}", codeModelFolder);
-            } catch (IOException ex) {
-                logger.error("Failed to create temp directory for code model.", ex);
-                throw new RuntimeException("Failed to create temp directory for code model.", ex);
+            Path codeModelFolder = null;
+            if (getBooleanValue("debug", false) || getBooleanValue("debugger", false)) {
+                try {
+                    codeModelFolder = FileUtils.createTempDirectory("code-model" + UUID.randomUUID());
+                    logger.info("Created temp directory for code model: {}", codeModelFolder);
+                } catch (IOException ex) {
+                    logger.error("Failed to create temp directory for code model.", ex);
+                    throw new RuntimeException("Failed to create temp directory for code model.", ex);
+                }
             }
 
             CodeModel codeModel = getCodeModelAndWriteToTargetFolder(codeModelFolder);
             // Do necessary transformation
             codeModel = transform(codeModel);
             // Write to local file (for debugging)
-            Yaml newYaml = createYaml();
-            String output = newYaml.dump(codeModel);
-
-            // Output updated code model
-            Files.writeString(codeModelFolder.resolve("code-model-fluentnamer-no-tags.yaml"), output);
+            if (codeModelFolder != null) {
+                Yaml newYaml = createYaml();
+                String output = newYaml.dump(codeModel);
+                Files.writeString(codeModelFolder.resolve("code-model-fluentnamer-no-tags.yaml"), output);
+            }
 
             return codeModel;
         } catch (Exception e) {
@@ -87,7 +89,9 @@ protected CodeModel getCodeModelAndWriteToTargetFolder(Path codeModelFolder) thr
         // Read input file
         String file = readFile(files.get(0));
         // Write the input code model file to a local code model file to help debugging
-        Files.writeString(codeModelFolder.resolve("code-model.yaml"), file);
+        if (codeModelFolder != null) {
+            Files.writeString(codeModelFolder.resolve("code-model.yaml"), file);
+        }
         // Deserialize the input code model string to CodeModel object
         return loadCodeModel(file);
     }
diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamerTests.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamerTests.java
new file mode 100644
index 00000000000..193ec972dc6
--- /dev/null
+++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/FluentNamerTests.java
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.typespec.http.client.generator.mgmt;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.CodeModel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class FluentNamerTests {
+    @ParameterizedTest
+    @ValueSource(strings = { "none", "debug", "debugger" })
+    public void writesDebugYamlOnlyWhenEnabled(String debugOption) throws Exception {
+        AtomicReference debugDirectory = new AtomicReference<>();
+        CodeModel codeModel = new CodeModel();
+        FluentNamer namer = new FluentNamer(new MockJavagen(null), null, "test", "test") {
+            @Override
+            public boolean getBooleanValue(String key, boolean defaultValue) {
+                return debugOption.equals(key) || defaultValue;
+            }
+
+            @Override
+            protected CodeModel getCodeModelAndWriteToTargetFolder(Path codeModelFolder) {
+                debugDirectory.set(codeModelFolder);
+                return codeModel;
+            }
+
+            @Override
+            public CodeModel transform(CodeModel input) {
+                return input;
+            }
+        };
+
+        try {
+            assertSame(codeModel, namer.processCodeModel());
+            if ("none".equals(debugOption)) {
+                assertNull(debugDirectory.get());
+            } else {
+                assertTrue(Files.size(debugDirectory.get().resolve("code-model-fluentnamer-no-tags.yaml")) > 0);
+            }
+        } finally {
+            if (debugDirectory.get() != null) {
+                Files.deleteIfExists(debugDirectory.get().resolve("code-model-fluentnamer-no-tags.yaml"));
+                Files.delete(debugDirectory.get());
+            }
+        }
+    }
+}
diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java
index 5a5c9a18df5..2a99653a556 100644
--- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java
+++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/fluent/TypeSpecFluentPlugin.java
@@ -41,6 +41,8 @@ public TypeSpecFluentPlugin(EmitterOptions options, boolean sdkIntegration) {
         super(new TypeSpecPlugin.MockConnection(), "dummy", "dummy");
         this.emitterOptions = options;
 
+        SETTINGS_MAP.put("debug",
+            LOGGER.isDebugEnabled() || (options.getDevOptions() != null && options.getDevOptions().isDebug()));
         SETTINGS_MAP.put("namespace", options.getNamespace());
         if (!CoreUtils.isNullOrEmpty(options.getOutputDir())) {
             SETTINGS_MAP.put("output-folder", options.getOutputDir());
diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/DevOptions.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/DevOptions.java
index 22703a5fcf8..e4a1c85aec5 100644
--- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/DevOptions.java
+++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/model/DevOptions.java
@@ -3,19 +3,37 @@
 
 package com.microsoft.typespec.http.client.generator.model;
 
-import com.microsoft.typespec.http.client.generator.core.extension.base.util.JsonUtils;
 import io.clientcore.core.serialization.json.JsonReader;
 import io.clientcore.core.serialization.json.JsonSerializable;
+import io.clientcore.core.serialization.json.JsonToken;
 import io.clientcore.core.serialization.json.JsonWriter;
 import java.io.IOException;
 
 public class DevOptions implements JsonSerializable {
+    private boolean debug;
+
+    public boolean isDebug() {
+        return debug;
+    }
+
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        return jsonWriter.writeStartObject().writeEndObject();
+        return jsonWriter.writeStartObject().writeBooleanField("debug", debug).writeEndObject();
     }
 
     public static DevOptions fromJson(JsonReader jsonReader) throws IOException {
-        return JsonUtils.readEmptyObject(jsonReader, DevOptions::new);
+        return jsonReader.readObject(reader -> {
+            DevOptions options = new DevOptions();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+                if ("debug".equals(fieldName)) {
+                    options.debug = reader.getBoolean();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+            return options;
+        });
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator/src/test/java/com/microsoft/typespec/http/client/generator/model/EmitterOptionsTests.java b/packages/http-client-java/generator/http-client-generator/src/test/java/com/microsoft/typespec/http/client/generator/model/EmitterOptionsTests.java
index 3bf3c1234f3..e7ed4f500cb 100644
--- a/packages/http-client-java/generator/http-client-generator/src/test/java/com/microsoft/typespec/http/client/generator/model/EmitterOptionsTests.java
+++ b/packages/http-client-java/generator/http-client-generator/src/test/java/com/microsoft/typespec/http/client/generator/model/EmitterOptionsTests.java
@@ -12,6 +12,23 @@
 
 public final class EmitterOptionsTests {
 
+    @ParameterizedTest
+    @ValueSource(booleans = { false, true })
+    public void testDebugOptions(boolean debug) throws IOException {
+        try (JsonReader reader
+            = JsonReader.fromString("{\"dev-options\":{\"unknown\":{\"value\":1},\"debug\":" + debug + "}}")) {
+            EmitterOptions options = EmitterOptions.fromJson(reader);
+            Assertions.assertEquals(debug, options.getDevOptions().isDebug());
+        }
+    }
+
+    @Test
+    public void testDebugDisabledByDefault() throws IOException {
+        try (JsonReader reader = JsonReader.fromString("{\"dev-options\":{}}")) {
+            Assertions.assertFalse(EmitterOptions.fromJson(reader).getDevOptions().isDebug());
+        }
+    }
+
     @Test
     public void testMaxOverload() throws IOException {
         EmitterOptions options = EmitterOptions.fromJson(JsonReader.fromString("{\"max-overload\":\"model\"}"));

From a1eafe1bee8049a0f03a77c2ef590f14115a6429 Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Thu, 10 Sep 2026 14:02:32 -0400
Subject: [PATCH 2/5] Update dependencies

---
 .../http-client-java-jdt-java17-2026-09-10.md |  7 ++++
 .../http-client-generator-core/pom.xml        | 39 ++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 .chronus/changes/http-client-java-jdt-java17-2026-09-10.md

diff --git a/.chronus/changes/http-client-java-jdt-java17-2026-09-10.md b/.chronus/changes/http-client-java-jdt-java17-2026-09-10.md
new file mode 100644
index 00000000000..05ecb2772fd
--- /dev/null
+++ b/.chronus/changes/http-client-java-jdt-java17-2026-09-10.md
@@ -0,0 +1,7 @@
+---
+changeKind: dependencies
+packages:
+  - "@typespec/http-client-java"
+---
+
+Update Eclipse JDT Core to 3.47.0, ECJ to 3.46.100, and the Eclipse platform dependencies to their latest Java 17-compatible releases.
\ No newline at end of file
diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
index 49b31484ae9..1c12792b5c0 100644
--- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
@@ -89,12 +89,11 @@
       google-java-format
       1.28.0
     
-    
-    
+    
     
       org.eclipse.jdt
       org.eclipse.jdt.core
-      3.27.0
+      3.47.0
       
         
           
@@ -103,12 +102,16 @@
         
       
     
-    
-    
+    
+      org.eclipse.jdt
+      ecj
+      3.46.100
+    
+    
     
       org.eclipse.platform
       org.eclipse.core.resources
-      3.15.100
+      3.24.100
       
         
           
@@ -120,63 +123,63 @@
     
       org.eclipse.platform
       org.eclipse.core.expressions
-      3.8.0
+      3.9.700
     
     
       org.eclipse.platform
       org.eclipse.core.runtime
-      3.23.0
+      3.35.0
     
     
       org.eclipse.platform
       org.eclipse.core.jobs
-      3.12.0
+      3.15.900
     
     
       org.eclipse.platform
       org.eclipse.equinox.preferences
-      3.9.0
+      3.12.100
     
     
       org.eclipse.platform
       org.eclipse.core.contenttype
-      3.8.0
+      3.9.900
     
     
       org.eclipse.platform
       org.eclipse.equinox.app
-      1.6.0
+      1.7.600
     
     
       org.eclipse.platform
       org.eclipse.core.filesystem
-      1.9.100
+      1.11.500
     
     
       org.eclipse.platform
       org.eclipse.equinox.registry
-      3.11.0
+      3.12.600
     
     
       org.eclipse.platform
       org.eclipse.equinox.common
-      3.15.0
+      3.21.0
     
     
       org.eclipse.platform
       
       org.eclipse.osgi
-      3.17.0
+      3.24.300
     
     
       org.eclipse.platform
       org.eclipse.text
-      3.12.0
+      3.14.800
     
     
       org.eclipse.platform
       org.eclipse.core.commands
-      3.10.100
+      3.13.0
     
 
     

From 55b99b4f26451a1a38fdcc362f9d34b4418d283c Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Thu, 10 Sep 2026 15:08:58 -0400
Subject: [PATCH 3/5] Update generated code with new formatting blocks

---
 .../access/InternalOperationAsyncClient.java  |  36 +-
 .../core/access/InternalOperationClient.java  |  30 +-
 .../access/PublicOperationAsyncClient.java    |  24 +-
 .../core/access/PublicOperationClient.java    |  18 +-
 .../RelativeModelInOperationAsyncClient.java  |  38 +-
 .../RelativeModelInOperationClient.java       |  32 +-
 .../SharedModelInOperationAsyncClient.java    |  24 +-
 .../access/SharedModelInOperationClient.java  |  18 +-
 .../InternalOperationsImpl.java               |  66 +-
 .../implementation/PublicOperationsImpl.java  |  42 +-
 .../RelativeModelInOperationsImpl.java        |  70 +--
 .../SharedModelInOperationsImpl.java          |  42 +-
 .../AlternateTypeAsyncClient.java             |  36 +-
 .../alternatetype/AlternateTypeClient.java    |  36 +-
 .../implementation/ExternalTypesImpl.java     |  72 +--
 .../ClientDefaultValueAsyncClient.java        |  22 +-
 .../ClientDefaultValueClient.java             |  19 +-
 .../ClientDefaultValueClientImpl.java         |  41 +-
 .../core/clientdoc/ClientDocAsyncClient.java  |  22 +-
 .../core/clientdoc/ClientDocClient.java       |  19 +-
 .../implementation/DocumentationsImpl.java    |  41 +-
 .../defaultclient/HeaderParamAsyncClient.java |   9 +-
 .../defaultclient/HeaderParamClient.java      |   9 +-
 .../defaultclient/MixedParamsAsyncClient.java |   9 +-
 .../defaultclient/MixedParamsClient.java      |   9 +-
 .../MultipleParamsAsyncClient.java            |   9 +-
 .../defaultclient/MultipleParamsClient.java   |   9 +-
 .../defaultclient/PathParamAsyncClient.java   |   9 +-
 .../defaultclient/PathParamClient.java        |   9 +-
 .../defaultclient/QueryParamAsyncClient.java  |   9 +-
 .../defaultclient/QueryParamClient.java       |   9 +-
 .../implementation/HeaderParamClientImpl.java |  18 +-
 .../implementation/MixedParamsClientImpl.java |  18 +-
 .../MultipleParamsClientImpl.java             |  18 +-
 .../implementation/PathParamClientImpl.java   |  18 +-
 .../implementation/QueryParamClientImpl.java  |  18 +-
 ...IndividuallyNestedWithPathAsyncClient.java |   9 +-
 .../IndividuallyNestedWithPathClient.java     |   9 +-
 ...ndividuallyNestedWithQueryAsyncClient.java |   9 +-
 .../IndividuallyNestedWithQueryClient.java    |   9 +-
 .../IndividuallyNestedWithPathClientImpl.java |  18 +-
 ...IndividuallyNestedWithQueryClientImpl.java |  18 +-
 ...duallyParentNestedWithPathAsyncClient.java |   9 +-
 ...ndividuallyParentNestedWithPathClient.java |   9 +-
 ...uallyParentNestedWithQueryAsyncClient.java |   9 +-
 ...dividuallyParentNestedWithQueryClient.java |   9 +-
 ...iduallyParentNestedWithPathClientImpl.java |  18 +-
 ...duallyParentNestedWithQueryClientImpl.java |  18 +-
 .../MoveMethodParameterToAsyncClient.java     |   9 +-
 .../MoveMethodParameterToClient.java          |   9 +-
 .../implementation/BlobOperationsImpl.java    |  18 +-
 ...serializeEmptyStringAsNullAsyncClient.java |  12 +-
 .../DeserializeEmptyStringAsNullClient.java   |   9 +-
 ...eserializeEmptyStringAsNullClientImpl.java |  21 +-
 .../core/exactname/EnumValueAsyncClient.java  |  19 +-
 .../core/exactname/EnumValueClient.java       |  19 +-
 .../core/exactname/ModelAsyncClient.java      |  19 +-
 .../core/exactname/ModelClient.java           |  19 +-
 .../core/exactname/PropertyAsyncClient.java   |  19 +-
 .../core/exactname/PropertyClient.java        |  19 +-
 .../implementation/EnumValuesImpl.java        |  38 +-
 .../exactname/implementation/ModelsImpl.java  |  38 +-
 .../implementation/PropertiesImpl.java        |  38 +-
 .../FlattenPropertyAsyncClient.java           |  88 ++-
 .../FlattenPropertyClient.java                |  76 +--
 .../FlattenPropertyClientImpl.java            | 164 ++---
 .../AnimalOperationsAsyncClient.java          |  38 +-
 .../AnimalOperationsClient.java               |  38 +-
 .../DogOperationsAsyncClient.java             |  19 +-
 .../DogOperationsClient.java                  |  19 +-
 .../PetOperationsAsyncClient.java             |  38 +-
 .../PetOperationsClient.java                  |  38 +-
 .../implementation/AnimalOperationsImpl.java  |  76 +--
 .../implementation/DogOperationsImpl.java     |  38 +-
 .../implementation/PetOperationsImpl.java     |  76 +--
 .../nextlinkverb/NextLinkVerbAsyncClient.java |   9 +-
 .../core/nextlinkverb/NextLinkVerbClient.java |   9 +-
 .../NextLinkVerbClientImpl.java               |  54 +-
 .../ResponseAsBoolAsyncClient.java            |  18 +-
 .../responseasbool/ResponseAsBoolClient.java  |  18 +-
 .../implementation/HeadAsBooleansImpl.java    |  36 +-
 .../usage/ModelInOperationAsyncClient.java    |  60 +-
 .../core/usage/ModelInOperationClient.java    |  60 +-
 .../core/usage/NamespaceUsageAsyncClient.java |  11 +-
 .../core/usage/NamespaceUsageClient.java      |  11 +-
 .../implementation/ModelInOperationsImpl.java | 120 ++--
 .../implementation/NamespaceUsagesImpl.java   |  22 +-
 .../azure/core/basic/BasicAsyncClient.java    |  95 ++-
 .../java/azure/core/basic/BasicClient.java    |  95 ++-
 .../basic/implementation/BasicClientImpl.java | 268 ++++----
 .../azure/core/lro/rpc/RpcAsyncClient.java    |  19 +-
 .../java/azure/core/lro/rpc/RpcClient.java    |  19 +-
 .../lro/rpc/implementation/RpcClientImpl.java | 117 ++--
 .../lro/standard/StandardAsyncClient.java     |  37 +-
 .../core/lro/standard/StandardClient.java     |  37 +-
 .../implementation/StandardClientImpl.java    | 228 +++----
 .../azure/core/model/ModelAsyncClient.java    |  37 +-
 .../java/azure/core/model/ModelClient.java    |  37 +-
 .../AzureCoreEmbeddingVectorsImpl.java        |  74 +--
 .../java/azure/core/page/PageAsyncClient.java |  68 +-
 .../main/java/azure/core/page/PageClient.java |  68 +-
 .../page/TwoModelsAsPageItemAsyncClient.java  |  24 +-
 .../core/page/TwoModelsAsPageItemClient.java  |  24 +-
 .../page/implementation/PageClientImpl.java   | 362 +++++------
 .../TwoModelsAsPageItemsImpl.java             | 144 ++---
 .../azure/core/scalar/ScalarAsyncClient.java  |  37 +-
 .../java/azure/core/scalar/ScalarClient.java  |  37 +-
 .../AzureLocationScalarsImpl.java             |  74 +--
 .../azure/core/traits/TraitsAsyncClient.java  |  76 +--
 .../java/azure/core/traits/TraitsClient.java  |  73 +--
 .../implementation/TraitsClientImpl.java      | 149 ++---
 .../encode/duration/DurationAsyncClient.java  |   9 +-
 .../azure/encode/duration/DurationClient.java |   9 +-
 .../implementation/DurationClientImpl.java    |  18 +-
 .../basic/AzureExampleAsyncClient.java        |  19 +-
 .../example/basic/AzureExampleClient.java     |  19 +-
 .../AzureExampleClientImpl.java               |  38 +-
 .../payload/pageable/PageableAsyncClient.java |  15 +-
 .../payload/pageable/PageableClient.java      |  15 +-
 .../implementation/PageableClientImpl.java    |  78 ++-
 .../PreviewVersionAsyncClient.java            |  48 +-
 .../previewversion/PreviewVersionClient.java  |  45 +-
 .../PreviewVersionClientImpl.java             |  93 ++-
 .../ClientNamespaceFirstAsyncClient.java      |   9 +-
 .../ClientNamespaceFirstClient.java           |   9 +-
 .../ClientNamespaceFirstClientImpl.java       |  18 +-
 .../ClientNamespaceSecondClientImpl.java      |  18 +-
 .../ClientNamespaceSecondAsyncClient.java     |   9 +-
 .../second/ClientNamespaceSecondClient.java   |   9 +-
 .../java/client/naming/ModelAsyncClient.java  |  18 +-
 .../main/java/client/naming/ModelClient.java  |  18 +-
 .../client/naming/PropertyAsyncClient.java    |  27 +-
 .../java/client/naming/PropertyClient.java    |  27 +-
 .../client/naming/UnionEnumAsyncClient.java   |  18 +-
 .../java/client/naming/UnionEnumClient.java   |  18 +-
 .../FirstOperationsAsyncClient.java           |  19 +-
 .../enumconflict/FirstOperationsClient.java   |  19 +-
 .../SecondOperationsAsyncClient.java          |  19 +-
 .../enumconflict/SecondOperationsClient.java  |  19 +-
 .../implementation/FirstOperationsImpl.java   |  38 +-
 .../implementation/SecondOperationsImpl.java  |  38 +-
 .../implementation/ModelClientsImpl.java      |  36 +-
 .../naming/implementation/PropertiesImpl.java |  54 +-
 .../naming/implementation/UnionEnumsImpl.java |  36 +-
 .../client/overload/OverloadAsyncClient.java  |  18 +-
 .../java/client/overload/OverloadClient.java  |  18 +-
 .../implementation/OverloadClientImpl.java    |  36 +-
 .../java/documentation/ListsAsyncClient.java  |   9 +-
 .../main/java/documentation/ListsClient.java  |   9 +-
 .../implementation/ListsImpl.java             |  18 +-
 .../java/encode/array/ArrayAsyncClient.java   | 228 +++----
 .../main/java/encode/array/ArrayClient.java   | 228 +++----
 .../array/implementation/PropertiesImpl.java  | 456 ++++++--------
 .../booleannamespace/BooleanAsyncClient.java  |  76 +--
 .../booleannamespace/BooleanClient.java       |  76 +--
 .../implementation/PropertiesImpl.java        | 152 ++---
 .../encode/bytes/PropertyAsyncClient.java     |  76 +--
 .../java/encode/bytes/PropertyClient.java     |  76 +--
 .../encode/bytes/RequestBodyAsyncClient.java  |  45 +-
 .../java/encode/bytes/RequestBodyClient.java  |  45 +-
 .../encode/bytes/ResponseBodyAsyncClient.java |  45 +-
 .../java/encode/bytes/ResponseBodyClient.java |  45 +-
 .../bytes/implementation/PropertiesImpl.java  | 152 ++---
 .../implementation/RequestBodiesImpl.java     |  90 ++-
 .../implementation/ResponseBodiesImpl.java    |  90 ++-
 .../encode/datetime/PropertyAsyncClient.java  |  95 ++-
 .../java/encode/datetime/PropertyClient.java  |  95 ++-
 .../implementation/PropertiesImpl.java        | 190 +++---
 .../encode/duration/PropertyAsyncClient.java  | 266 ++++----
 .../java/encode/duration/PropertyClient.java  | 266 ++++----
 .../implementation/PropertiesImpl.java        | 532 +++++++---------
 .../encode/numeric/NumericAsyncClient.java    |  57 +-
 .../java/encode/numeric/NumericClient.java    |  57 +-
 .../implementation/PropertiesImpl.java        | 114 ++--
 .../basic/ExplicitBodyAsyncClient.java        |   9 +-
 .../parameters/basic/ExplicitBodyClient.java  |   9 +-
 .../basic/ImplicitBodyAsyncClient.java        |   9 +-
 .../parameters/basic/ImplicitBodyClient.java  |   9 +-
 .../implementation/ExplicitBodiesImpl.java    |  18 +-
 .../implementation/ImplicitBodiesImpl.java    |  18 +-
 .../BodyOptionalityAsyncClient.java           |  18 +-
 .../BodyOptionalityClient.java                |  18 +-
 .../OptionalExplicitAsyncClient.java          |  32 +-
 .../OptionalExplicitClient.java               |  32 +-
 .../BodyOptionalityClientImpl.java            |  36 +-
 .../implementation/OptionalExplicitsImpl.java |  64 +-
 .../bodyroot/BodyRootAsyncClient.java         |   9 +-
 .../parameters/bodyroot/BodyRootClient.java   |   9 +-
 .../implementation/BodyRootClientImpl.java    |  18 +-
 .../parameters/spread/AliasAsyncClient.java   |  45 +-
 .../java/parameters/spread/AliasClient.java   |  45 +-
 .../parameters/spread/ModelAsyncClient.java   |  36 +-
 .../java/parameters/spread/ModelClient.java   |  36 +-
 .../spread/implementation/AliasImpl.java      |  90 ++-
 .../spread/implementation/ModelsImpl.java     |  72 +--
 .../DifferentBodyAsyncClient.java             |  18 +-
 .../DifferentBodyClient.java                  |  18 +-
 .../SameBodyAsyncClient.java                  |  18 +-
 .../contentnegotiation/SameBodyClient.java    |  18 +-
 .../implementation/DifferentBodiesImpl.java   |  36 +-
 .../implementation/SameBodiesImpl.java        |  36 +-
 .../JsonMergePatchAsyncClient.java            |  64 +-
 .../jsonmergepatch/JsonMergePatchClient.java  |  64 +-
 .../JsonMergePatchClientImpl.java             | 128 ++--
 .../mediatype/MediaTypeAsyncClient.java       |  36 +-
 .../payload/mediatype/MediaTypeClient.java    |  36 +-
 .../implementation/StringBodiesImpl.java      |  72 +--
 .../multipart/FormDataAsyncClient.java        |  24 +-
 .../payload/multipart/FormDataClient.java     |  24 +-
 .../multipart/FormDataFileAsyncClient.java    |  28 +-
 .../payload/multipart/FormDataFileClient.java |  28 +-
 ...rmDataHttpPartsContentTypeAsyncClient.java |  72 +--
 .../FormDataHttpPartsContentTypeClient.java   |  72 +--
 .../payload/pageable/PageSizeAsyncClient.java |  24 +-
 .../java/payload/pageable/PageSizeClient.java |  24 +-
 ...nationAlternateInitialVerbAsyncClient.java |  19 +-
 ...nPaginationAlternateInitialVerbClient.java |  19 +-
 .../ServerDrivenPaginationAsyncClient.java    |  27 +-
 .../ServerDrivenPaginationClient.java         |  27 +-
 ...aginationContinuationTokenAsyncClient.java | 138 ++--
 ...ivenPaginationContinuationTokenClient.java | 138 ++--
 .../pageable/XmlPaginationAsyncClient.java    |  24 +-
 .../payload/pageable/XmlPaginationClient.java |  24 +-
 .../implementation/PageSizesImpl.java         |  96 ++-
 ...enPaginationAlternateInitialVerbsImpl.java |  94 ++-
 ...rivenPaginationContinuationTokensImpl.java | 552 ++++++++--------
 .../ServerDrivenPaginationsImpl.java          | 162 +++--
 .../implementation/XmlPaginationsImpl.java    | 123 ++--
 ...ModelWithArrayOfModelValueAsyncClient.java |  18 +-
 .../xml/ModelWithArrayOfModelValueClient.java |  18 +-
 .../ModelWithAttributesValueAsyncClient.java  |  21 +-
 .../xml/ModelWithAttributesValueClient.java   |  18 +-
 .../ModelWithDatetimeValueAsyncClient.java    |  21 +-
 .../xml/ModelWithDatetimeValueClient.java     |  18 +-
 .../ModelWithDictionaryValueAsyncClient.java  |  21 +-
 .../xml/ModelWithDictionaryValueClient.java   |  18 +-
 .../ModelWithEmptyArrayValueAsyncClient.java  |  21 +-
 .../xml/ModelWithEmptyArrayValueClient.java   |  21 +-
 ...ModelWithEncodedNamesValueAsyncClient.java |  21 +-
 .../xml/ModelWithEncodedNamesValueClient.java |  18 +-
 .../xml/ModelWithEnumValueAsyncClient.java    |  21 +-
 .../payload/xml/ModelWithEnumValueClient.java |  18 +-
 ...NamespaceOnPropertiesValueAsyncClient.java |  21 +-
 ...lWithNamespaceOnPropertiesValueClient.java |  21 +-
 .../ModelWithNamespaceValueAsyncClient.java   |  21 +-
 .../xml/ModelWithNamespaceValueClient.java    |  18 +-
 .../ModelWithNestedModelValueAsyncClient.java |  21 +-
 .../xml/ModelWithNestedModelValueClient.java  |  18 +-
 ...odelWithOptionalFieldValueAsyncClient.java |  18 +-
 .../ModelWithOptionalFieldValueClient.java    |  18 +-
 ...odelWithRenamedArraysValueAsyncClient.java |  21 +-
 .../ModelWithRenamedArraysValueClient.java    |  21 +-
 ...lWithRenamedAttributeValueAsyncClient.java |  21 +-
 .../ModelWithRenamedAttributeValueClient.java |  18 +-
 ...odelWithRenamedFieldsValueAsyncClient.java |  21 +-
 .../ModelWithRenamedFieldsValueClient.java    |  21 +-
 ...ithRenamedNestedModelValueAsyncClient.java |  21 +-
 ...odelWithRenamedNestedModelValueClient.java |  18 +-
 ...elWithRenamedPropertyValueAsyncClient.java |  21 +-
 .../ModelWithRenamedPropertyValueClient.java  |  18 +-
 ...edUnwrappedModelArrayValueAsyncClient.java |  21 +-
 ...RenamedUnwrappedModelArrayValueClient.java |  18 +-
 ...ppedAndItemModelArrayValueAsyncClient.java |  21 +-
 ...edWrappedAndItemModelArrayValueClient.java |  18 +-
 ...amedWrappedModelArrayValueAsyncClient.java |  21 +-
 ...thRenamedWrappedModelArrayValueClient.java |  18 +-
 ...ModelWithSimpleArraysValueAsyncClient.java |  21 +-
 .../xml/ModelWithSimpleArraysValueClient.java |  18 +-
 .../xml/ModelWithTextValueAsyncClient.java    |  21 +-
 .../payload/xml/ModelWithTextValueClient.java |  18 +-
 ...delWithUnwrappedArrayValueAsyncClient.java |  21 +-
 .../ModelWithUnwrappedArrayValueClient.java   |  18 +-
 ...thUnwrappedModelArrayValueAsyncClient.java |  21 +-
 ...delWithUnwrappedModelArrayValueClient.java |  18 +-
 ...mitiveCustomItemNamesValueAsyncClient.java |  21 +-
 ...edPrimitiveCustomItemNamesValueClient.java |  18 +-
 .../xml/SimpleModelValueAsyncClient.java      |  21 +-
 .../payload/xml/SimpleModelValueClient.java   |  18 +-
 .../payload/xml/XmlErrorValueAsyncClient.java |  12 +-
 .../java/payload/xml/XmlErrorValueClient.java |   9 +-
 .../ModelWithArrayOfModelValuesImpl.java      |  36 +-
 .../ModelWithAttributesValuesImpl.java        |  39 +-
 .../ModelWithDatetimeValuesImpl.java          |  39 +-
 .../ModelWithDictionaryValuesImpl.java        |  39 +-
 .../ModelWithEmptyArrayValuesImpl.java        |  42 +-
 .../ModelWithEncodedNamesValuesImpl.java      |  39 +-
 .../ModelWithEnumValuesImpl.java              |  39 +-
 ...elWithNamespaceOnPropertiesValuesImpl.java |  42 +-
 .../ModelWithNamespaceValuesImpl.java         |  39 +-
 .../ModelWithNestedModelValuesImpl.java       |  39 +-
 .../ModelWithOptionalFieldValuesImpl.java     |  36 +-
 .../ModelWithRenamedArraysValuesImpl.java     |  42 +-
 .../ModelWithRenamedAttributeValuesImpl.java  |  39 +-
 .../ModelWithRenamedFieldsValuesImpl.java     |  42 +-
 ...ModelWithRenamedNestedModelValuesImpl.java |  39 +-
 .../ModelWithRenamedPropertyValuesImpl.java   |  39 +-
 ...hRenamedUnwrappedModelArrayValuesImpl.java |  39 +-
 ...medWrappedAndItemModelArrayValuesImpl.java |  39 +-
 ...ithRenamedWrappedModelArrayValuesImpl.java |  39 +-
 .../ModelWithSimpleArraysValuesImpl.java      |  39 +-
 .../ModelWithTextValuesImpl.java              |  39 +-
 .../ModelWithUnwrappedArrayValuesImpl.java    |  39 +-
 ...odelWithUnwrappedModelArrayValuesImpl.java |  39 +-
 ...pedPrimitiveCustomItemNamesValuesImpl.java |  39 +-
 .../implementation/SimpleModelValuesImpl.java |  39 +-
 .../implementation/XmlErrorValuesImpl.java    |  21 +-
 .../encodedname/json/JsonAsyncClient.java     |  18 +-
 .../encodedname/json/JsonClient.java          |  18 +-
 .../json/implementation/PropertiesImpl.java   |  36 +-
 .../ExtensibleStringsAsyncClient.java         |  24 +-
 .../specialwords/ExtensibleStringsClient.java |  22 +-
 .../ModelPropertiesAsyncClient.java           |  27 +-
 .../specialwords/ModelPropertiesClient.java   |  27 +-
 .../java/specialwords/ModelsAsyncClient.java  | 297 ++++-----
 .../main/java/specialwords/ModelsClient.java  | 297 ++++-----
 ...eservedOperationBodyParamsAsyncClient.java |   9 +-
 .../ReservedOperationBodyParamsClient.java    |   9 +-
 .../implementation/ExtensibleStringsImpl.java |  44 +-
 .../implementation/ModelPropertiesImpl.java   |  54 +-
 .../implementation/ModelsImpl.java            | 594 ++++++++----------
 .../ReservedOperationBodyParamsImpl.java      |  18 +-
 .../streaming/jsonl/JsonlAsyncClient.java     |  18 +-
 .../java/streaming/jsonl/JsonlClient.java     |  18 +-
 .../jsonl/implementation/BasicsImpl.java      |  36 +-
 .../java/streaming/sse/NamedAsyncClient.java  |   9 +-
 .../main/java/streaming/sse/NamedClient.java  |   9 +-
 .../streaming/sse/RetrieveAsyncClient.java    |  19 +-
 .../java/streaming/sse/RetrieveClient.java    |  19 +-
 .../streaming/sse/UnnamedAsyncClient.java     |   9 +-
 .../java/streaming/sse/UnnamedClient.java     |   9 +-
 .../sse/implementation/NamedsImpl.java        |  18 +-
 .../sse/implementation/RetrievesImpl.java     |  38 +-
 .../sse/implementation/UnnamedsImpl.java      |  18 +-
 .../tsptest/builtin/BuiltinAsyncClient.java   |  34 +-
 .../java/tsptest/builtin/BuiltinClient.java   |  34 +-
 .../implementation/BuiltinOpsImpl.java        |  68 +-
 .../clientoption/ClientOptionAsyncClient.java |   9 +-
 .../clientoption/ClientOptionClient.java      |   9 +-
 .../implementation/ClientRequiredsImpl.java   |  18 +-
 .../DiscriminatorEdgeCasesAsyncClient.java    |  27 +-
 .../DiscriminatorEdgeCasesClient.java         |  27 +-
 .../DiscriminatorEdgeCasesClientImpl.java     |  54 +-
 .../EnumNestedDiscriminatorAsyncClient.java   |  66 +-
 .../EnumNestedDiscriminatorClient.java        |  66 +-
 .../EnumNestedDiscriminatorClientImpl.java    | 132 ++--
 .../enumservice/EnumServiceAsyncClient.java   |  93 ++-
 .../enumservice/EnumServiceClient.java        |  89 ++-
 .../implementation/EnumServiceClientImpl.java | 178 +++---
 .../errormodel/ErrorModelAsyncClient.java     |   9 +-
 .../tsptest/errormodel/ErrorModelClient.java  |   9 +-
 .../implementation/ErrorOpsImpl.java          |  18 +-
 .../tsptest/external/ExternalAsyncClient.java |  19 +-
 .../java/tsptest/external/ExternalClient.java |  19 +-
 .../implementation/ExternalOpsImpl.java       |  38 +-
 .../tsptest/flatten/FlattenAsyncClient.java   |  79 ++-
 .../java/tsptest/flatten/FlattenClient.java   |  79 ++-
 .../implementation/FlattenClientImpl.java     | 134 ++--
 .../tsptest/internal/InternalAsyncClient.java |  37 +-
 .../java/tsptest/internal/InternalClient.java |  37 +-
 .../implementation/InternalOpsImpl.java       |  74 +--
 .../LiteralServiceAsyncClient.java            |  26 +-
 .../literalservice/LiteralServiceClient.java  |  26 +-
 .../implementation/LiteralOpsImpl.java        |  52 +-
 .../longrunning/LongRunningAsyncClient.java   |  45 +-
 .../longrunning/LongRunningClient.java        |  45 +-
 .../implementation/LongRunningClientImpl.java | 202 +++---
 .../MaxOverloadModelAsyncClient.java          | 134 ++--
 .../MaxOverloadModelClient.java               | 134 ++--
 .../MaxOverloadModelClientImpl.java           | 554 ++++++++--------
 .../MethodOverrideAsyncClient.java            | 101 ++-
 .../methodoverride/MethodOverrideClient.java  | 101 ++-
 .../MethodOverrideClientImpl.java             | 202 +++---
 .../java/tsptest/model/ModelAsyncClient.java  |  66 +-
 .../main/java/tsptest/model/ModelClient.java  |  66 +-
 .../model/implementation/ModelOpsImpl.java    | 132 ++--
 .../MultiContentTypesAsyncClient.java         |  12 +-
 .../MultiContentTypesClient.java              |  12 +-
 ...tipleContentTypesOnRequestAsyncClient.java |  45 +-
 .../MultipleContentTypesOnRequestClient.java  |  45 +-
 .../SingleContentTypeAsyncClient.java         |  18 +-
 .../SingleContentTypeClient.java              |  18 +-
 .../MultiContentTypesClientImpl.java          |  24 +-
 .../MultipleContentTypesOnRequestsImpl.java   |  90 ++-
 .../SingleContentTypesImpl.java               |  36 +-
 .../AlphaAsyncClient.java                     |   9 +-
 .../AlphaClient.java                          |   9 +-
 .../BetaAsyncClient.java                      |   9 +-
 .../BetaClient.java                           |   9 +-
 .../implementation/AlphaClientImpl.java       |  18 +-
 .../implementation/BetaClientImpl.java        |  18 +-
 .../namespaceclient/NamespaceAsyncClient.java |   9 +-
 .../namespaceclient/NamespaceClient.java      |   9 +-
 .../implementation/NamespaceClientImpl.java   |  18 +-
 .../tsptest/naming/NamingAsyncClient.java     |  36 +-
 .../java/tsptest/naming/NamingClient.java     |   9 +-
 .../naming/implementation/NamingOpsImpl.java  |  72 +--
 .../NamingJavaParserAsyncClient.java          |  36 +-
 .../NamingJavaParserClient.java               |  36 +-
 .../implementation/NamingOpsImpl.java         |  72 +--
 .../tsptest/optional/OptionalAsyncClient.java |  51 +-
 .../java/tsptest/optional/OptionalClient.java |  47 +-
 .../implementation/OptionalOpsImpl.java       |  94 ++-
 .../PartialUpdateAsyncClient.java             |   9 +-
 .../partialupdate/PartialUpdateClient.java    |   9 +-
 .../PartialUpdateClientImpl.java              |  18 +-
 .../java/tsptest/patch/PatchAsyncClient.java  |  89 ++-
 .../main/java/tsptest/patch/PatchClient.java  |  89 ++-
 .../patch/implementation/PatchesImpl.java     | 178 +++---
 .../ProtocolAndConvenientAsyncClient.java     | 113 ++--
 .../ProtocolAndConvenientClient.java          | 113 ++--
 .../ProtocolAndConvenienceOpsImpl.java        | 356 +++++------
 .../ProtocolApiSyncOverAsyncAsyncClient.java  |  28 +-
 .../ProtocolApiSyncOverAsyncClient.java       |  28 +-
 .../ProtocolApiSyncOverAsyncClientImpl.java   |  80 +--
 .../tsptest/response/ResponseAsyncClient.java | 181 +++---
 .../java/tsptest/response/ResponseClient.java | 178 +++---
 .../implementation/ResponseClientImpl.java    | 485 +++++++-------
 .../ServiceAsyncClient.java                   |   9 +-
 .../ServiceClient.java                        |   9 +-
 .../ServiceClientNameConflictAsyncClient.java |   9 +-
 .../ServiceClientNameConflictClient.java      |   9 +-
 .../ServiceClientNameConflictClientImpl.java  |  18 +-
 .../implementation/ServicesImpl.java          |  18 +-
 .../specialchars/SpecialCharsAsyncClient.java |  19 +-
 .../specialchars/SpecialCharsClient.java      |  19 +-
 .../implementation/BuiltinOpsImpl.java        |  38 +-
 .../EtagHeadersAsyncClient.java               |  87 ++-
 .../specialheaders/EtagHeadersClient.java     |  87 ++-
 .../EtagHeadersOptionalBodyAsyncClient.java   |  46 +-
 .../EtagHeadersOptionalBodyClient.java        |  46 +-
 .../RepeatabilityHeadersAsyncClient.java      |  99 ++-
 .../RepeatabilityHeadersClient.java           |  99 ++-
 .../implementation/EtagHeadersImpl.java       | 216 +++----
 .../EtagHeadersOptionalBodiesImpl.java        |  92 ++-
 .../RepeatabilityHeadersImpl.java             | 310 ++++-----
 .../tsptest/subclass/SubclassAsyncClient.java |  19 +-
 .../java/tsptest/subclass/SubclassClient.java |  19 +-
 .../subclass/implementation/SubclassImpl.java |  38 +-
 .../java/tsptest/union/UnionAsyncClient.java  |  33 +-
 .../main/java/tsptest/union/UnionClient.java  |  33 +-
 .../implementation/UnionFlattenOpsImpl.java   | 105 ++--
 .../versioning/VersioningAsyncClient.java     |  52 +-
 .../tsptest/versioning/VersioningClient.java  |  52 +-
 .../implementation/VersioningOpsImpl.java     | 303 ++++-----
 .../visibility/VisibilityOpAsyncClient.java   |  66 +-
 .../visibility/VisibilityOpClient.java        |  66 +-
 .../visibility/VisibilityReadAsyncClient.java |   9 +-
 .../visibility/VisibilityReadClient.java      |   9 +-
 .../VisibilityWriteAsyncClient.java           |  19 +-
 .../visibility/VisibilityWriteClient.java     |  19 +-
 .../implementation/VisibilityOpsImpl.java     | 132 ++--
 .../implementation/VisibilityReadsImpl.java   |  18 +-
 .../implementation/VisibilityWritesImpl.java  |  38 +-
 .../tsptest/wiretype/WireTypeAsyncClient.java |  57 +-
 .../java/tsptest/wiretype/WireTypeClient.java |  57 +-
 .../implementation/WireTypeOpsImpl.java       | 114 ++--
 .../XmlBytesVerifyAsyncClient.java            |   9 +-
 .../xmlbytesverify/XmlBytesVerifyClient.java  |   9 +-
 .../XmlBytesVerifyClientImpl.java             |  18 +-
 .../type/array/BooleanValueAsyncClient.java   |  18 +-
 .../java/type/array/BooleanValueClient.java   |  18 +-
 .../type/array/DatetimeValueAsyncClient.java  |  18 +-
 .../java/type/array/DatetimeValueClient.java  |  18 +-
 .../type/array/DurationValueAsyncClient.java  |  18 +-
 .../java/type/array/DurationValueClient.java  |  18 +-
 .../type/array/Float32ValueAsyncClient.java   |  18 +-
 .../java/type/array/Float32ValueClient.java   |  18 +-
 .../type/array/Int32ValueAsyncClient.java     |  18 +-
 .../java/type/array/Int32ValueClient.java     |  18 +-
 .../type/array/Int64ValueAsyncClient.java     |  18 +-
 .../java/type/array/Int64ValueClient.java     |  18 +-
 .../type/array/ModelValueAsyncClient.java     |  18 +-
 .../java/type/array/ModelValueClient.java     |  18 +-
 .../NullableBooleanValueAsyncClient.java      |  18 +-
 .../array/NullableBooleanValueClient.java     |  18 +-
 .../array/NullableFloatValueAsyncClient.java  |  18 +-
 .../type/array/NullableFloatValueClient.java  |  18 +-
 .../array/NullableInt32ValueAsyncClient.java  |  18 +-
 .../type/array/NullableInt32ValueClient.java  |  18 +-
 .../array/NullableModelValueAsyncClient.java  |  18 +-
 .../type/array/NullableModelValueClient.java  |  18 +-
 .../array/NullableStringValueAsyncClient.java |  18 +-
 .../type/array/NullableStringValueClient.java |  18 +-
 .../type/array/StringValueAsyncClient.java    |  18 +-
 .../java/type/array/StringValueClient.java    |  18 +-
 .../type/array/UnknownValueAsyncClient.java   |  18 +-
 .../java/type/array/UnknownValueClient.java   |  18 +-
 .../implementation/BooleanValuesImpl.java     |  36 +-
 .../implementation/DatetimeValuesImpl.java    |  36 +-
 .../implementation/DurationValuesImpl.java    |  36 +-
 .../implementation/Float32ValuesImpl.java     |  36 +-
 .../array/implementation/Int32ValuesImpl.java |  36 +-
 .../array/implementation/Int64ValuesImpl.java |  36 +-
 .../array/implementation/ModelValuesImpl.java |  36 +-
 .../NullableBooleanValuesImpl.java            |  36 +-
 .../NullableFloatValuesImpl.java              |  36 +-
 .../NullableInt32ValuesImpl.java              |  36 +-
 .../NullableModelValuesImpl.java              |  36 +-
 .../NullableStringValuesImpl.java             |  36 +-
 .../implementation/StringValuesImpl.java      |  36 +-
 .../implementation/UnknownValuesImpl.java     |  36 +-
 .../dictionary/BooleanValueAsyncClient.java   |  18 +-
 .../type/dictionary/BooleanValueClient.java   |  18 +-
 .../dictionary/DatetimeValueAsyncClient.java  |  18 +-
 .../type/dictionary/DatetimeValueClient.java  |  18 +-
 .../dictionary/DurationValueAsyncClient.java  |  18 +-
 .../type/dictionary/DurationValueClient.java  |  18 +-
 .../dictionary/Float32ValueAsyncClient.java   |  18 +-
 .../type/dictionary/Float32ValueClient.java   |  18 +-
 .../dictionary/Int32ValueAsyncClient.java     |  18 +-
 .../type/dictionary/Int32ValueClient.java     |  18 +-
 .../dictionary/Int64ValueAsyncClient.java     |  18 +-
 .../type/dictionary/Int64ValueClient.java     |  18 +-
 .../dictionary/ModelValueAsyncClient.java     |  18 +-
 .../type/dictionary/ModelValueClient.java     |  18 +-
 .../NullableFloatValueAsyncClient.java        |  18 +-
 .../dictionary/NullableFloatValueClient.java  |  18 +-
 .../RecursiveModelValueAsyncClient.java       |  18 +-
 .../dictionary/RecursiveModelValueClient.java |  18 +-
 .../dictionary/StringValueAsyncClient.java    |  18 +-
 .../type/dictionary/StringValueClient.java    |  18 +-
 .../dictionary/UnknownValueAsyncClient.java   |  18 +-
 .../type/dictionary/UnknownValueClient.java   |  18 +-
 .../implementation/BooleanValuesImpl.java     |  36 +-
 .../implementation/DatetimeValuesImpl.java    |  36 +-
 .../implementation/DurationValuesImpl.java    |  36 +-
 .../implementation/Float32ValuesImpl.java     |  36 +-
 .../implementation/Int32ValuesImpl.java       |  36 +-
 .../implementation/Int64ValuesImpl.java       |  36 +-
 .../implementation/ModelValuesImpl.java       |  36 +-
 .../NullableFloatValuesImpl.java              |  36 +-
 .../RecursiveModelValuesImpl.java             |  36 +-
 .../implementation/StringValuesImpl.java      |  36 +-
 .../implementation/UnknownValuesImpl.java     |  36 +-
 .../extensible/ExtensibleAsyncClient.java     |  36 +-
 .../enums/extensible/ExtensibleClient.java    |  36 +-
 .../implementation/StringOperationsImpl.java  |  72 +--
 .../type/enums/fixed/FixedAsyncClient.java    |  27 +-
 .../java/type/enums/fixed/FixedClient.java    |  27 +-
 .../implementation/StringOperationsImpl.java  |  54 +-
 .../main/java/type/file/FileAsyncClient.java  |  89 ++-
 .../src/main/java/type/file/FileClient.java   |  89 ++-
 .../type/file/implementation/BodiesImpl.java  | 178 +++---
 .../type/model/empty/EmptyAsyncClient.java    |  43 +-
 .../java/type/model/empty/EmptyClient.java    |  37 +-
 .../empty/implementation/EmptyClientImpl.java |  80 +--
 .../EnumDiscriminatorAsyncClient.java         |  84 ++-
 .../EnumDiscriminatorClient.java              |  72 +--
 .../EnumDiscriminatorClientImpl.java          | 156 ++---
 .../NestedDiscriminatorAsyncClient.java       |  66 +-
 .../NestedDiscriminatorClient.java            |  66 +-
 .../NestedDiscriminatorClientImpl.java        | 132 ++--
 .../NotDiscriminatedAsyncClient.java          |  43 +-
 .../NotDiscriminatedClient.java               |  37 +-
 .../NotDiscriminatedClientImpl.java           |  80 +--
 .../recursive/RecursiveAsyncClient.java       |  18 +-
 .../recursive/RecursiveClient.java            |  18 +-
 .../implementation/RecursiveClientImpl.java   |  36 +-
 .../SingleDiscriminatorAsyncClient.java       |  99 ++-
 .../SingleDiscriminatorClient.java            |  93 ++-
 .../SingleDiscriminatorClientImpl.java        | 192 +++---
 .../type/model/usage/UsageAsyncClient.java    |  43 +-
 .../java/type/model/usage/UsageClient.java    |  37 +-
 .../usage/implementation/UsageClientImpl.java |  80 +--
 .../visibility/VisibilityAsyncClient.java     |  89 ++-
 .../model/visibility/VisibilityClient.java    |  83 ++-
 .../implementation/VisibilityClientImpl.java  | 172 +++--
 ...xtendsDifferentSpreadFloatAsyncClient.java |  18 +-
 .../ExtendsDifferentSpreadFloatClient.java    |  18 +-
 ...sDifferentSpreadModelArrayAsyncClient.java |  18 +-
 ...xtendsDifferentSpreadModelArrayClient.java |  18 +-
 ...xtendsDifferentSpreadModelAsyncClient.java |  18 +-
 .../ExtendsDifferentSpreadModelClient.java    |  18 +-
 ...tendsDifferentSpreadStringAsyncClient.java |  18 +-
 .../ExtendsDifferentSpreadStringClient.java   |  18 +-
 .../ExtendsFloatAsyncClient.java              |  18 +-
 .../ExtendsFloatClient.java                   |  18 +-
 .../ExtendsModelArrayAsyncClient.java         |  18 +-
 .../ExtendsModelArrayClient.java              |  18 +-
 .../ExtendsModelAsyncClient.java              |  18 +-
 .../ExtendsModelClient.java                   |  18 +-
 .../ExtendsStringAsyncClient.java             |  18 +-
 .../ExtendsStringClient.java                  |  18 +-
 .../ExtendsUnknownAsyncClient.java            |  18 +-
 .../ExtendsUnknownClient.java                 |  18 +-
 .../ExtendsUnknownDerivedAsyncClient.java     |  18 +-
 .../ExtendsUnknownDerivedClient.java          |  18 +-
 ...xtendsUnknownDiscriminatedAsyncClient.java |  18 +-
 .../ExtendsUnknownDiscriminatedClient.java    |  18 +-
 .../IsFloatAsyncClient.java                   |  18 +-
 .../additionalproperties/IsFloatClient.java   |  18 +-
 .../IsModelArrayAsyncClient.java              |  18 +-
 .../IsModelArrayClient.java                   |  18 +-
 .../IsModelAsyncClient.java                   |  18 +-
 .../additionalproperties/IsModelClient.java   |  18 +-
 .../IsStringAsyncClient.java                  |  18 +-
 .../additionalproperties/IsStringClient.java  |  18 +-
 .../IsUnknownAsyncClient.java                 |  18 +-
 .../additionalproperties/IsUnknownClient.java |  18 +-
 .../IsUnknownDerivedAsyncClient.java          |  18 +-
 .../IsUnknownDerivedClient.java               |  18 +-
 .../IsUnknownDiscriminatedAsyncClient.java    |  18 +-
 .../IsUnknownDiscriminatedClient.java         |  18 +-
 .../MultipleSpreadAsyncClient.java            |  18 +-
 .../MultipleSpreadClient.java                 |  18 +-
 .../SpreadDifferentFloatAsyncClient.java      |  18 +-
 .../SpreadDifferentFloatClient.java           |  18 +-
 .../SpreadDifferentModelArrayAsyncClient.java |  18 +-
 .../SpreadDifferentModelArrayClient.java      |  18 +-
 .../SpreadDifferentModelAsyncClient.java      |  18 +-
 .../SpreadDifferentModelClient.java           |  18 +-
 .../SpreadDifferentStringAsyncClient.java     |  18 +-
 .../SpreadDifferentStringClient.java          |  18 +-
 .../SpreadFloatAsyncClient.java               |  18 +-
 .../SpreadFloatClient.java                    |  18 +-
 .../SpreadModelArrayAsyncClient.java          |  18 +-
 .../SpreadModelArrayClient.java               |  18 +-
 .../SpreadModelAsyncClient.java               |  18 +-
 .../SpreadModelClient.java                    |  18 +-
 ...cordNonDiscriminatedUnion2AsyncClient.java |  18 +-
 ...eadRecordNonDiscriminatedUnion2Client.java |  18 +-
 ...cordNonDiscriminatedUnion3AsyncClient.java |  18 +-
 ...eadRecordNonDiscriminatedUnion3Client.java |  18 +-
 ...ecordNonDiscriminatedUnionAsyncClient.java |  18 +-
 ...readRecordNonDiscriminatedUnionClient.java |  18 +-
 .../SpreadRecordUnionAsyncClient.java         |  18 +-
 .../SpreadRecordUnionClient.java              |  18 +-
 .../SpreadStringAsyncClient.java              |  18 +-
 .../SpreadStringClient.java                   |  18 +-
 .../ExtendsDifferentSpreadFloatsImpl.java     |  36 +-
 ...ExtendsDifferentSpreadModelArraysImpl.java |  36 +-
 .../ExtendsDifferentSpreadModelsImpl.java     |  36 +-
 .../ExtendsDifferentSpreadStringsImpl.java    |  36 +-
 .../implementation/ExtendsFloatsImpl.java     |  36 +-
 .../ExtendsModelArraysImpl.java               |  36 +-
 .../implementation/ExtendsModelsImpl.java     |  36 +-
 .../implementation/ExtendsStringsImpl.java    |  36 +-
 .../ExtendsUnknownDerivedsImpl.java           |  36 +-
 .../ExtendsUnknownDiscriminatedsImpl.java     |  36 +-
 .../implementation/ExtendsUnknownsImpl.java   |  36 +-
 .../implementation/IsFloatsImpl.java          |  36 +-
 .../implementation/IsModelArraysImpl.java     |  36 +-
 .../implementation/IsModelsImpl.java          |  36 +-
 .../implementation/IsStringsImpl.java         |  36 +-
 .../implementation/IsUnknownDerivedsImpl.java |  36 +-
 .../IsUnknownDiscriminatedsImpl.java          |  36 +-
 .../implementation/IsUnknownsImpl.java        |  36 +-
 .../implementation/MultipleSpreadsImpl.java   |  36 +-
 .../SpreadDifferentFloatsImpl.java            |  36 +-
 .../SpreadDifferentModelArraysImpl.java       |  36 +-
 .../SpreadDifferentModelsImpl.java            |  36 +-
 .../SpreadDifferentStringsImpl.java           |  36 +-
 .../implementation/SpreadFloatsImpl.java      |  36 +-
 .../implementation/SpreadModelArraysImpl.java |  36 +-
 .../implementation/SpreadModelsImpl.java      |  36 +-
 ...readRecordNonDiscriminatedUnion2sImpl.java |  36 +-
 ...readRecordNonDiscriminatedUnion3sImpl.java |  36 +-
 ...preadRecordNonDiscriminatedUnionsImpl.java |  36 +-
 .../SpreadRecordUnionsImpl.java               |  36 +-
 .../implementation/SpreadStringsImpl.java     |  36 +-
 .../property/nullable/BytesAsyncClient.java   |  42 +-
 .../type/property/nullable/BytesClient.java   |  36 +-
 .../nullable/CollectionsByteAsyncClient.java  |  42 +-
 .../nullable/CollectionsByteClient.java       |  36 +-
 .../nullable/CollectionsModelAsyncClient.java |  42 +-
 .../nullable/CollectionsModelClient.java      |  36 +-
 .../CollectionsStringAsyncClient.java         |  42 +-
 .../nullable/CollectionsStringClient.java     |  36 +-
 .../DatetimeOperationAsyncClient.java         |  42 +-
 .../nullable/DatetimeOperationClient.java     |  36 +-
 .../DurationOperationAsyncClient.java         |  42 +-
 .../nullable/DurationOperationClient.java     |  36 +-
 .../nullable/StringOperationAsyncClient.java  |  42 +-
 .../nullable/StringOperationClient.java       |  36 +-
 .../nullable/implementation/BytesImpl.java    |  78 +--
 .../implementation/CollectionsBytesImpl.java  |  78 +--
 .../implementation/CollectionsModelsImpl.java |  78 +--
 .../CollectionsStringsImpl.java               |  78 +--
 .../DatetimeOperationsImpl.java               |  78 +--
 .../DurationOperationsImpl.java               |  78 +--
 .../implementation/StringOperationsImpl.java  |  78 +--
 .../optional/BooleanLiteralAsyncClient.java   |  42 +-
 .../optional/BooleanLiteralClient.java        |  36 +-
 .../property/optional/BytesAsyncClient.java   |  42 +-
 .../type/property/optional/BytesClient.java   |  36 +-
 .../optional/CollectionsByteAsyncClient.java  |  42 +-
 .../optional/CollectionsByteClient.java       |  36 +-
 .../optional/CollectionsModelAsyncClient.java |  42 +-
 .../optional/CollectionsModelClient.java      |  36 +-
 .../DatetimeOperationAsyncClient.java         |  42 +-
 .../optional/DatetimeOperationClient.java     |  36 +-
 .../DurationOperationAsyncClient.java         |  42 +-
 .../optional/DurationOperationClient.java     |  36 +-
 .../optional/FloatLiteralAsyncClient.java     |  42 +-
 .../property/optional/FloatLiteralClient.java |  36 +-
 .../optional/IntLiteralAsyncClient.java       |  42 +-
 .../property/optional/IntLiteralClient.java   |  36 +-
 .../optional/PlainDateAsyncClient.java        |  42 +-
 .../property/optional/PlainDateClient.java    |  36 +-
 .../optional/PlainTimeAsyncClient.java        |  42 +-
 .../property/optional/PlainTimeClient.java    |  36 +-
 .../RequiredAndOptionalAsyncClient.java       |  42 +-
 .../optional/RequiredAndOptionalClient.java   |  36 +-
 .../optional/StringLiteralAsyncClient.java    |  42 +-
 .../optional/StringLiteralClient.java         |  36 +-
 .../optional/StringOperationAsyncClient.java  |  42 +-
 .../optional/StringOperationClient.java       |  36 +-
 .../UnionFloatLiteralAsyncClient.java         |  42 +-
 .../optional/UnionFloatLiteralClient.java     |  36 +-
 .../optional/UnionIntLiteralAsyncClient.java  |  42 +-
 .../optional/UnionIntLiteralClient.java       |  36 +-
 .../UnionStringLiteralAsyncClient.java        |  42 +-
 .../optional/UnionStringLiteralClient.java    |  36 +-
 .../implementation/BooleanLiteralsImpl.java   |  78 +--
 .../optional/implementation/BytesImpl.java    |  78 +--
 .../implementation/CollectionsBytesImpl.java  |  78 +--
 .../implementation/CollectionsModelsImpl.java |  78 +--
 .../DatetimeOperationsImpl.java               |  78 +--
 .../DurationOperationsImpl.java               |  78 +--
 .../implementation/FloatLiteralsImpl.java     |  78 +--
 .../implementation/IntLiteralsImpl.java       |  78 +--
 .../implementation/PlainDatesImpl.java        |  78 +--
 .../implementation/PlainTimesImpl.java        |  78 +--
 .../RequiredAndOptionalsImpl.java             |  78 +--
 .../implementation/StringLiteralsImpl.java    |  78 +--
 .../implementation/StringOperationsImpl.java  |  78 +--
 .../UnionFloatLiteralsImpl.java               |  78 +--
 .../implementation/UnionIntLiteralsImpl.java  |  78 +--
 .../UnionStringLiteralsImpl.java              |  78 +--
 .../valuetypes/BooleanLiteralAsyncClient.java |  18 +-
 .../valuetypes/BooleanLiteralClient.java      |  18 +-
 .../BooleanOperationAsyncClient.java          |  18 +-
 .../valuetypes/BooleanOperationClient.java    |  18 +-
 .../property/valuetypes/BytesAsyncClient.java |  18 +-
 .../type/property/valuetypes/BytesClient.java |  18 +-
 .../valuetypes/CollectionsIntAsyncClient.java |  18 +-
 .../valuetypes/CollectionsIntClient.java      |  18 +-
 .../CollectionsModelAsyncClient.java          |  18 +-
 .../valuetypes/CollectionsModelClient.java    |  18 +-
 .../CollectionsStringAsyncClient.java         |  18 +-
 .../valuetypes/CollectionsStringClient.java   |  18 +-
 .../DatetimeOperationAsyncClient.java         |  18 +-
 .../valuetypes/DatetimeOperationClient.java   |  18 +-
 .../valuetypes/Decimal128AsyncClient.java     |  18 +-
 .../property/valuetypes/Decimal128Client.java |  18 +-
 .../valuetypes/DecimalAsyncClient.java        |  18 +-
 .../property/valuetypes/DecimalClient.java    |  18 +-
 .../DictionaryStringAsyncClient.java          |  18 +-
 .../valuetypes/DictionaryStringClient.java    |  18 +-
 .../DurationOperationAsyncClient.java         |  18 +-
 .../valuetypes/DurationOperationClient.java   |  18 +-
 .../property/valuetypes/EnumAsyncClient.java  |  18 +-
 .../type/property/valuetypes/EnumClient.java  |  18 +-
 .../valuetypes/ExtensibleEnumAsyncClient.java |  18 +-
 .../valuetypes/ExtensibleEnumClient.java      |  18 +-
 .../valuetypes/FloatLiteralAsyncClient.java   |  18 +-
 .../valuetypes/FloatLiteralClient.java        |  18 +-
 .../valuetypes/FloatOperationAsyncClient.java |  18 +-
 .../valuetypes/FloatOperationClient.java      |  18 +-
 .../property/valuetypes/IntAsyncClient.java   |  18 +-
 .../type/property/valuetypes/IntClient.java   |  18 +-
 .../valuetypes/IntLiteralAsyncClient.java     |  18 +-
 .../property/valuetypes/IntLiteralClient.java |  18 +-
 .../property/valuetypes/ModelAsyncClient.java |  18 +-
 .../type/property/valuetypes/ModelClient.java |  18 +-
 .../property/valuetypes/NeverAsyncClient.java |  18 +-
 .../type/property/valuetypes/NeverClient.java |  18 +-
 .../valuetypes/StringLiteralAsyncClient.java  |  18 +-
 .../valuetypes/StringLiteralClient.java       |  18 +-
 .../StringOperationAsyncClient.java           |  18 +-
 .../valuetypes/StringOperationClient.java     |  18 +-
 .../valuetypes/UnionEnumValueAsyncClient.java |  18 +-
 .../valuetypes/UnionEnumValueClient.java      |  18 +-
 .../UnionFloatLiteralAsyncClient.java         |  18 +-
 .../valuetypes/UnionFloatLiteralClient.java   |  18 +-
 .../UnionIntLiteralAsyncClient.java           |  18 +-
 .../valuetypes/UnionIntLiteralClient.java     |  18 +-
 .../UnionStringLiteralAsyncClient.java        |  18 +-
 .../valuetypes/UnionStringLiteralClient.java  |  18 +-
 .../valuetypes/UnknownArrayAsyncClient.java   |  18 +-
 .../valuetypes/UnknownArrayClient.java        |  18 +-
 .../valuetypes/UnknownDictAsyncClient.java    |  18 +-
 .../valuetypes/UnknownDictClient.java         |  18 +-
 .../valuetypes/UnknownIntAsyncClient.java     |  18 +-
 .../property/valuetypes/UnknownIntClient.java |  18 +-
 .../valuetypes/UnknownStringAsyncClient.java  |  18 +-
 .../valuetypes/UnknownStringClient.java       |  18 +-
 .../implementation/BooleanLiteralsImpl.java   |  36 +-
 .../implementation/BooleanOperationsImpl.java |  36 +-
 .../valuetypes/implementation/BytesImpl.java  |  36 +-
 .../implementation/CollectionsIntsImpl.java   |  36 +-
 .../implementation/CollectionsModelsImpl.java |  36 +-
 .../CollectionsStringsImpl.java               |  36 +-
 .../DatetimeOperationsImpl.java               |  36 +-
 .../implementation/Decimal128sImpl.java       |  36 +-
 .../implementation/DecimalsImpl.java          |  36 +-
 .../implementation/DictionaryStringsImpl.java |  36 +-
 .../DurationOperationsImpl.java               |  36 +-
 .../valuetypes/implementation/EnumsImpl.java  |  36 +-
 .../implementation/ExtensibleEnumsImpl.java   |  36 +-
 .../implementation/FloatLiteralsImpl.java     |  36 +-
 .../implementation/FloatOperationsImpl.java   |  36 +-
 .../implementation/IntLiteralsImpl.java       |  36 +-
 .../valuetypes/implementation/IntsImpl.java   |  36 +-
 .../valuetypes/implementation/ModelsImpl.java |  36 +-
 .../valuetypes/implementation/NeversImpl.java |  36 +-
 .../implementation/StringLiteralsImpl.java    |  36 +-
 .../implementation/StringOperationsImpl.java  |  36 +-
 .../implementation/UnionEnumValuesImpl.java   |  36 +-
 .../UnionFloatLiteralsImpl.java               |  36 +-
 .../implementation/UnionIntLiteralsImpl.java  |  36 +-
 .../UnionStringLiteralsImpl.java              |  36 +-
 .../implementation/UnknownArraysImpl.java     |  36 +-
 .../implementation/UnknownDictsImpl.java      |  36 +-
 .../implementation/UnknownIntsImpl.java       |  36 +-
 .../implementation/UnknownStringsImpl.java    |  36 +-
 .../scalar/BooleanOperationAsyncClient.java   |  18 +-
 .../type/scalar/BooleanOperationClient.java   |  18 +-
 .../scalar/Decimal128TypeAsyncClient.java     |  18 +-
 .../type/scalar/Decimal128TypeClient.java     |  18 +-
 .../scalar/Decimal128VerifyAsyncClient.java   |  18 +-
 .../type/scalar/Decimal128VerifyClient.java   |  18 +-
 .../type/scalar/DecimalTypeAsyncClient.java   |  21 +-
 .../java/type/scalar/DecimalTypeClient.java   |  18 +-
 .../type/scalar/DecimalVerifyAsyncClient.java |  18 +-
 .../java/type/scalar/DecimalVerifyClient.java |  18 +-
 .../scalar/StringOperationAsyncClient.java    |  18 +-
 .../type/scalar/StringOperationClient.java    |  18 +-
 .../java/type/scalar/UnknownAsyncClient.java  |  18 +-
 .../main/java/type/scalar/UnknownClient.java  |  18 +-
 .../implementation/BooleanOperationsImpl.java |  36 +-
 .../implementation/Decimal128TypesImpl.java   |  36 +-
 .../Decimal128VerifiesImpl.java               |  36 +-
 .../implementation/DecimalTypesImpl.java      |  39 +-
 .../implementation/DecimalVerifiesImpl.java   |  36 +-
 .../implementation/StringOperationsImpl.java  |  36 +-
 .../scalar/implementation/UnknownsImpl.java   |  36 +-
 .../java/type/union/EnumsOnlyAsyncClient.java |  18 +-
 .../main/java/type/union/EnumsOnlyClient.java |  18 +-
 .../type/union/FloatsOnlyAsyncClient.java     |  18 +-
 .../java/type/union/FloatsOnlyClient.java     |  18 +-
 .../java/type/union/IntsOnlyAsyncClient.java  |  18 +-
 .../main/java/type/union/IntsOnlyClient.java  |  18 +-
 .../type/union/MixedLiteralsAsyncClient.java  |  18 +-
 .../java/type/union/MixedLiteralsClient.java  |  18 +-
 .../type/union/MixedTypesAsyncClient.java     |  18 +-
 .../java/type/union/MixedTypesClient.java     |  18 +-
 .../type/union/ModelsOnlyAsyncClient.java     |  18 +-
 .../java/type/union/ModelsOnlyClient.java     |  18 +-
 .../type/union/StringAndArrayAsyncClient.java |  18 +-
 .../java/type/union/StringAndArrayClient.java |  18 +-
 .../union/StringExtensibleAsyncClient.java    |  18 +-
 .../type/union/StringExtensibleClient.java    |  18 +-
 .../StringExtensibleNamedAsyncClient.java     |  18 +-
 .../union/StringExtensibleNamedClient.java    |  18 +-
 .../type/union/StringsOnlyAsyncClient.java    |  18 +-
 .../java/type/union/StringsOnlyClient.java    |  18 +-
 ...lopeObjectCustomPropertiesAsyncClient.java |  34 +-
 .../EnvelopeObjectCustomPropertiesClient.java |  34 +-
 .../EnvelopeObjectDefaultAsyncClient.java     |  34 +-
 .../EnvelopeObjectDefaultClient.java          |  34 +-
 ...nvelopeCustomDiscriminatorAsyncClient.java |  34 +-
 .../NoEnvelopeCustomDiscriminatorClient.java  |  34 +-
 .../NoEnvelopeDefaultAsyncClient.java         |  34 +-
 .../NoEnvelopeDefaultClient.java              |  34 +-
 .../EnvelopeObjectCustomPropertiesImpl.java   |  68 +-
 .../EnvelopeObjectDefaultsImpl.java           |  68 +-
 .../NoEnvelopeCustomDiscriminatorsImpl.java   |  68 +-
 .../NoEnvelopeDefaultsImpl.java               |  68 +-
 .../union/implementation/EnumsOnliesImpl.java |  36 +-
 .../implementation/FloatsOnliesImpl.java      |  36 +-
 .../union/implementation/IntsOnliesImpl.java  |  36 +-
 .../implementation/MixedLiteralsImpl.java     |  36 +-
 .../union/implementation/MixedTypesImpl.java  |  36 +-
 .../implementation/ModelsOnliesImpl.java      |  36 +-
 .../implementation/StringAndArraysImpl.java   |  36 +-
 .../StringExtensibleNamedsImpl.java           |  36 +-
 .../implementation/StringExtensiblesImpl.java |  36 +-
 .../implementation/StringsOnliesImpl.java     |  36 +-
 .../versioning/added/AddedAsyncClient.java    |  38 +-
 .../java/versioning/added/AddedClient.java    |  38 +-
 .../added/InterfaceV2AsyncClient.java         |  19 +-
 .../versioning/added/InterfaceV2Client.java   |  19 +-
 .../added/implementation/AddedClientImpl.java |  76 +--
 .../implementation/InterfaceV2sImpl.java      |  38 +-
 .../madeoptional/MadeOptionalAsyncClient.java |  25 +-
 .../madeoptional/MadeOptionalClient.java      |  25 +-
 .../MadeOptionalClientImpl.java               |  50 +-
 .../removed/RemovedAsyncClient.java           |  38 +-
 .../versioning/removed/RemovedClient.java     |  38 +-
 .../implementation/RemovedClientImpl.java     |  76 +--
 .../renamedfrom/NewInterfaceAsyncClient.java  |  19 +-
 .../renamedfrom/NewInterfaceClient.java       |  19 +-
 .../renamedfrom/RenamedFromAsyncClient.java   |  19 +-
 .../renamedfrom/RenamedFromClient.java        |  19 +-
 .../implementation/NewInterfacesImpl.java     |  38 +-
 .../implementation/RenamedFromClientImpl.java |  38 +-
 .../ReturnTypeChangedFromAsyncClient.java     |  19 +-
 .../ReturnTypeChangedFromClient.java          |  19 +-
 .../ReturnTypeChangedFromClientImpl.java      |  38 +-
 .../TypeChangedFromAsyncClient.java           |  19 +-
 .../TypeChangedFromClient.java                |  19 +-
 .../TypeChangedFromClientImpl.java            |  38 +-
 903 files changed, 17171 insertions(+), 22128 deletions(-)

diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationAsyncClient.java
index aa84b8c985b..66153900f91 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationAsyncClient.java
@@ -43,14 +43,13 @@ public final class InternalOperationAsyncClient {
     /**
      * The noDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -58,8 +57,7 @@ public final class InternalOperationAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in an internal operation, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -70,14 +68,13 @@ Mono> noDecoratorInInternalWithResponse(String name, Reques
     /**
      * The internalDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -85,8 +82,7 @@ Mono> noDecoratorInInternalWithResponse(String name, Reques
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in an internal operation, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -97,14 +93,13 @@ Mono> internalDecoratorInInternalWithResponse(String name,
     /**
      * The publicDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -112,8 +107,7 @@ Mono> internalDecoratorInInternalWithResponse(String name,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation but with public decorator, should be generated and exported along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return used in an internal operation but with public decorator, should be generated and exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationClient.java
index 034879644d8..7e0d0209995 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/InternalOperationClient.java
@@ -41,14 +41,13 @@ public final class InternalOperationClient {
     /**
      * The noDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,14 +66,13 @@ Response noDecoratorInInternalWithResponse(String name, RequestOptio
     /**
      * The internalDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -93,14 +91,13 @@ Response internalDecoratorInInternalWithResponse(String name, Reques
     /**
      * The publicDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -108,8 +105,7 @@ Response internalDecoratorInInternalWithResponse(String name, Reques
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation but with public decorator, should be generated and exported along with
-     * {@link Response}.
+     * @return used in an internal operation but with public decorator, should be generated and exported along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationAsyncClient.java
index 3d3eacf5312..af0ac355eb9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationAsyncClient.java
@@ -42,14 +42,13 @@ public final class PublicOperationAsyncClient {
     /**
      * The noDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -57,8 +56,7 @@ public final class PublicOperationAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in a public operation, should be generated and exported along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return used in a public operation, should be generated and exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,14 +67,13 @@ public Mono> noDecoratorInPublicWithResponse(String name, R
     /**
      * The publicDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -84,8 +81,7 @@ public Mono> noDecoratorInPublicWithResponse(String name, R
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in a public operation, should be generated and exported along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return used in a public operation, should be generated and exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationClient.java
index 66d89e302e8..a9df8bf12bf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/PublicOperationClient.java
@@ -40,14 +40,13 @@ public final class PublicOperationClient {
     /**
      * The noDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -66,14 +65,13 @@ public Response noDecoratorInPublicWithResponse(String name, Request
     /**
      * The publicDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationAsyncClient.java
index a31185d7e0a..b1339287da4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationAsyncClient.java
@@ -44,25 +44,24 @@ public final class RelativeModelInOperationAsyncClient {
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "inner":
-     * {
-     * "name": "Madge"
-     * }
+     *   "name": "Madge",
+     *   "inner":
+     *   {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     inner (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -70,8 +69,7 @@ public final class RelativeModelInOperationAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in internal operations, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in internal operations, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -84,20 +82,19 @@ Mono> operationWithResponse(String name, RequestOptions req
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "kind": "real"
+     *   "name": "Madge",
+     *   "kind": "real"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param kind The kind parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -105,8 +102,7 @@ Mono> operationWithResponse(String name, RequestOptions req
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in internal operations, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in internal operations, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationClient.java
index b584e546456..b29a342f010 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/RelativeModelInOperationClient.java
@@ -42,25 +42,24 @@ public final class RelativeModelInOperationClient {
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "inner":
-     * {
-     * "name": "Madge"
-     * }
+     *   "name": "Madge",
+     *   "inner":
+     *   {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     inner (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -81,20 +80,19 @@ Response operationWithResponse(String name, RequestOptions requestOp
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "kind": "real"
+     *   "name": "Madge",
+     *   "kind": "real"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param kind The kind parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationAsyncClient.java
index f6e574f8e2c..b7f8b4e2961 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationAsyncClient.java
@@ -41,14 +41,13 @@ public final class SharedModelInOperationAsyncClient {
     /**
      * The publicMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -56,8 +55,7 @@ public final class SharedModelInOperationAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used by both public and internal operation along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return used by both public and internal operation along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -68,14 +66,13 @@ public Mono> publicMethodWithResponse(String name, RequestO
     /**
      * The internal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -83,8 +80,7 @@ public Mono> publicMethodWithResponse(String name, RequestO
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used by both public and internal operation along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return used by both public and internal operation along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationClient.java
index b46aea36681..c74dbea4bff 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/SharedModelInOperationClient.java
@@ -39,14 +39,13 @@ public final class SharedModelInOperationClient {
     /**
      * The publicMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -65,14 +64,13 @@ public Response publicMethodWithResponse(String name, RequestOptions
     /**
      * The internal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java
index 0c196872d31..3328dd19428 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java
@@ -122,14 +122,13 @@ Response publicDecoratorInInternalSync(@HostParam("endpoint") String
     /**
      * The noDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -137,8 +136,7 @@ Response publicDecoratorInInternalSync(@HostParam("endpoint") String
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in an internal operation, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> noDecoratorInInternalWithResponseAsync(String name,
@@ -151,14 +149,13 @@ public Mono> noDecoratorInInternalWithResponseAsync(String
     /**
      * The noDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Response noDecoratorInInternalWithResponse(String name, Reque
     /**
      * The internalDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,8 +188,7 @@ public Response noDecoratorInInternalWithResponse(String name, Reque
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in an internal operation, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> internalDecoratorInInternalWithResponseAsync(String name,
@@ -206,14 +201,13 @@ public Mono> internalDecoratorInInternalWithResponseAsync(S
     /**
      * The internalDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -233,14 +227,13 @@ public Response internalDecoratorInInternalWithResponse(String name,
     /**
      * The publicDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -248,8 +241,7 @@ public Response internalDecoratorInInternalWithResponse(String name,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation but with public decorator, should be generated and exported along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return used in an internal operation but with public decorator, should be generated and exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> publicDecoratorInInternalWithResponseAsync(String name,
@@ -262,14 +254,13 @@ public Mono> publicDecoratorInInternalWithResponseAsync(Str
     /**
      * The publicDecoratorInInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -277,8 +268,7 @@ public Mono> publicDecoratorInInternalWithResponseAsync(Str
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in an internal operation but with public decorator, should be generated and exported along with
-     * {@link Response}.
+     * @return used in an internal operation but with public decorator, should be generated and exported along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response publicDecoratorInInternalWithResponse(String name, RequestOptions requestOptions) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java
index 68af0c4ca68..9fdabc35226 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java
@@ -102,14 +102,13 @@ Response publicDecoratorInPublicSync(@HostParam("endpoint") String e
     /**
      * The noDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -117,8 +116,7 @@ Response publicDecoratorInPublicSync(@HostParam("endpoint") String e
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in a public operation, should be generated and exported along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return used in a public operation, should be generated and exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> noDecoratorInPublicWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -130,14 +128,13 @@ public Mono> noDecoratorInPublicWithResponseAsync(String na
     /**
      * The noDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -156,14 +153,13 @@ public Response noDecoratorInPublicWithResponse(String name, Request
     /**
      * The publicDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -171,8 +167,7 @@ public Response noDecoratorInPublicWithResponse(String name, Request
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in a public operation, should be generated and exported along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return used in a public operation, should be generated and exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> publicDecoratorInPublicWithResponseAsync(String name,
@@ -185,14 +180,13 @@ public Mono> publicDecoratorInPublicWithResponseAsync(Strin
     /**
      * The publicDecoratorInPublic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java
index eaaa2943a6b..24deb704371 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java
@@ -101,25 +101,24 @@ Response discriminatorSync(@HostParam("endpoint") String endpoint, @
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "inner":
-     * {
-     * "name": "Madge"
-     * }
+     *   "name": "Madge",
+     *   "inner":
+     *   {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     inner (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -127,8 +126,7 @@ Response discriminatorSync(@HostParam("endpoint") String endpoint, @
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in internal operations, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in internal operations, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> operationWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -142,25 +140,24 @@ public Mono> operationWithResponseAsync(String name, Reques
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "inner":
-     * {
-     * "name": "Madge"
-     * }
+     *   "name": "Madge",
+     *   "inner":
+     *   {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     inner (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -181,20 +178,19 @@ public Response operationWithResponse(String name, RequestOptions re
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "kind": "real"
+     *   "name": "Madge",
+     *   "kind": "real"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param kind The kind parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -202,8 +198,7 @@ public Response operationWithResponse(String name, RequestOptions re
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used in internal operations, should be generated but not exported along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return used in internal operations, should be generated but not exported along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> discriminatorWithResponseAsync(String kind, RequestOptions requestOptions) {
@@ -217,20 +212,19 @@ public Mono> discriminatorWithResponseAsync(String kind, Re
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge",
-     * "kind": "real"
+     *   "name": "Madge",
+     *   "kind": "real"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param kind The kind parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java
index c8f4ab258a8..0528c921c01 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java
@@ -98,14 +98,13 @@ Response internalSync(@HostParam("endpoint") String endpoint, @Query
     /**
      * The publicMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -113,8 +112,7 @@ Response internalSync(@HostParam("endpoint") String endpoint, @Query
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used by both public and internal operation along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return used by both public and internal operation along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> publicMethodWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -126,14 +124,13 @@ public Mono> publicMethodWithResponseAsync(String name, Req
     /**
      * The publicMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -152,14 +149,13 @@ public Response publicMethodWithResponse(String name, RequestOptions
     /**
      * The internal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -167,8 +163,7 @@ public Response publicMethodWithResponse(String name, RequestOptions
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return used by both public and internal operation along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return used by both public and internal operation along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> internalWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -180,14 +175,13 @@ public Mono> internalWithResponseAsync(String name, Request
     /**
      * The internal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java
index 8d846069a28..2a0cdb0417d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java
@@ -42,9 +42,8 @@ public final class AlternateTypeAsyncClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -58,8 +57,8 @@ public final class AlternateTypeAsyncClient {
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -77,9 +76,8 @@ public Mono> getModelWithResponse(RequestOptions requestOpt
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -93,8 +91,8 @@ public Mono> getModelWithResponse(RequestOptions requestOpt
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -113,9 +111,8 @@ public Mono> putModelWithResponse(BinaryData body, RequestOptions
     /**
      * The getProperty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -132,8 +129,8 @@ public Mono> putModelWithResponse(BinaryData body, RequestOptions
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -151,9 +148,8 @@ public Mono> getPropertyWithResponse(RequestOptions request
     /**
      * The putProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -170,8 +166,8 @@ public Mono> getPropertyWithResponse(RequestOptions request
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClient.java
index b5799840f37..1aed51d4749 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeClient.java
@@ -40,9 +40,8 @@ public final class AlternateTypeClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -56,8 +55,8 @@ public final class AlternateTypeClient {
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -75,9 +74,8 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -91,8 +89,8 @@ public Response getModelWithResponse(RequestOptions requestOptions)
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,9 +109,8 @@ public Response putModelWithResponse(BinaryData body, RequestOptions reque
     /**
      * The getProperty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -130,8 +127,8 @@ public Response putModelWithResponse(BinaryData body, RequestOptions reque
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -149,9 +146,8 @@ public Response getPropertyWithResponse(RequestOptions requestOption
     /**
      * The putProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -168,8 +164,8 @@ public Response getPropertyWithResponse(RequestOptions requestOption
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/implementation/ExternalTypesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/implementation/ExternalTypesImpl.java
index 6eb894ad40d..861725a58c5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/implementation/ExternalTypesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/alternatetype/implementation/ExternalTypesImpl.java
@@ -139,9 +139,8 @@ Response putPropertySync(@HostParam("endpoint") String endpoint,
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -155,8 +154,8 @@ Response putPropertySync(@HostParam("endpoint") String endpoint,
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -175,9 +174,8 @@ public Mono> getModelWithResponseAsync(RequestOptions reque
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -191,8 +189,8 @@ public Mono> getModelWithResponseAsync(RequestOptions reque
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -210,9 +208,8 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -226,8 +223,8 @@ public Response getModelWithResponse(RequestOptions requestOptions)
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -247,9 +244,8 @@ public Mono> putModelWithResponseAsync(BinaryData body, RequestOp
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String (Required)
      *     geometry (Required): {
@@ -263,8 +259,8 @@ public Mono> putModelWithResponseAsync(BinaryData body, RequestOp
      *     }
      *     id: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -283,9 +279,8 @@ public Response putModelWithResponse(BinaryData body, RequestOptions reque
     /**
      * The getProperty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -302,8 +297,8 @@ public Response putModelWithResponse(BinaryData body, RequestOptions reque
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -322,9 +317,8 @@ public Mono> getPropertyWithResponseAsync(RequestOptions re
     /**
      * The getProperty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -341,8 +335,8 @@ public Mono> getPropertyWithResponseAsync(RequestOptions re
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -360,9 +354,8 @@ public Response getPropertyWithResponse(RequestOptions requestOption
     /**
      * The putProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -379,8 +372,8 @@ public Response getPropertyWithResponse(RequestOptions requestOption
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -400,9 +393,8 @@ public Mono> putPropertyWithResponseAsync(BinaryData body, Reques
     /**
      * The putProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     feature (Required): {
      *         type: String (Required)
@@ -419,8 +411,8 @@ public Mono> putPropertyWithResponseAsync(BinaryData body, Reques
      *     }
      *     additionalProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueAsyncClient.java
index 6cfc32713c3..c60b70b76d6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueAsyncClient.java
@@ -42,30 +42,27 @@ public final class ClientDefaultValueAsyncClient {
     /**
      * The putModelProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -73,8 +70,7 @@ public final class ClientDefaultValueAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return model with client default values on properties along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return model with client default values on properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClient.java
index bb82b4942b9..80e6996fee1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/ClientDefaultValueClient.java
@@ -40,30 +40,27 @@ public final class ClientDefaultValueClient {
     /**
      * The putModelProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/ClientDefaultValueClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/ClientDefaultValueClientImpl.java
index 64307fcb14d..a74913692f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/ClientDefaultValueClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdefaultvalue/implementation/ClientDefaultValueClientImpl.java
@@ -209,30 +209,27 @@ Response getHeaderParameterSync(@HostParam("endpoint") String endpoint, Re
     /**
      * The putModelProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -240,8 +237,7 @@ Response getHeaderParameterSync(@HostParam("endpoint") String endpoint, Re
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return model with client default values on properties along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return model with client default values on properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putModelPropertyWithResponseAsync(BinaryData body,
@@ -255,30 +251,27 @@ public Mono> putModelPropertyWithResponseAsync(BinaryData b
     /**
      * The putModelProperty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timeout: Integer (Optional)
      *     tier: String (Optional)
      *     retry: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocAsyncClient.java
index 62764d7c16d..5dbce2fc01e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocAsyncClient.java
@@ -41,26 +41,23 @@ public final class ClientDocAsyncClient {
     /**
      * Retrieves a plant from the garden by submitting its name.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,8 +66,7 @@ public final class ClientDocAsyncClient {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @return a plant in the garden.
-     * This model is used to represent a plant in the client SDK along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * This model is used to represent a plant in the client SDK along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocClient.java
index 6a0943f3845..6ab5c1dd45e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/ClientDocClient.java
@@ -39,26 +39,23 @@ public final class ClientDocClient {
     /**
      * Retrieves a plant from the garden by submitting its name.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/implementation/DocumentationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/implementation/DocumentationsImpl.java
index cdd0770f9e3..58d5d065755 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/implementation/DocumentationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientdoc/implementation/DocumentationsImpl.java
@@ -82,26 +82,23 @@ Response harvestSync(@HostParam("endpoint") String endpoint,
     /**
      * Retrieves a plant from the garden by submitting its name.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -110,8 +107,7 @@ Response harvestSync(@HostParam("endpoint") String endpoint,
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @return a plant in the garden.
-     * This model is used to represent a plant in the client SDK along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * This model is used to represent a plant in the client SDK along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> harvestWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
@@ -124,26 +120,23 @@ public Mono> harvestWithResponseAsync(BinaryData body, Requ
     /**
      * Retrieves a plant from the garden by submitting its name.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     species: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java
index d8b5cb4bfdf..0a6e74bf4b5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamAsyncClient.java
@@ -58,14 +58,13 @@ public Mono> withQueryWithResponse(String id, RequestOptions requ
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java
index 15970b4e195..8e9198edd9b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/HeaderParamClient.java
@@ -56,14 +56,13 @@ public Response withQueryWithResponse(String id, RequestOptions requestOpt
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java
index af1808087a7..2ec9943ad22 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsAsyncClient.java
@@ -59,14 +59,13 @@ public Mono> withQueryWithResponse(String region, String id, Requ
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param region The region parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java
index d67b25cee48..ba4ce8c9fa4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MixedParamsClient.java
@@ -57,14 +57,13 @@ public Response withQueryWithResponse(String region, String id, RequestOpt
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param region The region parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java
index 675066ddd6d..b37a25ad50f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsAsyncClient.java
@@ -58,14 +58,13 @@ public Mono> withQueryWithResponse(String id, RequestOptions requ
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java
index 6957056c7ed..6d6922327f2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/MultipleParamsClient.java
@@ -56,14 +56,13 @@ public Response withQueryWithResponse(String id, RequestOptions requestOpt
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java
index fffdd32a35b..0b33b37ad0d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamAsyncClient.java
@@ -64,17 +64,16 @@ public Mono> withQueryWithResponse(RequestOptions requestOptions)
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java
index 0b44c5793a1..c10156139ff 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/PathParamClient.java
@@ -62,17 +62,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java
index c80b04f8fc6..adf3840d1da 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamAsyncClient.java
@@ -64,17 +64,16 @@ public Mono> withQueryWithResponse(RequestOptions requestOptions)
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java
index 79de18b60ad..114e2aaa271 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/QueryParamClient.java
@@ -62,17 +62,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java
index 9d71938ee8d..4f32930c03a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/HeaderParamClientImpl.java
@@ -219,14 +219,13 @@ public Response withQueryWithResponse(String id, RequestOptions requestOpt
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -246,14 +245,13 @@ public Mono> withBodyWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java
index cc215cba914..0f575b1a1cb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MixedParamsClientImpl.java
@@ -223,14 +223,13 @@ public Response withQueryWithResponse(String region, String id, RequestOpt
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param region The region parameter.
      * @param body The body parameter.
@@ -252,14 +251,13 @@ public Mono> withBodyWithResponseAsync(String region, BinaryData
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param region The region parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java
index 5adf51cb5e8..8084cebc45a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/MultipleParamsClientImpl.java
@@ -240,14 +240,13 @@ public Response withQueryWithResponse(String id, RequestOptions requestOpt
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -267,14 +266,13 @@ public Mono> withBodyWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java
index 1498d32b3b7..3543134b869 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/PathParamClientImpl.java
@@ -248,17 +248,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -277,17 +276,16 @@ public Mono> getStandaloneWithResponseAsync(RequestOptions
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java
index 87fd2cb5929..48457b5adda 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/defaultclient/implementation/QueryParamClientImpl.java
@@ -248,17 +248,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -277,17 +276,16 @@ public Mono> getStandaloneWithResponseAsync(RequestOptions
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java
index 2395fb1d54d..2299104a7a9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathAsyncClient.java
@@ -64,17 +64,16 @@ public Mono> withQueryWithResponse(RequestOptions requestOptions)
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java
index 1a628e35125..9a51d5baec6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithPathClient.java
@@ -62,17 +62,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java
index 4687e43da90..a594b81ae8f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryAsyncClient.java
@@ -64,17 +64,16 @@ public Mono> withQueryWithResponse(RequestOptions requestOptions)
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java
index 386620bb3fc..78f07548975 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/IndividuallyNestedWithQueryClient.java
@@ -62,17 +62,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java
index f94075e66e8..69a4517201e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithPathClientImpl.java
@@ -249,17 +249,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -278,17 +277,16 @@ public Mono> getStandaloneWithResponseAsync(RequestOptions
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java
index 64794f5a5cc..3ee46251deb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyclient/implementation/IndividuallyNestedWithQueryClientImpl.java
@@ -249,17 +249,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -278,17 +277,16 @@ public Mono> getStandaloneWithResponseAsync(RequestOptions
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java
index 87addaf2ba4..f97060bee09 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathAsyncClient.java
@@ -64,17 +64,16 @@ public Mono> withQueryWithResponse(RequestOptions requestOptions)
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java
index 7fb9a314265..b50fb1a0b4e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithPathClient.java
@@ -62,17 +62,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java
index d08a228542b..51c7e6ed61b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryAsyncClient.java
@@ -64,17 +64,16 @@ public Mono> withQueryWithResponse(RequestOptions requestOptions)
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java
index c61919c1f10..0c962dca9b7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/IndividuallyParentNestedWithQueryClient.java
@@ -62,17 +62,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java
index 15231ef67c0..e16232a3e70 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithPathClientImpl.java
@@ -249,17 +249,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -278,17 +277,16 @@ public Mono> getStandaloneWithResponseAsync(RequestOptions
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java
index 402c7697d73..5275bc1065c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientinitialization/individuallyparentclient/implementation/IndividuallyParentNestedWithQueryClientImpl.java
@@ -249,17 +249,16 @@ public Response withQueryWithResponse(RequestOptions requestOptions) {
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -278,17 +277,16 @@ public Mono> getStandaloneWithResponseAsync(RequestOptions
     /**
      * The getStandalone operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     size: long (Required)
      *     contentType: String (Required)
      *     createdOn: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToAsyncClient.java
index 71dd0c6e917..dfd1e53f865 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToAsyncClient.java
@@ -41,17 +41,16 @@ public final class MoveMethodParameterToAsyncClient {
     /**
      * The getBlob operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     size: int (Required)
      *     path: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param container The container parameter.
      * @param blob The blob parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClient.java
index 4869ebd584a..0dcde0ab65e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/MoveMethodParameterToClient.java
@@ -39,17 +39,16 @@ public final class MoveMethodParameterToClient {
     /**
      * The getBlob operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     size: int (Required)
      *     path: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param container The container parameter.
      * @param blob The blob parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/BlobOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/BlobOperationsImpl.java
index ed4b6c1e481..6d7ca6a6add 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/BlobOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/clientlocation/parameter/implementation/BlobOperationsImpl.java
@@ -84,17 +84,16 @@ Response getBlobSync(@HostParam("endpoint") String endpoint,
     /**
      * The getBlob operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     size: int (Required)
      *     path: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param container The container parameter.
      * @param blob The blob parameter.
@@ -116,17 +115,16 @@ public Mono> getBlobWithResponseAsync(String container, Str
     /**
      * The getBlob operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     size: int (Required)
      *     path: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param container The container parameter.
      * @param blob The blob parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullAsyncClient.java
index 924ed44e4be..8ac20e4fa3d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullAsyncClient.java
@@ -41,22 +41,20 @@ public final class DeserializeEmptyStringAsNullAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     sampleUrl: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is a Model contains a string-like property of type url along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return this is a Model contains a string-like property of type url along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClient.java
index c0756b069a3..8f3a65d7e2e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/DeserializeEmptyStringAsNullClient.java
@@ -39,14 +39,13 @@ public final class DeserializeEmptyStringAsNullClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     sampleUrl: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/DeserializeEmptyStringAsNullClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/DeserializeEmptyStringAsNullClientImpl.java
index e7d485fc2df..65137eb9d82 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/DeserializeEmptyStringAsNullClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/deserialize/emptystringnull/implementation/DeserializeEmptyStringAsNullClientImpl.java
@@ -147,22 +147,20 @@ Response getSync(@HostParam("endpoint") String endpoint, @HeaderPara
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     sampleUrl: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is a Model contains a string-like property of type url along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return this is a Model contains a string-like property of type url along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -173,14 +171,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     sampleUrl: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueAsyncClient.java
index a20d2c9b6a9..50f8e4e0815 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueAsyncClient.java
@@ -41,24 +41,21 @@ public final class EnumValueAsyncClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueClient.java
index 90d64097e76..9d6f72d2f6f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/EnumValueClient.java
@@ -39,24 +39,21 @@ public final class EnumValueClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelAsyncClient.java
index 2fd58a039ed..2f179c6f5ac 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelAsyncClient.java
@@ -41,24 +41,21 @@ public final class ModelAsyncClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelClient.java
index 0a18a8c6b07..3fb6bee7222 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/ModelClient.java
@@ -39,24 +39,21 @@ public final class ModelClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyAsyncClient.java
index 7aeca0a4049..c1188aa6572 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyAsyncClient.java
@@ -41,24 +41,21 @@ public final class PropertyAsyncClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyClient.java
index b8ba9c87f32..62d38c459e5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/PropertyClient.java
@@ -39,24 +39,21 @@ public final class PropertyClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/EnumValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/EnumValuesImpl.java
index c4e45b18f76..f87dc8dbdfb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/EnumValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/EnumValuesImpl.java
@@ -82,24 +82,21 @@ Response sendSync(@HostParam("endpoint") String endpoint,
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -120,24 +117,21 @@ public Mono> sendWithResponseAsync(BinaryData body, Request
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     protocol: String(activity/responses/a2a/mcp) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/ModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/ModelsImpl.java
index 5e70e081ba7..980a3eab7c4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/ModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/ModelsImpl.java
@@ -81,24 +81,21 @@ Response sendSync(@HostParam("endpoint") String endpoint,
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,24 +116,21 @@ public Mono> sendWithResponseAsync(BinaryData body, Request
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/PropertiesImpl.java
index f0688bd88c3..d1918ab18f3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/exactname/implementation/PropertiesImpl.java
@@ -82,24 +82,21 @@ Response sendSync(@HostParam("endpoint") String endpoint,
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -120,24 +117,21 @@ public Mono> sendWithResponseAsync(BinaryData body, Request
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java
index 7170464917f..97c185cdf47 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyAsyncClient.java
@@ -44,9 +44,8 @@ public final class FlattenPropertyAsyncClient {
     /**
      * The putFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -54,13 +53,11 @@ public final class FlattenPropertyAsyncClient {
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -68,8 +65,8 @@ public final class FlattenPropertyAsyncClient {
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -77,8 +74,7 @@ public final class FlattenPropertyAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with one level of flattening along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return this is the model with one level of flattening along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -89,9 +85,8 @@ public Mono> putFlattenModelWithResponse(BinaryData input,
     /**
      * The putNestedFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -102,13 +97,11 @@ public Mono> putFlattenModelWithResponse(BinaryData input,
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -119,8 +112,8 @@ public Mono> putFlattenModelWithResponse(BinaryData input,
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -128,8 +121,7 @@ public Mono> putFlattenModelWithResponse(BinaryData input,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with two levels of flattening along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return this is the model with two levels of flattening along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -141,26 +133,23 @@ public Mono> putNestedFlattenModelWithResponse(BinaryData i
     /**
      * The putFlattenUnknownModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -168,8 +157,7 @@ public Mono> putNestedFlattenModelWithResponse(BinaryData i
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -181,9 +169,8 @@ public Mono> putFlattenUnknownModelWithResponse(BinaryData
     /**
      * The putFlattenReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -192,13 +179,11 @@ public Mono> putFlattenUnknownModelWithResponse(BinaryData
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -207,8 +192,8 @@ public Mono> putFlattenUnknownModelWithResponse(BinaryData
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -216,8 +201,7 @@ public Mono> putFlattenUnknownModelWithResponse(BinaryData
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with flattened properties that are all read-only along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return this is the model with flattened properties that are all read-only along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java
index 9188f468a62..bcaf7ed8ac9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/FlattenPropertyClient.java
@@ -42,9 +42,8 @@ public final class FlattenPropertyClient {
     /**
      * The putFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -52,13 +51,11 @@ public final class FlattenPropertyClient {
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -66,8 +63,8 @@ public final class FlattenPropertyClient {
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -86,9 +83,8 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
     /**
      * The putNestedFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -99,13 +95,11 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -116,8 +110,8 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -136,26 +130,23 @@ public Response putNestedFlattenModelWithResponse(BinaryData input,
     /**
      * The putFlattenUnknownModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -174,9 +165,8 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
     /**
      * The putFlattenReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -185,13 +175,11 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -200,8 +188,8 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java
index c204dea4b66..779a72a15c6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/flattenproperty/implementation/FlattenPropertyClientImpl.java
@@ -209,9 +209,8 @@ Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String e
     /**
      * The putFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -219,13 +218,11 @@ Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String e
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -233,8 +230,8 @@ Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String e
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -242,8 +239,7 @@ Response putFlattenReadOnlyModelSync(@HostParam("endpoint") String e
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with one level of flattening along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return this is the model with one level of flattening along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putFlattenModelWithResponseAsync(BinaryData input,
@@ -257,9 +253,8 @@ public Mono> putFlattenModelWithResponseAsync(BinaryData in
     /**
      * The putFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -267,13 +262,11 @@ public Mono> putFlattenModelWithResponseAsync(BinaryData in
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -281,8 +274,8 @@ public Mono> putFlattenModelWithResponseAsync(BinaryData in
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -303,9 +296,8 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
     /**
      * The putNestedFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -316,13 +308,11 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -333,8 +323,8 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -342,8 +332,7 @@ public Response putFlattenModelWithResponse(BinaryData input, Reques
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with two levels of flattening along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return this is the model with two levels of flattening along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putNestedFlattenModelWithResponseAsync(BinaryData input,
@@ -357,9 +346,8 @@ public Mono> putNestedFlattenModelWithResponseAsync(BinaryD
     /**
      * The putNestedFlattenModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -370,13 +358,11 @@ public Mono> putNestedFlattenModelWithResponseAsync(BinaryD
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Required): {
@@ -387,8 +373,8 @@ public Mono> putNestedFlattenModelWithResponseAsync(BinaryD
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -409,26 +395,23 @@ public Response putNestedFlattenModelWithResponse(BinaryData input,
     /**
      * The putFlattenUnknownModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -436,8 +419,7 @@ public Response putNestedFlattenModelWithResponse(BinaryData input,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return this is the model with unknown type properties to be flattened along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putFlattenUnknownModelWithResponseAsync(BinaryData input,
@@ -451,26 +433,23 @@ public Mono> putFlattenUnknownModelWithResponseAsync(Binary
     /**
      * The putFlattenUnknownModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties: BinaryData (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -491,9 +470,8 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
     /**
      * The putFlattenReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -502,13 +480,11 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -517,8 +493,8 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -526,8 +502,7 @@ public Response putFlattenUnknownModelWithResponse(BinaryData input,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is the model with flattened properties that are all read-only along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return this is the model with flattened properties that are all read-only along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putFlattenReadOnlyModelWithResponseAsync(BinaryData body,
@@ -541,9 +516,8 @@ public Mono> putFlattenReadOnlyModelWithResponseAsync(Binar
     /**
      * The putFlattenReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -552,13 +526,11 @@ public Mono> putFlattenReadOnlyModelWithResponseAsync(Binar
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     properties (Optional): {
@@ -567,8 +539,8 @@ public Mono> putFlattenReadOnlyModelWithResponseAsync(Binar
      *         content: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsAsyncClient.java
index 3f529464029..ea2a70d9c1f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsAsyncClient.java
@@ -41,26 +41,23 @@ public final class AnimalOperationsAsyncClient {
     /**
      * Update a pet as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -79,26 +76,23 @@ public Mono> updatePetAsAnimalWithResponse(BinaryData anima
     /**
      * Update a dog as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsClient.java
index 3d9bf2dadf4..bfffba292a1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/AnimalOperationsClient.java
@@ -39,26 +39,23 @@ public final class AnimalOperationsClient {
     /**
      * Update a pet as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -77,26 +74,23 @@ public Response updatePetAsAnimalWithResponse(BinaryData animal, Req
     /**
      * Update a dog as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsAsyncClient.java
index 86a4eb9b9f1..3df7d47af70 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsAsyncClient.java
@@ -41,30 +41,27 @@ public final class DogOperationsAsyncClient {
     /**
      * Update a dog as a dog.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsClient.java
index 813fe651d7f..74ab3dc2a8f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/DogOperationsClient.java
@@ -39,30 +39,27 @@ public final class DogOperationsClient {
     /**
      * Update a dog as a dog.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsAsyncClient.java
index 1600097887a..d01f019623b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsAsyncClient.java
@@ -41,28 +41,25 @@ public final class PetOperationsAsyncClient {
     /**
      * Update a pet as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -81,28 +78,25 @@ public Mono> updatePetAsPetWithResponse(BinaryData pet, Req
     /**
      * Update a dog as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsClient.java
index dfa76fa5482..987302fef59 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/PetOperationsClient.java
@@ -39,28 +39,25 @@ public final class PetOperationsClient {
     /**
      * Update a pet as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -79,28 +76,25 @@ public Response updatePetAsPetWithResponse(BinaryData pet, RequestOp
     /**
      * Update a dog as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/AnimalOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/AnimalOperationsImpl.java
index 71d67baf7b8..0a50bec4392 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/AnimalOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/AnimalOperationsImpl.java
@@ -102,26 +102,23 @@ Response updateDogAsAnimalSync(@HostParam("endpoint") String endpoin
     /**
      * Update a pet as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -143,26 +140,23 @@ public Mono> updatePetAsAnimalWithResponseAsync(BinaryData
     /**
      * Update a pet as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -183,26 +177,23 @@ public Response updatePetAsAnimalWithResponse(BinaryData animal, Req
     /**
      * Update a dog as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -224,26 +215,23 @@ public Mono> updateDogAsAnimalWithResponseAsync(BinaryData
     /**
      * Update a dog as an animal.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param animal The animal parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/DogOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/DogOperationsImpl.java
index 54e4d0acc12..2575c64ea38 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/DogOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/DogOperationsImpl.java
@@ -82,30 +82,27 @@ Response updateDogAsDogSync(@HostParam("endpoint") String endpoint,
     /**
      * Update a dog as a dog.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -126,30 +123,27 @@ public Mono> updateDogAsDogWithResponseAsync(BinaryData dog
     /**
      * Update a dog as a dog.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      *     breed: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/PetOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/PetOperationsImpl.java
index 4d8d85821cf..45785f20a5c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/PetOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/hierarchybuilding/implementation/PetOperationsImpl.java
@@ -102,28 +102,25 @@ Response updateDogAsPetSync(@HostParam("endpoint") String endpoint,
     /**
      * Update a pet as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -144,28 +141,25 @@ public Mono> updatePetAsPetWithResponseAsync(BinaryData pet
     /**
      * Update a pet as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,28 +180,25 @@ public Response updatePetAsPetWithResponse(BinaryData pet, RequestOp
     /**
      * Update a dog as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -228,28 +219,25 @@ public Mono> updateDogAsPetWithResponseAsync(BinaryData pet
     /**
      * Update a dog as a pet.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      *     trained: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param pet The pet parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java
index ceaadd6b727..192259e604b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbAsyncClient.java
@@ -43,14 +43,13 @@ public final class NextLinkVerbAsyncClient {
     /**
      * The listItems operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClient.java
index e88b934d7a9..3f93a86dadf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/NextLinkVerbClient.java
@@ -39,14 +39,13 @@ public final class NextLinkVerbClient {
     /**
      * The listItems operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/NextLinkVerbClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/NextLinkVerbClientImpl.java
index d65d6461bb2..dc23c6524e3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/NextLinkVerbClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/nextlinkverb/implementation/NextLinkVerbClientImpl.java
@@ -174,14 +174,13 @@ Response listItemsNextSync(@PathParam(value = "nextLink", encoded =
     /**
      * The listItems operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -201,14 +200,13 @@ private Mono> listItemsSinglePageAsync(RequestOptions
     /**
      * The listItems operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -229,14 +227,13 @@ public PagedFlux listItemsAsync(RequestOptions requestOptions) {
     /**
      * The listItems operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -256,14 +253,13 @@ private PagedResponse listItemsSinglePage(RequestOptions requestOpti
     /**
      * The listItems operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -284,14 +280,13 @@ public PagedIterable listItems(RequestOptions requestOptions) {
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -315,14 +310,13 @@ private Mono> listItemsNextSinglePageAsync(String next
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolAsyncClient.java
index 27845687938..fd5785fe6d3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolAsyncClient.java
@@ -38,12 +38,11 @@ public final class ResponseAsBoolAsyncClient {
     /**
      * The exists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -60,12 +59,11 @@ public Mono> existsWithResponse(RequestOptions requestOptions)
     /**
      * The notExists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolClient.java
index 0210f7f36cd..5bdaeda359e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/ResponseAsBoolClient.java
@@ -36,12 +36,11 @@ public final class ResponseAsBoolClient {
     /**
      * The exists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -58,12 +57,11 @@ public Response existsWithResponse(RequestOptions requestOptions) {
     /**
      * The notExists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/implementation/HeadAsBooleansImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/implementation/HeadAsBooleansImpl.java
index 8568eeefe62..5f764394456 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/implementation/HeadAsBooleansImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/responseasbool/implementation/HeadAsBooleansImpl.java
@@ -90,12 +90,11 @@ Response notExistsSync(@HostParam("endpoint") String endpoint, RequestO
     /**
      * The exists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -111,12 +110,11 @@ public Mono> existsWithResponseAsync(RequestOptions requestOpt
     /**
      * The exists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -132,12 +130,11 @@ public Response existsWithResponse(RequestOptions requestOptions) {
     /**
      * The notExists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,12 +150,11 @@ public Mono> notExistsWithResponseAsync(RequestOptions request
     /**
      * The notExists operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationAsyncClient.java
index 90eca8f301e..dd5c4bcc545 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationAsyncClient.java
@@ -44,18 +44,17 @@ public final class ModelInOperationAsyncClient {
      * Expected body parameter:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -75,18 +74,17 @@ public Mono> inputToInputOutputWithResponse(BinaryData body, Requ
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -113,34 +111,31 @@ public Mono> outputToInputOutputWithResponse(RequestOptions
      * Expected response body:
      * ```json
      * {
-     * "result": {
-     * "name": "Madge"
-     * }
+     *   "result": {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -163,17 +158,16 @@ public Mono> modelInReadOnlyPropertyWithResponse(BinaryData
      * Expected body parameter:
      * ```json
      * {
-     * "name": "name",
-     * "desc": "desc"
+     *   "name": "name",
+     *   "desc": "desc"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationClient.java
index 1a12a81525a..87cea0e98c2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/ModelInOperationClient.java
@@ -42,18 +42,17 @@ public final class ModelInOperationClient {
      * Expected body parameter:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -73,18 +72,17 @@ public Response inputToInputOutputWithResponse(BinaryData body, RequestOpt
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -111,34 +109,31 @@ public Response outputToInputOutputWithResponse(RequestOptions reque
      * Expected response body:
      * ```json
      * {
-     * "result": {
-     * "name": "Madge"
-     * }
+     *   "result": {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -160,17 +155,16 @@ public Response modelInReadOnlyPropertyWithResponse(BinaryData body,
      * Expected body parameter:
      * ```json
      * {
-     * "name": "name",
-     * "desc": "desc"
+     *   "name": "name",
+     *   "desc": "desc"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageAsyncClient.java
index 356bec49cf9..878a23c568f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageAsyncClient.java
@@ -42,16 +42,15 @@ public final class NamespaceUsageAsyncClient {
      * Expected body parameter:
      * ```json
      * {
-     * "name": "test"
+     *   "name": "test"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageClient.java
index e575bc19442..5f371651a88 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/NamespaceUsageClient.java
@@ -41,16 +41,15 @@ public final class NamespaceUsageClient {
      * Expected body parameter:
      * ```json
      * {
-     * "name": "test"
+     *   "name": "test"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/ModelInOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/ModelInOperationsImpl.java
index ce7d4d1671a..08ea5bc8260 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/ModelInOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/ModelInOperationsImpl.java
@@ -143,18 +143,17 @@ Response orphanModelSerializableSync(@HostParam("endpoint") String endpoin
      * Expected body parameter:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -175,18 +174,17 @@ public Mono> inputToInputOutputWithResponseAsync(BinaryData body,
      * Expected body parameter:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -207,18 +205,17 @@ public Response inputToInputOutputWithResponse(BinaryData body, RequestOpt
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -238,18 +235,17 @@ public Mono> outputToInputOutputWithResponseAsync(RequestOp
      * Expected response body:
      * ```json
      * {
-     * "name": "Madge"
+     *   "name": "Madge"
      * }
      * ```.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -276,34 +272,31 @@ public Response outputToInputOutputWithResponse(RequestOptions reque
      * Expected response body:
      * ```json
      * {
-     * "result": {
-     * "name": "Madge"
-     * }
+     *   "result": {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -334,34 +327,31 @@ public Mono> modelInReadOnlyPropertyWithResponseAsync(Binar
      * Expected response body:
      * ```json
      * {
-     * "result": {
-     * "name": "Madge"
-     * }
+     *   "result": {
+     *     "name": "Madge"
+     *   }
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     result (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -385,17 +375,16 @@ public Response modelInReadOnlyPropertyWithResponse(BinaryData body,
      * Expected body parameter:
      * ```json
      * {
-     * "name": "name",
-     * "desc": "desc"
+     *   "name": "name",
+     *   "desc": "desc"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -419,17 +408,16 @@ public Mono> orphanModelSerializableWithResponseAsync(BinaryData
      * Expected body parameter:
      * ```json
      * {
-     * "name": "name",
-     * "desc": "desc"
+     *   "name": "name",
+     *   "desc": "desc"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/NamespaceUsagesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/NamespaceUsagesImpl.java
index b5b360052ef..68b053fd0cc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/NamespaceUsagesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/clientgenerator/core/usage/implementation/NamespaceUsagesImpl.java
@@ -85,16 +85,15 @@ Response namespaceModelSerializableSync(@HostParam("endpoint") String endp
      * Expected body parameter:
      * ```json
      * {
-     * "name": "test"
+     *   "name": "test"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -118,16 +117,15 @@ public Mono> namespaceModelSerializableWithResponseAsync(BinaryDa
      * Expected body parameter:
      * ```json
      * {
-     * "name": "test"
+     *   "name": "test"
      * }
      * ```.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicAsyncClient.java
index 1395fc7c961..16a4d7c2ab3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicAsyncClient.java
@@ -52,9 +52,8 @@ public final class BasicAsyncClient {
      * 
      * Creates or updates a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -67,13 +66,11 @@ public final class BasicAsyncClient {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -86,8 +83,8 @@ public final class BasicAsyncClient {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -110,9 +107,8 @@ Mono> createOrUpdateWithResponseInternal(int id, BinaryData
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -125,13 +121,11 @@ Mono> createOrUpdateWithResponseInternal(int id, BinaryData
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -144,8 +138,8 @@ Mono> createOrUpdateWithResponseInternal(int id, BinaryData
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -168,9 +162,8 @@ Mono> createOrReplaceWithResponseInternal(int id, BinaryDat
      * 
      * Gets a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -183,8 +176,8 @@ Mono> createOrReplaceWithResponseInternal(int id, BinaryDat
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -208,24 +201,20 @@ Mono> getWithResponseInternal(int id, RequestOptions reques
      * Lists all Users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned
-     * results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response.
-     * Call {@link RequestOptions#addQueryParam} to add string to array.
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response. Call {@link RequestOptions#addQueryParam} to add string to array.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -238,8 +227,8 @@ Mono> getWithResponseInternal(int id, RequestOptions reques
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -278,9 +267,8 @@ Mono> deleteWithResponseInternal(int id, RequestOptions requestOp
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -293,8 +281,8 @@ Mono> deleteWithResponseInternal(int id, RequestOptions requestOp
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param format The format of the data.
@@ -316,9 +304,8 @@ Mono> exportWithResponseInternal(int id, String format, Req
      * 
      * Exports all users.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     users (Required): [
      *          (Required){
@@ -335,8 +322,8 @@ Mono> exportWithResponseInternal(int id, String format, Req
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format of the data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicClient.java
index fae2cdb9d44..6c0df08f65a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/BasicClient.java
@@ -46,9 +46,8 @@ public final class BasicClient {
      * 
      * Creates or updates a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -61,13 +60,11 @@ public final class BasicClient {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -80,8 +77,8 @@ public final class BasicClient {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -104,9 +101,8 @@ Response createOrUpdateWithResponseInternal(int id, BinaryData resou
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -119,13 +115,11 @@ Response createOrUpdateWithResponseInternal(int id, BinaryData resou
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -138,8 +132,8 @@ Response createOrUpdateWithResponseInternal(int id, BinaryData resou
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -162,9 +156,8 @@ Response createOrReplaceWithResponseInternal(int id, BinaryData reso
      * 
      * Gets a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -177,8 +170,8 @@ Response createOrReplaceWithResponseInternal(int id, BinaryData reso
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -202,24 +195,20 @@ Response getWithResponseInternal(int id, RequestOptions requestOptio
      * Lists all Users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned
-     * results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response.
-     * Call {@link RequestOptions#addQueryParam} to add string to array.
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response. Call {@link RequestOptions#addQueryParam} to add string to array.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -232,8 +221,8 @@ Response getWithResponseInternal(int id, RequestOptions requestOptio
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -272,9 +261,8 @@ Response deleteWithResponseInternal(int id, RequestOptions requestOptions)
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -287,8 +275,8 @@ Response deleteWithResponseInternal(int id, RequestOptions requestOptions)
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param format The format of the data.
@@ -310,9 +298,8 @@ Response exportWithResponseInternal(int id, String format, RequestOp
      * 
      * Exports all users.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     users (Required): [
      *          (Required){
@@ -329,8 +316,8 @@ Response exportWithResponseInternal(int id, String format, RequestOp
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format of the data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/implementation/BasicClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/implementation/BasicClientImpl.java
index 87d3f12f185..330e1f39158 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/implementation/BasicClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/basic/implementation/BasicClientImpl.java
@@ -328,9 +328,8 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      * 
      * Creates or updates a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -343,13 +342,11 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -362,8 +359,8 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -388,9 +385,8 @@ public Mono> createOrUpdateWithResponseInternalAsync(int id
      * 
      * Creates or updates a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -403,13 +399,11 @@ public Mono> createOrUpdateWithResponseInternalAsync(int id
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -422,8 +416,8 @@ public Mono> createOrUpdateWithResponseInternalAsync(int id
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -448,9 +442,8 @@ public Response createOrUpdateWithResponseInternal(int id, BinaryDat
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -463,13 +456,11 @@ public Response createOrUpdateWithResponseInternal(int id, BinaryDat
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -482,8 +473,8 @@ public Response createOrUpdateWithResponseInternal(int id, BinaryDat
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -508,9 +499,8 @@ public Mono> createOrReplaceWithResponseInternalAsync(int i
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -523,13 +513,11 @@ public Mono> createOrReplaceWithResponseInternalAsync(int i
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -542,8 +530,8 @@ public Mono> createOrReplaceWithResponseInternalAsync(int i
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param resource The resource instance.
@@ -568,9 +556,8 @@ public Response createOrReplaceWithResponseInternal(int id, BinaryDa
      * 
      * Gets a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -583,8 +570,8 @@ public Response createOrReplaceWithResponseInternal(int id, BinaryDa
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -608,9 +595,8 @@ public Mono> getWithResponseInternalAsync(int id, RequestOp
      * 
      * Gets a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -623,8 +609,8 @@ public Mono> getWithResponseInternalAsync(int id, RequestOp
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -649,24 +635,20 @@ public Response getWithResponseInternal(int id, RequestOptions reque
      * Lists all Users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned
-     * results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response.
-     * Call {@link RequestOptions#addQueryParam} to add string to array.
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response. Call {@link RequestOptions#addQueryParam} to add string to array.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -679,8 +661,8 @@ public Response getWithResponseInternal(int id, RequestOptions reque
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -705,24 +687,20 @@ private Mono> listSinglePageAsync(RequestOptions reque
      * Lists all Users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned
-     * results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response.
-     * Call {@link RequestOptions#addQueryParam} to add string to array.
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response. Call {@link RequestOptions#addQueryParam} to add string to array.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -735,8 +713,8 @@ private Mono> listSinglePageAsync(RequestOptions reque
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -780,24 +758,20 @@ public PagedFlux listInternalAsync(RequestOptions requestOptions) {
      * Lists all Users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned
-     * results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response.
-     * Call {@link RequestOptions#addQueryParam} to add string to array.
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response. Call {@link RequestOptions#addQueryParam} to add string to array.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -810,8 +784,8 @@ public PagedFlux listInternalAsync(RequestOptions requestOptions) {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -835,24 +809,20 @@ private PagedResponse listSinglePage(RequestOptions requestOptions)
      * Lists all Users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned
-     * results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response.
-     * Call {@link RequestOptions#addQueryParam} to add string to array.
Query Parameters
NameTypeRequiredDescription
topIntegerNoThe number of result items to return.
skipIntegerNoThe number of result items to skip.
maxpagesizeIntegerNoThe maximum number of result items per page.
orderbyList<String>NoExpressions that specify the order of returned results. Call {@link RequestOptions#addQueryParam} to add string to array.
filterStringNoFilter the result list using the given expression.
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandList<String>NoExpand the indicated resources into the response. Call {@link RequestOptions#addQueryParam} to add string to array.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -865,8 +835,8 @@ private PagedResponse listSinglePage(RequestOptions requestOptions)
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -947,9 +917,8 @@ public Response deleteWithResponseInternal(int id, RequestOptions requestO
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -962,8 +931,8 @@ public Response deleteWithResponseInternal(int id, RequestOptions requestO
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param format The format of the data.
@@ -987,9 +956,8 @@ public Mono> exportWithResponseInternalAsync(int id, String
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -1002,8 +970,8 @@ public Mono> exportWithResponseInternalAsync(int id, String
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The user's id.
      * @param format The format of the data.
@@ -1026,9 +994,8 @@ public Response exportWithResponseInternal(int id, String format, Re
      * 
      * Exports all users.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     users (Required): [
      *          (Required){
@@ -1045,8 +1012,8 @@ public Response exportWithResponseInternal(int id, String format, Re
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format of the data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1069,9 +1036,8 @@ public Mono> exportAllUsersWithResponseInternalAsync(String
      * 
      * Exports all users.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     users (Required): [
      *          (Required){
@@ -1088,8 +1054,8 @@ public Mono> exportAllUsersWithResponseInternalAsync(String
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format of the data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1111,9 +1077,8 @@ public Response exportAllUsersWithResponseInternal(String format, Re
      * 
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -1126,8 +1091,8 @@ public Response exportAllUsersWithResponseInternal(String format, Re
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1151,9 +1116,8 @@ private Mono> listNextSinglePageAsync(String nextLink,
      * 
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional, Required on create)
@@ -1166,8 +1130,8 @@ private Mono> listNextSinglePageAsync(String nextLink,
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcAsyncClient.java
index c44f6cee8e0..f6aafd6f2d7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcAsyncClient.java
@@ -41,19 +41,16 @@ public final class RpcAsyncClient {
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -73,8 +70,8 @@ public final class RpcAsyncClient {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcClient.java
index e96a776a854..24f1d036801 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/RpcClient.java
@@ -41,19 +41,16 @@ public final class RpcClient {
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -73,8 +70,8 @@ public final class RpcClient {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/implementation/RpcClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/implementation/RpcClientImpl.java
index fc45b22219b..88f8aa4b728 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/implementation/RpcClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/rpc/implementation/RpcClientImpl.java
@@ -177,19 +177,16 @@ Response longRunningRpcSync(@HostParam("endpoint") String endpoint,
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -209,8 +206,8 @@ Response longRunningRpcSync(@HostParam("endpoint") String endpoint,
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -218,8 +215,7 @@ Response longRunningRpcSync(@HostParam("endpoint") String endpoint,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> longRunningRpcWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
@@ -232,19 +228,16 @@ private Mono> longRunningRpcWithResponseAsync(BinaryData bo
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -264,8 +257,8 @@ private Mono> longRunningRpcWithResponseAsync(BinaryData bo
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -286,19 +279,16 @@ private Response longRunningRpcWithResponse(BinaryData body, Request
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -318,8 +308,8 @@ private Response longRunningRpcWithResponse(BinaryData body, Request
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -349,19 +339,16 @@ public PollerFlux beginLongRunningRpcWit
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -381,8 +368,8 @@ public PollerFlux beginLongRunningRpcWit
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -412,19 +399,16 @@ public SyncPoller beginLongRunningRpcWit
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -444,8 +428,8 @@ public SyncPoller beginLongRunningRpcWit
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -473,19 +457,16 @@ public PollerFlux beginLongRunningRpcAsync(BinaryData bo
     /**
      * Generate data.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prompt: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -505,8 +486,8 @@ public PollerFlux beginLongRunningRpcAsync(BinaryData bo
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardAsyncClient.java
index f9b3771566c..29c85cd3d00 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardAsyncClient.java
@@ -43,26 +43,23 @@ public final class StandardAsyncClient {
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -85,9 +82,8 @@ public PollerFlux beginCreateOrReplace(String name, Bina
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -104,8 +100,8 @@ public PollerFlux beginCreateOrReplace(String name, Bina
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -126,9 +122,8 @@ public PollerFlux beginDelete(String name, RequestOptions requ
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -149,8 +144,8 @@ public PollerFlux beginDelete(String name, RequestOptions requ
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardClient.java
index 418e6abc9f7..e6c568bc293 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/StandardClient.java
@@ -43,26 +43,23 @@ public final class StandardClient {
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -85,9 +82,8 @@ public SyncPoller beginCreateOrReplace(String name, Bina
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -104,8 +100,8 @@ public SyncPoller beginCreateOrReplace(String name, Bina
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -126,9 +122,8 @@ public SyncPoller beginDelete(String name, RequestOptions requ
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -149,8 +144,8 @@ public SyncPoller beginDelete(String name, RequestOptions requ
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/implementation/StandardClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/implementation/StandardClientImpl.java
index 6b74c0996ec..f799542e8b5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/implementation/StandardClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/lro/standard/implementation/StandardClientImpl.java
@@ -225,26 +225,23 @@ Response exportSync(@HostParam("endpoint") String endpoint,
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -269,26 +266,23 @@ private Mono> createOrReplaceWithResponseAsync(String name,
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -313,26 +307,23 @@ private Response createOrReplaceWithResponse(String name, BinaryData
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -363,26 +354,23 @@ public PollerFlux beginCreateOrReplaceWithModelAsync
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -413,26 +401,23 @@ public SyncPoller beginCreateOrReplaceWithModel(Stri
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -463,26 +448,23 @@ public PollerFlux beginCreateOrReplaceAsync(String name,
      * 
      * Creates or replaces a User.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     role: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param resource The resource instance.
@@ -513,9 +495,8 @@ public SyncPoller beginCreateOrReplace(String name, Bina
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -532,8 +513,8 @@ public SyncPoller beginCreateOrReplace(String name, Bina
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -541,8 +522,7 @@ public SyncPoller beginCreateOrReplace(String name, Bina
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> deleteWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -556,9 +536,8 @@ private Mono> deleteWithResponseAsync(String name, RequestO
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -575,8 +554,8 @@ private Mono> deleteWithResponseAsync(String name, RequestO
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -598,9 +577,8 @@ private Response deleteWithResponse(String name, RequestOptions requ
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -617,8 +595,8 @@ private Response deleteWithResponse(String name, RequestOptions requ
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -647,9 +625,8 @@ public PollerFlux beginDeleteWithModelAsync(String n
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -666,8 +643,8 @@ public PollerFlux beginDeleteWithModelAsync(String n
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -695,9 +672,8 @@ public SyncPoller beginDeleteWithModel(String name,
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -714,8 +690,8 @@ public SyncPoller beginDeleteWithModel(String name,
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -743,9 +719,8 @@ public PollerFlux beginDeleteAsync(String name, RequestOptions
      * 
      * Deletes a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -762,8 +737,8 @@ public PollerFlux beginDeleteAsync(String name, RequestOptions
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -791,9 +766,8 @@ public SyncPoller beginDelete(String name, RequestOptions requ
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -814,8 +788,8 @@ public SyncPoller beginDelete(String name, RequestOptions requ
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
@@ -824,8 +798,7 @@ public SyncPoller beginDelete(String name, RequestOptions requ
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> exportWithResponseAsync(String name, String format,
@@ -840,9 +813,8 @@ private Mono> exportWithResponseAsync(String name, String f
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -863,8 +835,8 @@ private Mono> exportWithResponseAsync(String name, String f
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
@@ -887,9 +859,8 @@ private Response exportWithResponse(String name, String format, Requ
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -910,8 +881,8 @@ private Response exportWithResponse(String name, String format, Requ
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
@@ -943,9 +914,8 @@ public PollerFlux beginExportWithModelAsync(
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -966,8 +936,8 @@ public PollerFlux beginExportWithModelAsync(
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
@@ -999,9 +969,8 @@ public SyncPoller beginExportWithModel(Strin
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1022,8 +991,8 @@ public SyncPoller beginExportWithModel(Strin
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
@@ -1055,9 +1024,8 @@ public PollerFlux beginExportAsync(String name, String f
      * 
      * Exports a User.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1078,8 +1046,8 @@ public PollerFlux beginExportAsync(String name, String f
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name of user.
      * @param format The format of the data.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelAsyncClient.java
index 75d79a066d2..da8a01b8fc1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelAsyncClient.java
@@ -43,14 +43,13 @@ public final class ModelAsyncClient {
     /**
      * get an embedding vector.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * put an embedding vector.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -94,28 +92,25 @@ public Mono> putWithResponse(BinaryData body, RequestOptions requ
     /**
      * post a model which has an embeddingVector property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelClient.java
index aabdbc0f4fc..ae3154e0881 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/ModelClient.java
@@ -41,14 +41,13 @@ public final class ModelClient {
     /**
      * get an embedding vector.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put an embedding vector.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -92,28 +90,25 @@ public Response putWithResponse(BinaryData body, RequestOptions requestOpt
     /**
      * post a model which has an embeddingVector property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/implementation/AzureCoreEmbeddingVectorsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/implementation/AzureCoreEmbeddingVectorsImpl.java
index a7710adc313..4fa13d992c7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/implementation/AzureCoreEmbeddingVectorsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/model/implementation/AzureCoreEmbeddingVectorsImpl.java
@@ -131,14 +131,13 @@ Response postSync(@HostParam("endpoint") String endpoint,
     /**
      * get an embedding vector.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,14 +155,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * get an embedding vector.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -181,14 +179,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put an embedding vector.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -208,14 +205,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * put an embedding vector.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -234,28 +230,25 @@ public Response putWithResponse(BinaryData body, RequestOptions requestOpt
     /**
      * post a model which has an embeddingVector property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -276,28 +269,25 @@ public Mono> postWithResponseAsync(BinaryData body, Request
     /**
      * post a model which has an embeddingVector property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     embedding (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java
index 00da9c19a64..faf5754a144 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageAsyncClient.java
@@ -45,9 +45,8 @@ public final class PageAsyncClient {
     /**
      * List with Azure.Core.Page<>.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -60,8 +59,8 @@ public final class PageAsyncClient {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -80,26 +79,22 @@ public PagedFlux listWithPage(RequestOptions requestOptions) {
      * List with extensible enum parameter Azure.Core.Page<>.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First",
-     * "Second".
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First", "Second".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     inputName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -112,8 +107,8 @@ public PagedFlux listWithPage(RequestOptions requestOptions) {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyInput The body of the input.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -132,9 +127,8 @@ public PagedFlux listWithParameters(BinaryData bodyInput, RequestOpt
     /**
      * List with custom page model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -147,8 +141,8 @@ public PagedFlux listWithParameters(BinaryData bodyInput, RequestOpt
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -167,15 +161,14 @@ public PagedFlux listWithCustomPageModel(RequestOptions requestOptio
      * List with parameterized next link that re-injects parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -188,8 +181,8 @@ public PagedFlux listWithCustomPageModel(RequestOptions requestOptio
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param select The select parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -208,9 +201,8 @@ public PagedFlux withParameterizedNextLink(String select, RequestOpt
     /**
      * List with relative nextLink URL that requires endpoint resolution.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -223,8 +215,8 @@ public PagedFlux withParameterizedNextLink(String select, RequestOpt
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java
index 788f6272b29..55dd30385dc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/PageClient.java
@@ -41,9 +41,8 @@ public final class PageClient {
     /**
      * List with Azure.Core.Page<>.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -56,8 +55,8 @@ public final class PageClient {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -76,26 +75,22 @@ public PagedIterable listWithPage(RequestOptions requestOptions) {
      * List with extensible enum parameter Azure.Core.Page<>.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First",
-     * "Second".
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First", "Second".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     inputName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -108,8 +103,8 @@ public PagedIterable listWithPage(RequestOptions requestOptions) {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyInput The body of the input.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -128,9 +123,8 @@ public PagedIterable listWithParameters(BinaryData bodyInput, Reques
     /**
      * List with custom page model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -143,8 +137,8 @@ public PagedIterable listWithParameters(BinaryData bodyInput, Reques
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -163,15 +157,14 @@ public PagedIterable listWithCustomPageModel(RequestOptions requestO
      * List with parameterized next link that re-injects parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -184,8 +177,8 @@ public PagedIterable listWithCustomPageModel(RequestOptions requestO
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param select The select parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,9 +197,8 @@ public PagedIterable withParameterizedNextLink(String select, Reques
     /**
      * List with relative nextLink URL that requires endpoint resolution.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -219,8 +211,8 @@ public PagedIterable withParameterizedNextLink(String select, Reques
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java
index 944ecd05bbf..e417f4b914c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemAsyncClient.java
@@ -42,17 +42,15 @@ public final class TwoModelsAsPageItemAsyncClient {
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * FirstItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for FirstItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,17 +66,15 @@ public PagedFlux listFirstItem(RequestOptions requestOptions) {
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * SecondItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for SecondItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemClient.java
index 7a73a3f4b40..3d5bad73ffb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/TwoModelsAsPageItemClient.java
@@ -38,17 +38,15 @@ public final class TwoModelsAsPageItemClient {
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * FirstItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for FirstItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,17 +62,15 @@ public PagedIterable listFirstItem(RequestOptions requestOptions) {
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * SecondItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for SecondItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java
index 14b65cd0166..24d94722889 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/PageClientImpl.java
@@ -371,9 +371,8 @@ Response withRelativeNextLinkNextSync(
     /**
      * List with Azure.Core.Page<>.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -386,8 +385,8 @@ Response withRelativeNextLinkNextSync(
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -409,9 +408,8 @@ private Mono> listWithPageSinglePageAsync(RequestOptio
     /**
      * List with Azure.Core.Page<>.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -424,8 +422,8 @@ private Mono> listWithPageSinglePageAsync(RequestOptio
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -446,9 +444,8 @@ public PagedFlux listWithPageAsync(RequestOptions requestOptions) {
     /**
      * List with Azure.Core.Page<>.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -461,8 +458,8 @@ public PagedFlux listWithPageAsync(RequestOptions requestOptions) {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -483,9 +480,8 @@ private PagedResponse listWithPageSinglePage(RequestOptions requestO
     /**
      * List with Azure.Core.Page<>.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -498,8 +494,8 @@ private PagedResponse listWithPageSinglePage(RequestOptions requestO
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -521,26 +517,22 @@ public PagedIterable listWithPage(RequestOptions requestOptions) {
      * List with extensible enum parameter Azure.Core.Page<>.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First",
-     * "Second".
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First", "Second".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     inputName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -553,8 +545,8 @@ public PagedIterable listWithPage(RequestOptions requestOptions) {
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyInput The body of the input.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -579,26 +571,22 @@ private Mono> listWithParametersSinglePageAsync(Binary
      * List with extensible enum parameter Azure.Core.Page<>.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First",
-     * "Second".
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First", "Second".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     inputName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -611,8 +599,8 @@ private Mono> listWithParametersSinglePageAsync(Binary
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyInput The body of the input.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -635,26 +623,22 @@ public PagedFlux listWithParametersAsync(BinaryData bodyInput, Reque
      * List with extensible enum parameter Azure.Core.Page<>.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First",
-     * "Second".
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First", "Second".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     inputName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -667,8 +651,8 @@ public PagedFlux listWithParametersAsync(BinaryData bodyInput, Reque
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyInput The body of the input.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -692,26 +676,22 @@ private PagedResponse listWithParametersSinglePage(BinaryData bodyIn
      * List with extensible enum parameter Azure.Core.Page<>.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First",
-     * "Second".
Query Parameters
NameTypeRequiredDescription
anotherStringNoAnother query parameter. Allowed values: "First", "Second".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     inputName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -724,8 +704,8 @@ private PagedResponse listWithParametersSinglePage(BinaryData bodyIn
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyInput The body of the input.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -747,9 +727,8 @@ public PagedIterable listWithParameters(BinaryData bodyInput, Reques
     /**
      * List with custom page model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -762,8 +741,8 @@ public PagedIterable listWithParameters(BinaryData bodyInput, Reques
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -785,9 +764,8 @@ private Mono> listWithCustomPageModelSinglePageAsync(R
     /**
      * List with custom page model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -800,8 +778,8 @@ private Mono> listWithCustomPageModelSinglePageAsync(R
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -822,9 +800,8 @@ public PagedFlux listWithCustomPageModelAsync(RequestOptions request
     /**
      * List with custom page model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -837,8 +814,8 @@ public PagedFlux listWithCustomPageModelAsync(RequestOptions request
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -859,9 +836,8 @@ private PagedResponse listWithCustomPageModelSinglePage(RequestOptio
     /**
      * List with custom page model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -874,8 +850,8 @@ private PagedResponse listWithCustomPageModelSinglePage(RequestOptio
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -897,15 +873,14 @@ public PagedIterable listWithCustomPageModel(RequestOptions requestO
      * List with parameterized next link that re-injects parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -918,8 +893,8 @@ public PagedIterable listWithCustomPageModel(RequestOptions requestO
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param select The select parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -943,15 +918,14 @@ private Mono> withParameterizedNextLinkSinglePageAsync
      * List with parameterized next link that re-injects parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -964,8 +938,8 @@ private Mono> withParameterizedNextLinkSinglePageAsync
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param select The select parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -997,15 +971,14 @@ public PagedFlux withParameterizedNextLinkAsync(String select, Reque
      * List with parameterized next link that re-injects parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1018,8 +991,8 @@ public PagedFlux withParameterizedNextLinkAsync(String select, Reque
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param select The select parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1043,15 +1016,14 @@ private PagedResponse withParameterizedNextLinkSinglePage(String sel
      * List with parameterized next link that re-injects parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter
Query Parameters
NameTypeRequiredDescription
includePendingBooleanNoThe includePending parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1064,8 +1036,8 @@ private PagedResponse withParameterizedNextLinkSinglePage(String sel
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param select The select parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1096,9 +1068,8 @@ public PagedIterable withParameterizedNextLink(String select, Reques
     /**
      * List with relative nextLink URL that requires endpoint resolution.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1111,8 +1082,8 @@ public PagedIterable withParameterizedNextLink(String select, Reques
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1133,9 +1104,8 @@ private Mono> withRelativeNextLinkSinglePageAsync(Requ
     /**
      * List with relative nextLink URL that requires endpoint resolution.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1148,8 +1118,8 @@ private Mono> withRelativeNextLinkSinglePageAsync(Requ
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1170,9 +1140,8 @@ public PagedFlux withRelativeNextLinkAsync(RequestOptions requestOpt
     /**
      * List with relative nextLink URL that requires endpoint resolution.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1185,8 +1154,8 @@ public PagedFlux withRelativeNextLinkAsync(RequestOptions requestOpt
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1207,9 +1176,8 @@ private PagedResponse withRelativeNextLinkSinglePage(RequestOptions
     /**
      * List with relative nextLink URL that requires endpoint resolution.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1222,8 +1190,8 @@ private PagedResponse withRelativeNextLinkSinglePage(RequestOptions
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1244,9 +1212,8 @@ public PagedIterable withRelativeNextLink(RequestOptions requestOpti
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1259,8 +1226,8 @@ public PagedIterable withRelativeNextLink(RequestOptions requestOpti
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1284,9 +1251,8 @@ private Mono> listWithPageNextSinglePageAsync(String n
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1299,8 +1265,8 @@ private Mono> listWithPageNextSinglePageAsync(String n
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1322,9 +1288,8 @@ private PagedResponse listWithPageNextSinglePage(String nextLink, Re
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1337,8 +1302,8 @@ private PagedResponse listWithPageNextSinglePage(String nextLink, Re
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1361,9 +1326,8 @@ private Mono> listWithParametersNextSinglePageAsync(St
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1376,8 +1340,8 @@ private Mono> listWithParametersNextSinglePageAsync(St
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1399,9 +1363,8 @@ private PagedResponse listWithParametersNextSinglePage(String nextLi
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1414,8 +1377,8 @@ private PagedResponse listWithParametersNextSinglePage(String nextLi
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1439,9 +1402,8 @@ private Mono> listWithCustomPageModelNextSinglePageAsy
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1454,8 +1416,8 @@ private Mono> listWithCustomPageModelNextSinglePageAsy
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1478,9 +1440,8 @@ private PagedResponse listWithCustomPageModelNextSinglePage(String n
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1493,8 +1454,8 @@ private PagedResponse listWithCustomPageModelNextSinglePage(String n
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1518,9 +1479,8 @@ private Mono> withParameterizedNextLinkNextSinglePageA
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1533,8 +1493,8 @@ private Mono> withParameterizedNextLinkNextSinglePageA
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1557,9 +1517,8 @@ private PagedResponse withParameterizedNextLinkNextSinglePage(String
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1572,8 +1531,8 @@ private PagedResponse withParameterizedNextLinkNextSinglePage(String
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1596,9 +1555,8 @@ private Mono> withRelativeNextLinkNextSinglePageAsync(
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
@@ -1611,8 +1569,8 @@ private Mono> withRelativeNextLinkNextSinglePageAsync(
      *     ]
      *     etag: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/TwoModelsAsPageItemsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/TwoModelsAsPageItemsImpl.java
index 0e1df90ebd0..672cac997ef 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/TwoModelsAsPageItemsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/page/implementation/TwoModelsAsPageItemsImpl.java
@@ -158,25 +158,22 @@ Response listSecondItemNextSync(@PathParam(value = "nextLink", encod
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * FirstItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for FirstItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of FirstItem items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of FirstItem items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listFirstItemSinglePageAsync(RequestOptions requestOptions) {
@@ -189,17 +186,15 @@ private Mono> listFirstItemSinglePageAsync(RequestOpti
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * FirstItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for FirstItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -218,17 +213,15 @@ public PagedFlux listFirstItemAsync(RequestOptions requestOptions) {
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * FirstItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for FirstItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -247,17 +240,15 @@ private PagedResponse listFirstItemSinglePage(RequestOptions request
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * FirstItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for FirstItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -276,25 +267,22 @@ public PagedIterable listFirstItem(RequestOptions requestOptions) {
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * SecondItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for SecondItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of SecondItem items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of SecondItem items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listSecondItemSinglePageAsync(RequestOptions requestOptions) {
@@ -307,17 +295,15 @@ private Mono> listSecondItemSinglePageAsync(RequestOpt
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * SecondItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for SecondItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -336,17 +322,15 @@ public PagedFlux listSecondItemAsync(RequestOptions requestOptions)
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * SecondItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for SecondItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -365,17 +349,15 @@ private PagedResponse listSecondItemSinglePage(RequestOptions reques
     }
 
     /**
-     * Two operations with two different page item types should be successfully generated. Should generate model for
-     * SecondItem.
+     * Two operations with two different page item types should be successfully generated. Should generate model for SecondItem.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -396,14 +378,13 @@ public PagedIterable listSecondItem(RequestOptions requestOptions) {
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -411,8 +392,7 @@ public PagedIterable listSecondItem(RequestOptions requestOptions) {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of FirstItem items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of FirstItem items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listFirstItemNextSinglePageAsync(String nextLink,
@@ -427,14 +407,13 @@ private Mono> listFirstItemNextSinglePageAsync(String
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -456,14 +435,13 @@ private PagedResponse listFirstItemNextSinglePage(String nextLink, R
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -471,8 +449,7 @@ private PagedResponse listFirstItemNextSinglePage(String nextLink, R
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of SecondItem items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of SecondItem items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listSecondItemNextSinglePageAsync(String nextLink,
@@ -487,14 +464,13 @@ private Mono> listSecondItemNextSinglePageAsync(String
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarAsyncClient.java
index 7e9252a3a54..ae1f1c301c4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarAsyncClient.java
@@ -41,12 +41,11 @@ public final class ScalarAsyncClient {
     /**
      * get azureLocation value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,12 +63,11 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * put azureLocation value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -88,24 +86,21 @@ public Mono> putWithResponse(BinaryData body, RequestOptions requ
     /**
      * post a model which has azureLocation property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarClient.java
index a30e9ff33e2..d55a44d6c30 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/ScalarClient.java
@@ -39,12 +39,11 @@ public final class ScalarClient {
     /**
      * get azureLocation value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,12 +61,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put azureLocation value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -86,24 +84,21 @@ public Response putWithResponse(BinaryData body, RequestOptions requestOpt
     /**
      * post a model which has azureLocation property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/implementation/AzureLocationScalarsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/implementation/AzureLocationScalarsImpl.java
index e459eaf4eba..11f979ef0f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/implementation/AzureLocationScalarsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/scalar/implementation/AzureLocationScalarsImpl.java
@@ -168,12 +168,11 @@ Response querySync(@HostParam("endpoint") String endpoint, @QueryParam("re
     /**
      * get azureLocation value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,12 +190,11 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * get azureLocation value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -214,12 +212,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put azureLocation value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -239,12 +236,11 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * put azureLocation value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -263,24 +259,21 @@ public Response putWithResponse(BinaryData body, RequestOptions requestOpt
     /**
      * post a model which has azureLocation property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -301,24 +294,21 @@ public Mono> postWithResponseAsync(BinaryData body, Request
     /**
      * post a model which has azureLocation property.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     location: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsAsyncClient.java
index 919d76bc449..1419531645d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsAsyncClient.java
@@ -48,37 +48,30 @@ public final class TraitsAsyncClient {
      * Get a resource, sending and receiving headers.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string
-     * identifier for the request.
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string identifier for the request.

      * 
      * @param id The user's id.
@@ -88,8 +81,7 @@ public final class TraitsAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a resource, sending and receiving headers along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return a resource, sending and receiving headers along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -101,39 +93,33 @@ public Mono> smokeTestWithResponse(int id, String foo, Requ
      * Test for repeatable requests.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionValue: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionResult: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param id The user's id.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsClient.java
index df0c730eec8..ad4000e8121 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsClient.java
@@ -46,37 +46,30 @@ public final class TraitsClient {
      * Get a resource, sending and receiving headers.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string
-     * identifier for the request.
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string identifier for the request.

      * 
      * @param id The user's id.
@@ -98,39 +91,33 @@ public Response smokeTestWithResponse(int id, String foo, RequestOpt
      * Test for repeatable requests.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionValue: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionResult: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param id The user's id.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/implementation/TraitsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/implementation/TraitsClientImpl.java
index d9bf2fe243c..4033539bc5c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/implementation/TraitsClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/implementation/TraitsClientImpl.java
@@ -197,37 +197,30 @@ Response repeatableActionSync(@HostParam("endpoint") String endpoint
      * Get a resource, sending and receiving headers.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string
-     * identifier for the request.
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string identifier for the request.

      * 
      * @param id The user's id.
@@ -237,8 +230,7 @@ Response repeatableActionSync(@HostParam("endpoint") String endpoint
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a resource, sending and receiving headers along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return a resource, sending and receiving headers along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> smokeTestWithResponseAsync(int id, String foo, RequestOptions requestOptions) {
@@ -251,37 +243,30 @@ public Mono> smokeTestWithResponseAsync(int id, String foo,
      * Get a resource, sending and receiving headers.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string
-     * identifier for the request.
Response Headers
NameTypeDescription
barStringThe bar response header.
ETagStringThe entity tag for the response.
x-ms-client-request-idStringAn opaque, globally-unique, client-generated string identifier for the request.

      * 
      * @param id The user's id.
@@ -304,39 +289,33 @@ public Response smokeTestWithResponse(int id, String foo, RequestOpt
      * Test for repeatable requests.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionValue: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionResult: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param id The user's id.
@@ -375,39 +354,33 @@ public Mono> repeatableActionWithResponseAsync(int id, Bina
      * Test for repeatable requests.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionValue: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     userActionResult: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param id The user's id.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationAsyncClient.java
index f6e7e61ed12..2e4b558a07f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationAsyncClient.java
@@ -41,14 +41,13 @@ public final class DurationAsyncClient {
     /**
      * Test duration with azure specific encoding.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationClient.java
index 5fc7765423d..1260fc08827 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/DurationClient.java
@@ -39,14 +39,13 @@ public final class DurationClient {
     /**
      * Test duration with azure specific encoding.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/implementation/DurationClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/implementation/DurationClientImpl.java
index 2f8546dcdd5..b095e92dabe 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/implementation/DurationClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/encode/duration/implementation/DurationClientImpl.java
@@ -147,14 +147,13 @@ Response durationConstantSync(@HostParam("endpoint") String endpoint,
     /**
      * Test duration with azure specific encoding.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -174,14 +173,13 @@ public Mono> durationConstantWithResponseAsync(BinaryData body, R
     /**
      * Test duration with azure specific encoding.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleAsyncClient.java
index 419b8f9be21..0a48157a183 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleAsyncClient.java
@@ -42,9 +42,8 @@ public final class AzureExampleAsyncClient {
     /**
      * The basicAction operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -59,13 +58,11 @@ public final class AzureExampleAsyncClient {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -80,8 +77,8 @@ public final class AzureExampleAsyncClient {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param headerParam The headerParam parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleClient.java
index 639253f07d7..abb8337b194 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/AzureExampleClient.java
@@ -40,9 +40,8 @@ public final class AzureExampleClient {
     /**
      * The basicAction operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -57,13 +56,11 @@ public final class AzureExampleClient {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -78,8 +75,8 @@ public final class AzureExampleClient {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param headerParam The headerParam parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/implementation/AzureExampleClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/implementation/AzureExampleClientImpl.java
index 3bdad0cdf26..844814be409 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/implementation/AzureExampleClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/example/basic/implementation/AzureExampleClientImpl.java
@@ -174,9 +174,8 @@ Response basicActionSync(@HostParam("endpoint") String endpoint,
     /**
      * The basicAction operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -191,13 +190,11 @@ Response basicActionSync(@HostParam("endpoint") String endpoint,
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -212,8 +209,8 @@ Response basicActionSync(@HostParam("endpoint") String endpoint,
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param headerParam The headerParam parameter.
@@ -238,9 +235,8 @@ public Mono> basicActionWithResponseAsync(String queryParam
     /**
      * The basicAction operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -255,13 +251,11 @@ public Mono> basicActionWithResponseAsync(String queryParam
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     stringProperty: String (Required)
      *     modelProperty (Optional): {
@@ -276,8 +270,8 @@ public Mono> basicActionWithResponseAsync(String queryParam
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param headerParam The headerParam parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableAsyncClient.java
index 83a35a33193..9437e26cf7f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableAsyncClient.java
@@ -44,20 +44,19 @@ public final class PageableAsyncClient {
      * List users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableClient.java
index 68c3882885e..1a5abb780ef 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/PageableClient.java
@@ -40,20 +40,19 @@ public final class PageableClient {
      * List users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/implementation/PageableClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/implementation/PageableClientImpl.java
index 80b3b831e7a..009c9de8cbe 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/implementation/PageableClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/payload/pageable/implementation/PageableClientImpl.java
@@ -174,20 +174,19 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      * List users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -208,20 +207,19 @@ private Mono> listSinglePageAsync(RequestOptions reque
      * List users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -263,20 +261,19 @@ public PagedFlux listAsync(RequestOptions requestOptions) {
      * List users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -297,20 +294,19 @@ private PagedResponse listSinglePage(RequestOptions requestOptions)
      * List users.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maximum number of result items per page.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -351,14 +347,13 @@ public PagedIterable list(RequestOptions requestOptions) {
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -380,14 +375,13 @@ private Mono> listNextSinglePageAsync(String nextLink,
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionAsyncClient.java
index b2e2513b894..6f7aa0520db 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionAsyncClient.java
@@ -44,24 +44,22 @@ public final class PreviewVersionAsyncClient {
     /**
      * Get widget by id (available in all versions).
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return widget by id (available in all versions) along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return widget by id (available in all versions) along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -72,26 +70,23 @@ public Mono> getWidgetWithResponse(String id, RequestOption
     /**
      * Update widget color (preview only).
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     color: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param colorUpdate The colorUpdate parameter.
@@ -112,16 +107,15 @@ public Mono> updateWidgetColorWithResponse(String id, Binar
      * List widgets with optional color filtering.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     widgets (Required): [
      *          (Required){
@@ -131,8 +125,8 @@ public Mono> updateWidgetColorWithResponse(String id, Binar
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionClient.java
index 1a9ab6a96f0..8c57662e01f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/PreviewVersionClient.java
@@ -42,16 +42,15 @@ public final class PreviewVersionClient {
     /**
      * Get widget by id (available in all versions).
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,26 +68,23 @@ public Response getWidgetWithResponse(String id, RequestOptions requ
     /**
      * Update widget color (preview only).
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     color: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param colorUpdate The colorUpdate parameter.
@@ -109,16 +105,15 @@ public Response updateWidgetColorWithResponse(String id, BinaryData
      * List widgets with optional color filtering.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     widgets (Required): [
      *          (Required){
@@ -128,8 +123,8 @@ public Response updateWidgetColorWithResponse(String id, BinaryData
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/implementation/PreviewVersionClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/implementation/PreviewVersionClientImpl.java
index 0091fe4ea1c..90fb97721c2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/implementation/PreviewVersionClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/versioning/previewversion/implementation/PreviewVersionClientImpl.java
@@ -211,24 +211,22 @@ Response listWidgetsSync(@HostParam("endpoint") String endpoint,
     /**
      * Get widget by id (available in all versions).
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return widget by id (available in all versions) along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return widget by id (available in all versions) along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWidgetWithResponseAsync(String id, RequestOptions requestOptions) {
@@ -240,16 +238,15 @@ public Mono> getWidgetWithResponseAsync(String id, RequestO
     /**
      * Get widget by id (available in all versions).
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -268,26 +265,23 @@ public Response getWidgetWithResponse(String id, RequestOptions requ
     /**
      * Update widget color (preview only).
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     color: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param colorUpdate The colorUpdate parameter.
@@ -309,26 +303,23 @@ public Mono> updateWidgetColorWithResponseAsync(String id,
     /**
      * Update widget color (preview only).
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     color: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param colorUpdate The colorUpdate parameter.
@@ -351,16 +342,15 @@ public Response updateWidgetColorWithResponse(String id, BinaryData
      * List widgets with optional color filtering.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     widgets (Required): [
      *          (Required){
@@ -370,8 +360,8 @@ public Response updateWidgetColorWithResponse(String id, BinaryData
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -391,16 +381,15 @@ public Mono> listWidgetsWithResponseAsync(RequestOptions re
      * List widgets with optional color filtering.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter
Query Parameters
NameTypeRequiredDescription
nameStringNoThe name parameter
colorStringNoThe color parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     widgets (Required): [
      *          (Required){
@@ -410,8 +399,8 @@ public Mono> listWidgetsWithResponseAsync(RequestOptions re
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstAsyncClient.java
index 6e716aaaf6f..02c4bd5b690 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstAsyncClient.java
@@ -41,14 +41,13 @@ public final class ClientNamespaceFirstAsyncClient {
     /**
      * The getFirst operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstClient.java
index bc3370372d0..9a6709a5474 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/ClientNamespaceFirstClient.java
@@ -39,14 +39,13 @@ public final class ClientNamespaceFirstClient {
     /**
      * The getFirst operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceFirstClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceFirstClientImpl.java
index 176ea456391..09fd7a125d6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceFirstClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceFirstClientImpl.java
@@ -147,14 +147,13 @@ Response getFirstSync(@HostParam("endpoint") String endpoint, @Heade
     /**
      * The getFirst operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -172,14 +171,13 @@ public Mono> getFirstWithResponseAsync(RequestOptions reque
     /**
      * The getFirst operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceSecondClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceSecondClientImpl.java
index 043c1567d37..76e7703cb7b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceSecondClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/implementation/ClientNamespaceSecondClientImpl.java
@@ -147,14 +147,13 @@ Response getSecondSync(@HostParam("endpoint") String endpoint, @Head
     /**
      * The getSecond operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String(second) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -172,14 +171,13 @@ public Mono> getSecondWithResponseAsync(RequestOptions requ
     /**
      * The getSecond operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String(second) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondAsyncClient.java
index 8416dc8451e..0cd1e84d838 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondAsyncClient.java
@@ -41,14 +41,13 @@ public final class ClientNamespaceSecondAsyncClient {
     /**
      * The getSecond operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String(second) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondClient.java
index afa387956fc..f70e9542f33 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/clientnamespace/second/ClientNamespaceSecondClient.java
@@ -39,14 +39,13 @@ public final class ClientNamespaceSecondClient {
     /**
      * The getSecond operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     type: String(second) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelAsyncClient.java
index 60a41d100a2..0dfc91a5c3e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelAsyncClient.java
@@ -42,14 +42,13 @@ public final class ModelAsyncClient {
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -68,14 +67,13 @@ public Mono> clientWithResponse(BinaryData body, RequestOptions r
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelClient.java
index 3f4b9cf9b76..f4bfb4ff974 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/ModelClient.java
@@ -40,14 +40,13 @@ public final class ModelClient {
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -66,14 +65,13 @@ public Response clientWithResponse(BinaryData body, RequestOptions request
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java
index 07816f53712..7eaf2d69244 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyAsyncClient.java
@@ -43,14 +43,13 @@ public final class PropertyAsyncClient {
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,14 +68,13 @@ public Mono> clientWithResponse(BinaryData body, RequestOptions r
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -95,14 +93,13 @@ public Mono> languageWithResponse(BinaryData body, RequestOptions
     /**
      * The compatibleWithEncodedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java
index bbd4d0fc8d3..b9b7825b9f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/PropertyClient.java
@@ -41,14 +41,13 @@ public final class PropertyClient {
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,14 +66,13 @@ public Response clientWithResponse(BinaryData body, RequestOptions request
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -93,14 +91,13 @@ public Response languageWithResponse(BinaryData body, RequestOptions reque
     /**
      * The compatibleWithEncodedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumAsyncClient.java
index 2358fd7b6cc..40f4334be85 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumAsyncClient.java
@@ -42,12 +42,11 @@ public final class UnionEnumAsyncClient {
     /**
      * The unionEnumName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -66,12 +65,11 @@ public Mono> unionEnumNameWithResponse(BinaryData body, RequestOp
     /**
      * The unionEnumMemberName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1/value2)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumClient.java
index 03e85a8cf15..03bf1f85d07 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/UnionEnumClient.java
@@ -40,12 +40,11 @@ public final class UnionEnumClient {
     /**
      * The unionEnumName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -64,12 +63,11 @@ public Response unionEnumNameWithResponse(BinaryData body, RequestOptions
     /**
      * The unionEnumMemberName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1/value2)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsAsyncClient.java
index ccb9355039f..e7b28cf7332 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsAsyncClient.java
@@ -41,26 +41,23 @@ public final class FirstOperationsAsyncClient {
     /**
      * Operation using first namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsClient.java
index a698dc1ed77..2c85543b1f0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/FirstOperationsClient.java
@@ -39,26 +39,23 @@ public final class FirstOperationsClient {
     /**
      * Operation using first namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsAsyncClient.java
index 6fc39a90bf3..720bc294e4d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsAsyncClient.java
@@ -41,26 +41,23 @@ public final class SecondOperationsAsyncClient {
     /**
      * Operation using second namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsClient.java
index 0b716104ab0..db56f6cca9b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/SecondOperationsClient.java
@@ -39,26 +39,23 @@ public final class SecondOperationsClient {
     /**
      * Operation using second namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/FirstOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/FirstOperationsImpl.java
index cfe052925ce..63827711c2c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/FirstOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/FirstOperationsImpl.java
@@ -82,26 +82,23 @@ Response firstSync(@HostParam("endpoint") String endpoint,
     /**
      * Operation using first namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -122,26 +119,23 @@ public Mono> firstWithResponseAsync(BinaryData body, Reques
     /**
      * Operation using first namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(active/inactive) (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/SecondOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/SecondOperationsImpl.java
index a476c4346db..4141a7cf439 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/SecondOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/enumconflict/implementation/SecondOperationsImpl.java
@@ -82,26 +82,23 @@ Response secondSync(@HostParam("endpoint") String endpoint,
     /**
      * Operation using second namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -122,26 +119,23 @@ public Mono> secondWithResponseAsync(BinaryData body, Reque
     /**
      * Operation using second namespace Status enum.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(running/stopped) (Required)
      *     description: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/ModelClientsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/ModelClientsImpl.java
index 1cb2f4e947f..2614f969ae3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/ModelClientsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/ModelClientsImpl.java
@@ -102,14 +102,13 @@ Response languageSync(@HostParam("endpoint") String endpoint,
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -129,14 +128,13 @@ public Mono> clientWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -155,14 +153,13 @@ public Response clientWithResponse(BinaryData body, RequestOptions request
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -182,14 +179,13 @@ public Mono> languageWithResponseAsync(BinaryData body, RequestOp
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java
index dae6af0ed5a..7080a3befcb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/PropertiesImpl.java
@@ -122,14 +122,13 @@ Response compatibleWithEncodedNameSync(@HostParam("endpoint") String endpo
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,14 +148,13 @@ public Mono> clientWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The client operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -175,14 +173,13 @@ public Response clientWithResponse(BinaryData body, RequestOptions request
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -202,14 +199,13 @@ public Mono> languageWithResponseAsync(BinaryData body, RequestOp
     /**
      * The language operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     defaultName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -228,14 +224,13 @@ public Response languageWithResponse(BinaryData body, RequestOptions reque
     /**
      * The compatibleWithEncodedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -256,14 +251,13 @@ public Mono> compatibleWithEncodedNameWithResponseAsync(BinaryDat
     /**
      * The compatibleWithEncodedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/UnionEnumsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/UnionEnumsImpl.java
index ff1a14540e2..83354cc81fb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/UnionEnumsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/UnionEnumsImpl.java
@@ -102,12 +102,11 @@ Response unionEnumMemberNameSync(@HostParam("endpoint") String endpoint,
     /**
      * The unionEnumName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -127,12 +126,11 @@ public Mono> unionEnumNameWithResponseAsync(BinaryData body, Requ
     /**
      * The unionEnumName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -151,12 +149,11 @@ public Response unionEnumNameWithResponse(BinaryData body, RequestOptions
     /**
      * The unionEnumMemberName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1/value2)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -176,12 +173,11 @@ public Mono> unionEnumMemberNameWithResponseAsync(BinaryData body
     /**
      * The unionEnumMemberName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(value1/value2)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadAsyncClient.java
index 6a924ff84c7..87e7eb2b918 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadAsyncClient.java
@@ -43,9 +43,8 @@ public final class OverloadAsyncClient {
     /**
      * The list operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -53,8 +52,8 @@ public final class OverloadAsyncClient {
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,9 +71,8 @@ public Mono> listWithResponse(RequestOptions requestOptions
     /**
      * The listByScope operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -82,8 +80,8 @@ public Mono> listWithResponse(RequestOptions requestOptions
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param scope The scope parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadClient.java
index 58592ca3f24..6810477f15d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/OverloadClient.java
@@ -41,9 +41,8 @@ public final class OverloadClient {
     /**
      * The list operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -51,8 +50,8 @@ public final class OverloadClient {
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Response listWithResponse(RequestOptions requestOptions) {
     /**
      * The listByScope operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -80,8 +78,8 @@ public Response listWithResponse(RequestOptions requestOptions) {
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param scope The scope parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/implementation/OverloadClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/implementation/OverloadClientImpl.java
index b3a3f7b1058..2d3adb76dc4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/implementation/OverloadClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/overload/implementation/OverloadClientImpl.java
@@ -163,9 +163,8 @@ Response listByScopeSync(@HostParam("endpoint") String endpoint, @Pa
     /**
      * The list operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -173,8 +172,8 @@ Response listByScopeSync(@HostParam("endpoint") String endpoint, @Pa
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -192,9 +191,8 @@ public Mono> listWithResponseAsync(RequestOptions requestOp
     /**
      * The list operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -202,8 +200,8 @@ public Mono> listWithResponseAsync(RequestOptions requestOp
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -221,9 +219,8 @@ public Response listWithResponse(RequestOptions requestOptions) {
     /**
      * The listByScope operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -231,8 +228,8 @@ public Response listWithResponse(RequestOptions requestOptions) {
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param scope The scope parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -252,9 +249,8 @@ public Mono> listByScopeWithResponseAsync(String scope, Req
     /**
      * The listByScope operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -262,8 +258,8 @@ public Mono> listByScopeWithResponseAsync(String scope, Req
      *         scope: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param scope The scope parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsAsyncClient.java
index 9be33080835..8a9543f235b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsAsyncClient.java
@@ -70,16 +70,15 @@ public Mono> bulletPointsOpWithResponse(RequestOptions requestOpt
     /**
      * The bulletPointsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input (Required): {
      *         prop: String(Simple/Bold/Italic) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bulletPointsModelRequest The bulletPointsModelRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsClient.java
index 8d609982a08..cd452bd7e21 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/ListsClient.java
@@ -68,16 +68,15 @@ public Response bulletPointsOpWithResponse(RequestOptions requestOptions)
     /**
      * The bulletPointsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input (Required): {
      *         prop: String(Simple/Bold/Italic) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bulletPointsModelRequest The bulletPointsModelRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/implementation/ListsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/implementation/ListsImpl.java
index 1eb3c9c52bd..f2670f2ef37 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/implementation/ListsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/documentation/implementation/ListsImpl.java
@@ -175,16 +175,15 @@ public Response bulletPointsOpWithResponse(RequestOptions requestOptions)
     /**
      * The bulletPointsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input (Required): {
      *         prop: String(Simple/Bold/Italic) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bulletPointsModelRequest The bulletPointsModelRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -205,16 +204,15 @@ public Mono> bulletPointsModelWithResponseAsync(BinaryData bullet
     /**
      * The bulletPointsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     input (Required): {
      *         prop: String(Simple/Bold/Italic) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bulletPointsModelRequest The bulletPointsModelRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java
index 7667b905ee5..abe184cebac 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayAsyncClient.java
@@ -52,28 +52,25 @@ public final class ArrayAsyncClient {
     /**
      * The commaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -92,28 +89,25 @@ public Mono> commaDelimitedWithResponse(BinaryData body, Re
     /**
      * The spaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -132,28 +126,25 @@ public Mono> spaceDelimitedWithResponse(BinaryData body, Re
     /**
      * The pipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -172,28 +163,25 @@ public Mono> pipeDelimitedWithResponse(BinaryData body, Req
     /**
      * The newlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -212,28 +200,25 @@ public Mono> newlineDelimitedWithResponse(BinaryData body,
     /**
      * The enumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -252,28 +237,25 @@ public Mono> enumCommaDelimitedWithResponse(BinaryData body
     /**
      * The enumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -292,28 +274,25 @@ public Mono> enumSpaceDelimitedWithResponse(BinaryData body
     /**
      * The enumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -332,28 +311,25 @@ public Mono> enumPipeDelimitedWithResponse(BinaryData body,
     /**
      * The enumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -372,28 +348,25 @@ public Mono> enumNewlineDelimitedWithResponse(BinaryData bo
     /**
      * The extensibleEnumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -413,28 +386,25 @@ public Mono> extensibleEnumCommaDelimitedWithResponse(Binar
     /**
      * The extensibleEnumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -454,28 +424,25 @@ public Mono> extensibleEnumSpaceDelimitedWithResponse(Binar
     /**
      * The extensibleEnumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -495,28 +462,25 @@ public Mono> extensibleEnumPipeDelimitedWithResponse(Binary
     /**
      * The extensibleEnumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java
index 6b45a6a9fc2..0c044eb0287 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/ArrayClient.java
@@ -50,28 +50,25 @@ public final class ArrayClient {
     /**
      * The commaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -90,28 +87,25 @@ public Response commaDelimitedWithResponse(BinaryData body, RequestO
     /**
      * The spaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -130,28 +124,25 @@ public Response spaceDelimitedWithResponse(BinaryData body, RequestO
     /**
      * The pipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -170,28 +161,25 @@ public Response pipeDelimitedWithResponse(BinaryData body, RequestOp
     /**
      * The newlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -210,28 +198,25 @@ public Response newlineDelimitedWithResponse(BinaryData body, Reques
     /**
      * The enumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -250,28 +235,25 @@ public Response enumCommaDelimitedWithResponse(BinaryData body, Requ
     /**
      * The enumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -290,28 +272,25 @@ public Response enumSpaceDelimitedWithResponse(BinaryData body, Requ
     /**
      * The enumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,28 +309,25 @@ public Response enumPipeDelimitedWithResponse(BinaryData body, Reque
     /**
      * The enumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -370,28 +346,25 @@ public Response enumNewlineDelimitedWithResponse(BinaryData body, Re
     /**
      * The extensibleEnumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -411,28 +384,25 @@ public Response extensibleEnumCommaDelimitedWithResponse(BinaryData
     /**
      * The extensibleEnumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -452,28 +422,25 @@ public Response extensibleEnumSpaceDelimitedWithResponse(BinaryData
     /**
      * The extensibleEnumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -493,28 +460,25 @@ public Response extensibleEnumPipeDelimitedWithResponse(BinaryData b
     /**
      * The extensibleEnumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java
index fc32d96316e..8cbd34dca7c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/array/implementation/PropertiesImpl.java
@@ -302,28 +302,25 @@ Response extensibleEnumNewlineDelimitedSync(@HostParam("endpoint") S
     /**
      * The commaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -344,28 +341,25 @@ public Mono> commaDelimitedWithResponseAsync(BinaryData bod
     /**
      * The commaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -386,28 +380,25 @@ public Response commaDelimitedWithResponse(BinaryData body, RequestO
     /**
      * The spaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -428,28 +419,25 @@ public Mono> spaceDelimitedWithResponseAsync(BinaryData bod
     /**
      * The spaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -470,28 +458,25 @@ public Response spaceDelimitedWithResponse(BinaryData body, RequestO
     /**
      * The pipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -512,28 +497,25 @@ public Mono> pipeDelimitedWithResponseAsync(BinaryData body
     /**
      * The pipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -554,28 +536,25 @@ public Response pipeDelimitedWithResponse(BinaryData body, RequestOp
     /**
      * The newlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -597,28 +576,25 @@ public Mono> newlineDelimitedWithResponseAsync(BinaryData b
     /**
      * The newlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -639,28 +615,25 @@ public Response newlineDelimitedWithResponse(BinaryData body, Reques
     /**
      * The enumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -682,28 +655,25 @@ public Mono> enumCommaDelimitedWithResponseAsync(BinaryData
     /**
      * The enumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -724,28 +694,25 @@ public Response enumCommaDelimitedWithResponse(BinaryData body, Requ
     /**
      * The enumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -767,28 +734,25 @@ public Mono> enumSpaceDelimitedWithResponseAsync(BinaryData
     /**
      * The enumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -809,28 +773,25 @@ public Response enumSpaceDelimitedWithResponse(BinaryData body, Requ
     /**
      * The enumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -852,28 +813,25 @@ public Mono> enumPipeDelimitedWithResponseAsync(BinaryData
     /**
      * The enumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -894,28 +852,25 @@ public Response enumPipeDelimitedWithResponse(BinaryData body, Reque
     /**
      * The enumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -937,28 +892,25 @@ public Mono> enumNewlineDelimitedWithResponseAsync(BinaryDa
     /**
      * The enumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -979,28 +931,25 @@ public Response enumNewlineDelimitedWithResponse(BinaryData body, Re
     /**
      * The extensibleEnumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1022,28 +971,25 @@ public Mono> extensibleEnumCommaDelimitedWithResponseAsync(
     /**
      * The extensibleEnumCommaDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1065,28 +1011,25 @@ public Response extensibleEnumCommaDelimitedWithResponse(BinaryData
     /**
      * The extensibleEnumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1108,28 +1051,25 @@ public Mono> extensibleEnumSpaceDelimitedWithResponseAsync(
     /**
      * The extensibleEnumSpaceDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1151,28 +1091,25 @@ public Response extensibleEnumSpaceDelimitedWithResponse(BinaryData
     /**
      * The extensibleEnumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1194,28 +1131,25 @@ public Mono> extensibleEnumPipeDelimitedWithResponseAsync(B
     /**
      * The extensibleEnumPipeDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1237,28 +1171,25 @@ public Response extensibleEnumPipeDelimitedWithResponse(BinaryData b
     /**
      * The extensibleEnumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1280,28 +1211,25 @@ public Mono> extensibleEnumNewlineDelimitedWithResponseAsyn
     /**
      * The extensibleEnumNewlineDelimited operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         String(blue/red/green) (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanAsyncClient.java
index 30ba1960214..44993409d68 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanAsyncClient.java
@@ -41,24 +41,21 @@ public final class BooleanAsyncClient {
     /**
      * The trueLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -77,24 +74,21 @@ public Mono> trueLowerWithResponse(BinaryData value, Reques
     /**
      * The falseLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -113,24 +107,21 @@ public Mono> falseLowerWithResponse(BinaryData value, Reque
     /**
      * The trueUpper operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,24 +140,21 @@ public Mono> trueUpperWithResponse(BinaryData value, Reques
     /**
      * The falseMixed operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanClient.java
index 772ce69914b..508a3c9f6fc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/BooleanClient.java
@@ -39,24 +39,21 @@ public final class BooleanClient {
     /**
      * The trueLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -75,24 +72,21 @@ public Response trueLowerWithResponse(BinaryData value, RequestOptio
     /**
      * The falseLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,24 +105,21 @@ public Response falseLowerWithResponse(BinaryData value, RequestOpti
     /**
      * The trueUpper operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -147,24 +138,21 @@ public Response trueUpperWithResponse(BinaryData value, RequestOptio
     /**
      * The falseMixed operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java
index 71968c5b18b..fc475a704c4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java
@@ -142,24 +142,21 @@ Response falseMixedSync(@HostParam("endpoint") String endpoint,
     /**
      * The trueLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -180,24 +177,21 @@ public Mono> trueLowerWithResponseAsync(BinaryData value, R
     /**
      * The trueLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -218,24 +212,21 @@ public Response trueLowerWithResponse(BinaryData value, RequestOptio
     /**
      * The falseLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -256,24 +247,21 @@ public Mono> falseLowerWithResponseAsync(BinaryData value,
     /**
      * The falseLower operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -294,24 +282,21 @@ public Response falseLowerWithResponse(BinaryData value, RequestOpti
     /**
      * The trueUpper operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -332,24 +317,21 @@ public Mono> trueUpperWithResponseAsync(BinaryData value, R
     /**
      * The trueUpper operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -370,24 +352,21 @@ public Response trueUpperWithResponse(BinaryData value, RequestOptio
     /**
      * The falseMixed operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -408,24 +387,21 @@ public Mono> falseMixedWithResponseAsync(BinaryData value,
     /**
      * The falseMixed operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyAsyncClient.java
index 272680978f0..3819f711317 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyAsyncClient.java
@@ -44,24 +44,21 @@ public final class PropertyAsyncClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -80,24 +77,21 @@ public Mono> defaultMethodWithResponse(BinaryData body, Req
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -116,24 +110,21 @@ public Mono> base64WithResponse(BinaryData body, RequestOpt
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -152,28 +143,25 @@ public Mono> base64urlWithResponse(BinaryData body, Request
     /**
      * The base64urlArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyClient.java
index 4176a3a50c0..e5147036ce8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/PropertyClient.java
@@ -42,24 +42,21 @@ public final class PropertyClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -78,24 +75,21 @@ public Response defaultMethodWithResponse(BinaryData body, RequestOp
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -114,24 +108,21 @@ public Response base64WithResponse(BinaryData body, RequestOptions r
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -150,28 +141,25 @@ public Response base64urlWithResponse(BinaryData body, RequestOption
     /**
      * The base64urlArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyAsyncClient.java
index 1647799a2ae..a8b04c414e3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyAsyncClient.java
@@ -41,12 +41,11 @@ public final class RequestBodyAsyncClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -65,12 +64,11 @@ public Mono> defaultMethodWithResponse(BinaryData value, RequestO
     /**
      * The octetStream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -89,12 +87,11 @@ public Mono> octetStreamWithResponse(BinaryData value, RequestOpt
     /**
      * The customContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -113,12 +110,11 @@ public Mono> customContentTypeWithResponse(BinaryData value, Requ
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -137,12 +133,11 @@ public Mono> base64WithResponse(BinaryData value, RequestOptions
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyClient.java
index 799260ac22c..dc019a5b182 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/RequestBodyClient.java
@@ -39,12 +39,11 @@ public final class RequestBodyClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -63,12 +62,11 @@ public Response defaultMethodWithResponse(BinaryData value, RequestOptions
     /**
      * The octetStream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -87,12 +85,11 @@ public Response octetStreamWithResponse(BinaryData value, RequestOptions r
     /**
      * The customContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,12 +108,11 @@ public Response customContentTypeWithResponse(BinaryData value, RequestOpt
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -135,12 +131,11 @@ public Response base64WithResponse(BinaryData value, RequestOptions reques
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyAsyncClient.java
index 74791b9b6aa..ddd02f55d23 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyAsyncClient.java
@@ -41,12 +41,11 @@ public final class ResponseBodyAsyncClient {
     /**
      * The defaultMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,12 +63,11 @@ public Mono> defaultMethodWithResponse(RequestOptions reque
     /**
      * The octetStream operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -87,12 +85,11 @@ public Mono> octetStreamWithResponse(RequestOptions request
     /**
      * The customContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -110,12 +107,11 @@ public Mono> customContentTypeWithResponse(RequestOptions r
     /**
      * The base64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -133,12 +129,11 @@ public Mono> base64WithResponse(RequestOptions requestOptio
     /**
      * The base64url operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyClient.java
index b0b14afe310..8e82c801cfb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/ResponseBodyClient.java
@@ -39,12 +39,11 @@ public final class ResponseBodyClient {
     /**
      * The defaultMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,12 +61,11 @@ public Response defaultMethodWithResponse(RequestOptions requestOpti
     /**
      * The octetStream operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -85,12 +83,11 @@ public Response octetStreamWithResponse(RequestOptions requestOption
     /**
      * The customContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -108,12 +105,11 @@ public Response customContentTypeWithResponse(RequestOptions request
     /**
      * The base64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -131,12 +127,11 @@ public Response base64WithResponse(RequestOptions requestOptions) {
     /**
      * The base64url operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java
index 45542ab254a..41d16c3c501 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java
@@ -142,24 +142,21 @@ Response base64urlArraySync(@HostParam("endpoint") String endpoint,
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -180,24 +177,21 @@ public Mono> defaultMethodWithResponseAsync(BinaryData body
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -218,24 +212,21 @@ public Response defaultMethodWithResponse(BinaryData body, RequestOp
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -256,24 +247,21 @@ public Mono> base64WithResponseAsync(BinaryData body, Reque
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -293,24 +281,21 @@ public Response base64WithResponse(BinaryData body, RequestOptions r
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -331,24 +316,21 @@ public Mono> base64urlWithResponseAsync(BinaryData body, Re
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -369,28 +351,25 @@ public Response base64urlWithResponse(BinaryData body, RequestOption
     /**
      * The base64urlArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -411,28 +390,25 @@ public Mono> base64urlArrayWithResponseAsync(BinaryData bod
     /**
      * The base64urlArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         Base64Url (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java
index 8451775b3fd..8aef3b75058 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java
@@ -162,12 +162,11 @@ Response base64urlSync(@HostParam("endpoint") String endpoint,
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -187,12 +186,11 @@ public Mono> defaultMethodWithResponseAsync(BinaryData value, Req
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -211,12 +209,11 @@ public Response defaultMethodWithResponse(BinaryData value, RequestOptions
     /**
      * The octetStream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -236,12 +233,11 @@ public Mono> octetStreamWithResponseAsync(BinaryData value, Reque
     /**
      * The octetStream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -260,12 +256,11 @@ public Response octetStreamWithResponse(BinaryData value, RequestOptions r
     /**
      * The customContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -285,12 +280,11 @@ public Mono> customContentTypeWithResponseAsync(BinaryData value,
     /**
      * The customContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -310,12 +304,11 @@ public Response customContentTypeWithResponse(BinaryData value, RequestOpt
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -335,12 +328,11 @@ public Mono> base64WithResponseAsync(BinaryData value, RequestOpt
     /**
      * The base64 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -359,12 +351,11 @@ public Response base64WithResponse(BinaryData value, RequestOptions reques
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -384,12 +375,11 @@ public Mono> base64urlWithResponseAsync(BinaryData value, Request
     /**
      * The base64url operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java
index 7b68e91b2b7..b480d8a8588 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java
@@ -151,12 +151,11 @@ Response base64urlSync(@HostParam("endpoint") String endpoint, @Head
     /**
      * The defaultMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -175,12 +174,11 @@ public Mono> defaultMethodWithResponseAsync(RequestOptions
     /**
      * The defaultMethod operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -198,12 +196,11 @@ public Response defaultMethodWithResponse(RequestOptions requestOpti
     /**
      * The octetStream operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -222,12 +219,11 @@ public Mono> octetStreamWithResponseAsync(RequestOptions re
     /**
      * The octetStream operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -245,12 +241,11 @@ public Response octetStreamWithResponse(RequestOptions requestOption
     /**
      * The customContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -269,12 +264,11 @@ public Mono> customContentTypeWithResponseAsync(RequestOpti
     /**
      * The customContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -292,12 +286,11 @@ public Response customContentTypeWithResponse(RequestOptions request
     /**
      * The base64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -316,12 +309,11 @@ public Mono> base64WithResponseAsync(RequestOptions request
     /**
      * The base64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -339,12 +331,11 @@ public Response base64WithResponse(RequestOptions requestOptions) {
     /**
      * The base64url operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -363,12 +354,11 @@ public Mono> base64urlWithResponseAsync(RequestOptions requ
     /**
      * The base64url operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * Base64Url
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyAsyncClient.java
index 3e79966a22e..16aa31d1d44 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyAsyncClient.java
@@ -45,24 +45,21 @@ public final class PropertyAsyncClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -81,24 +78,21 @@ public Mono> defaultMethodWithResponse(BinaryData body, Req
     /**
      * The rfc3339 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -117,24 +111,21 @@ public Mono> rfc3339WithResponse(BinaryData body, RequestOp
     /**
      * The rfc7231 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -153,24 +144,21 @@ public Mono> rfc7231WithResponse(BinaryData body, RequestOp
     /**
      * The unixTimestamp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -189,28 +177,25 @@ public Mono> unixTimestampWithResponse(BinaryData body, Req
     /**
      * The unixTimestampArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyClient.java
index 5ee85172f0a..ee3b443ab23 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/PropertyClient.java
@@ -43,24 +43,21 @@ public final class PropertyClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -79,24 +76,21 @@ public Response defaultMethodWithResponse(BinaryData body, RequestOp
     /**
      * The rfc3339 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,24 +109,21 @@ public Response rfc3339WithResponse(BinaryData body, RequestOptions
     /**
      * The rfc7231 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -151,24 +142,21 @@ public Response rfc7231WithResponse(BinaryData body, RequestOptions
     /**
      * The unixTimestamp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -187,28 +175,25 @@ public Response unixTimestampWithResponse(BinaryData body, RequestOp
     /**
      * The unixTimestampArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java
index 63537cbe29d..dff6e6b74ee 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java
@@ -162,24 +162,21 @@ Response unixTimestampArraySync(@HostParam("endpoint") String endpoi
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -200,24 +197,21 @@ public Mono> defaultMethodWithResponseAsync(BinaryData body
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -238,24 +232,21 @@ public Response defaultMethodWithResponse(BinaryData body, RequestOp
     /**
      * The rfc3339 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -276,24 +267,21 @@ public Mono> rfc3339WithResponseAsync(BinaryData body, Requ
     /**
      * The rfc3339 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -313,24 +301,21 @@ public Response rfc3339WithResponse(BinaryData body, RequestOptions
     /**
      * The rfc7231 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -351,24 +336,21 @@ public Mono> rfc7231WithResponseAsync(BinaryData body, Requ
     /**
      * The rfc7231 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -388,24 +370,21 @@ public Response rfc7231WithResponse(BinaryData body, RequestOptions
     /**
      * The unixTimestamp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -426,24 +405,21 @@ public Mono> unixTimestampWithResponseAsync(BinaryData body
     /**
      * The unixTimestamp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -464,28 +440,25 @@ public Response unixTimestampWithResponse(BinaryData body, RequestOp
     /**
      * The unixTimestampArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -507,28 +480,25 @@ public Mono> unixTimestampArrayWithResponseAsync(BinaryData
     /**
      * The unixTimestampArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         long (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java
index 17f4a7180e4..fbd39af497a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyAsyncClient.java
@@ -54,24 +54,21 @@ public final class PropertyAsyncClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -90,24 +87,21 @@ public Mono> defaultMethodWithResponse(BinaryData body, Req
     /**
      * The iso8601 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -126,24 +120,21 @@ public Mono> iso8601WithResponse(BinaryData body, RequestOp
     /**
      * The int32Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -162,24 +153,21 @@ public Mono> int32SecondsWithResponse(BinaryData body, Requ
     /**
      * The floatSeconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -198,24 +186,21 @@ public Mono> floatSecondsWithResponse(BinaryData body, Requ
     /**
      * The float64Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -234,24 +219,21 @@ public Mono> float64SecondsWithResponse(BinaryData body, Re
     /**
      * The int32Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,24 +252,21 @@ public Mono> int32MillisecondsWithResponse(BinaryData body,
     /**
      * The floatMilliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -306,24 +285,21 @@ public Mono> floatMillisecondsWithResponse(BinaryData body,
     /**
      * The float64Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -342,28 +318,25 @@ public Mono> float64MillisecondsWithResponse(BinaryData bod
     /**
      * The floatSecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -382,28 +355,25 @@ public Mono> floatSecondsArrayWithResponse(BinaryData body,
     /**
      * The floatMillisecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -423,24 +393,21 @@ public Mono> floatMillisecondsArrayWithResponse(BinaryData
     /**
      * The int32SecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -460,24 +427,21 @@ public Mono> int32SecondsLargerUnitWithResponse(BinaryData
     /**
      * The floatSecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -497,24 +461,21 @@ public Mono> floatSecondsLargerUnitWithResponse(BinaryData
     /**
      * The int32MillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -534,24 +495,21 @@ public Mono> int32MillisecondsLargerUnitWithResponse(Binary
     /**
      * The floatMillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java
index 39eadae5454..3c5e6165b75 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/PropertyClient.java
@@ -52,24 +52,21 @@ public final class PropertyClient {
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -88,24 +85,21 @@ public Response defaultMethodWithResponse(BinaryData body, RequestOp
     /**
      * The iso8601 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -124,24 +118,21 @@ public Response iso8601WithResponse(BinaryData body, RequestOptions
     /**
      * The int32Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -160,24 +151,21 @@ public Response int32SecondsWithResponse(BinaryData body, RequestOpt
     /**
      * The floatSeconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -196,24 +184,21 @@ public Response floatSecondsWithResponse(BinaryData body, RequestOpt
     /**
      * The float64Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -232,24 +217,21 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO
     /**
      * The int32Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -268,24 +250,21 @@ public Response int32MillisecondsWithResponse(BinaryData body, Reque
     /**
      * The floatMilliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -304,24 +283,21 @@ public Response floatMillisecondsWithResponse(BinaryData body, Reque
     /**
      * The float64Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -340,28 +316,25 @@ public Response float64MillisecondsWithResponse(BinaryData body, Req
     /**
      * The floatSecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -380,28 +353,25 @@ public Response floatSecondsArrayWithResponse(BinaryData body, Reque
     /**
      * The floatMillisecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -420,24 +390,21 @@ public Response floatMillisecondsArrayWithResponse(BinaryData body,
     /**
      * The int32SecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -456,24 +423,21 @@ public Response int32SecondsLargerUnitWithResponse(BinaryData body,
     /**
      * The floatSecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -492,24 +456,21 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body,
     /**
      * The int32MillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -529,24 +490,21 @@ public Response int32MillisecondsLargerUnitWithResponse(BinaryData b
     /**
      * The floatMillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java
index 0733e08920c..88c47cd8cfd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/duration/implementation/PropertiesImpl.java
@@ -342,24 +342,21 @@ Response floatMillisecondsLargerUnitSync(@HostParam("endpoint") Stri
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -380,24 +377,21 @@ public Mono> defaultMethodWithResponseAsync(BinaryData body
     /**
      * The defaultMethod operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -418,24 +412,21 @@ public Response defaultMethodWithResponse(BinaryData body, RequestOp
     /**
      * The iso8601 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -456,24 +447,21 @@ public Mono> iso8601WithResponseAsync(BinaryData body, Requ
     /**
      * The iso8601 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -493,24 +481,21 @@ public Response iso8601WithResponse(BinaryData body, RequestOptions
     /**
      * The int32Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -531,24 +516,21 @@ public Mono> int32SecondsWithResponseAsync(BinaryData body,
     /**
      * The int32Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -569,24 +551,21 @@ public Response int32SecondsWithResponse(BinaryData body, RequestOpt
     /**
      * The floatSeconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -607,24 +586,21 @@ public Mono> floatSecondsWithResponseAsync(BinaryData body,
     /**
      * The floatSeconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -645,24 +621,21 @@ public Response floatSecondsWithResponse(BinaryData body, RequestOpt
     /**
      * The float64Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -683,24 +656,21 @@ public Mono> float64SecondsWithResponseAsync(BinaryData bod
     /**
      * The float64Seconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -721,24 +691,21 @@ public Response float64SecondsWithResponse(BinaryData body, RequestO
     /**
      * The int32Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -760,24 +727,21 @@ public Mono> int32MillisecondsWithResponseAsync(BinaryData
     /**
      * The int32Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -798,24 +762,21 @@ public Response int32MillisecondsWithResponse(BinaryData body, Reque
     /**
      * The floatMilliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -837,24 +798,21 @@ public Mono> floatMillisecondsWithResponseAsync(BinaryData
     /**
      * The floatMilliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -875,24 +833,21 @@ public Response floatMillisecondsWithResponse(BinaryData body, Reque
     /**
      * The float64Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -914,24 +869,21 @@ public Mono> float64MillisecondsWithResponseAsync(BinaryDat
     /**
      * The float64Milliseconds operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -952,28 +904,25 @@ public Response float64MillisecondsWithResponse(BinaryData body, Req
     /**
      * The floatSecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -995,28 +944,25 @@ public Mono> floatSecondsArrayWithResponseAsync(BinaryData
     /**
      * The floatSecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1037,28 +983,25 @@ public Response floatSecondsArrayWithResponse(BinaryData body, Reque
     /**
      * The floatMillisecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1080,28 +1023,25 @@ public Mono> floatMillisecondsArrayWithResponseAsync(Binary
     /**
      * The floatMillisecondsArray operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value (Required): [
      *         double (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1122,24 +1062,21 @@ public Response floatMillisecondsArrayWithResponse(BinaryData body,
     /**
      * The int32SecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1161,24 +1098,21 @@ public Mono> int32SecondsLargerUnitWithResponseAsync(Binary
     /**
      * The int32SecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1199,24 +1133,21 @@ public Response int32SecondsLargerUnitWithResponse(BinaryData body,
     /**
      * The floatSecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1238,24 +1169,21 @@ public Mono> floatSecondsLargerUnitWithResponseAsync(Binary
     /**
      * The floatSecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1276,24 +1204,21 @@ public Response floatSecondsLargerUnitWithResponse(BinaryData body,
     /**
      * The int32MillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1315,24 +1240,21 @@ public Mono> int32MillisecondsLargerUnitWithResponseAsync(B
     /**
      * The int32MillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1354,24 +1276,21 @@ public Response int32MillisecondsLargerUnitWithResponse(BinaryData b
     /**
      * The floatMillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1393,24 +1312,21 @@ public Mono> floatMillisecondsLargerUnitWithResponseAsync(B
     /**
      * The floatMillisecondsLargerUnit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericAsyncClient.java
index 58806522fc6..d5405e0e82b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericAsyncClient.java
@@ -43,24 +43,21 @@ public final class NumericAsyncClient {
     /**
      * The safeintAsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -79,24 +76,21 @@ public Mono> safeintAsStringWithResponse(BinaryData value,
     /**
      * The uint32AsStringOptional operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -116,24 +110,21 @@ public Mono> uint32AsStringOptionalWithResponse(BinaryData
     /**
      * The uint8AsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericClient.java
index d638911302b..da2ab31c8d5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/NumericClient.java
@@ -41,24 +41,21 @@ public final class NumericClient {
     /**
      * The safeintAsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -77,24 +74,21 @@ public Response safeintAsStringWithResponse(BinaryData value, Reques
     /**
      * The uint32AsStringOptional operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -113,24 +107,21 @@ public Response uint32AsStringOptionalWithResponse(BinaryData value,
     /**
      * The uint8AsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/implementation/PropertiesImpl.java
index 1a9deca67f3..a305077dcb4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/numeric/implementation/PropertiesImpl.java
@@ -122,24 +122,21 @@ Response uint8AsStringSync(@HostParam("endpoint") String endpoint,
     /**
      * The safeintAsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -161,24 +158,21 @@ public Mono> safeintAsStringWithResponseAsync(BinaryData va
     /**
      * The safeintAsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -199,24 +193,21 @@ public Response safeintAsStringWithResponse(BinaryData value, Reques
     /**
      * The uint32AsStringOptional operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -238,24 +229,21 @@ public Mono> uint32AsStringOptionalWithResponseAsync(Binary
     /**
      * The uint32AsStringOptional operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -276,24 +264,21 @@ public Response uint32AsStringOptionalWithResponse(BinaryData value,
     /**
      * The uint8AsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -314,24 +299,21 @@ public Mono> uint8AsStringWithResponseAsync(BinaryData valu
     /**
      * The uint8AsString operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     value: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param value The value parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyAsyncClient.java
index f613bdda38a..8296107cb71 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyAsyncClient.java
@@ -41,14 +41,13 @@ public final class ExplicitBodyAsyncClient {
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyClient.java
index b60eefa9736..b4291a0b827 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ExplicitBodyClient.java
@@ -39,14 +39,13 @@ public final class ExplicitBodyClient {
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyAsyncClient.java
index 995c23b270f..cbeddb49193 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyAsyncClient.java
@@ -41,14 +41,13 @@ public final class ImplicitBodyAsyncClient {
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param simpleRequest The simpleRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyClient.java
index 4e1904cf2f8..9fedaee808c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/ImplicitBodyClient.java
@@ -39,14 +39,13 @@ public final class ImplicitBodyClient {
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param simpleRequest The simpleRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java
index 0e520d1d256..8fb5b3fadc9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ExplicitBodiesImpl.java
@@ -82,14 +82,13 @@ Response simpleSync(@HostParam("endpoint") String endpoint,
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -109,14 +108,13 @@ public Mono> simpleWithResponseInternalAsync(BinaryData body, Req
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java
index 9903fda9a0e..b5307afe6c7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/basic/implementation/ImplicitBodiesImpl.java
@@ -82,14 +82,13 @@ Response simpleSync(@HostParam("endpoint") String endpoint,
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param simpleRequest The simpleRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -110,14 +109,13 @@ public Mono> simpleWithResponseInternalAsync(BinaryData simpleReq
     /**
      * The simple operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param simpleRequest The simpleRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityAsyncClient.java
index be91fc8ce6d..4a78a65891f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityAsyncClient.java
@@ -41,14 +41,13 @@ public final class BodyOptionalityAsyncClient {
     /**
      * The requiredExplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,14 +66,13 @@ public Mono> requiredExplicitWithResponse(BinaryData body, Reques
     /**
      * The requiredImplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyModel The bodyModel parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java
index 139e335bff1..f1011313862 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/BodyOptionalityClient.java
@@ -39,14 +39,13 @@ public final class BodyOptionalityClient {
     /**
      * The requiredExplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -65,14 +64,13 @@ public Response requiredExplicitWithResponse(BinaryData body, RequestOptio
     /**
      * The requiredImplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyModel The bodyModel parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitAsyncClient.java
index 8bf61894c95..81e17977e07 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitAsyncClient.java
@@ -42,21 +42,19 @@ public final class OptionalExplicitAsyncClient {
      * The set operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -75,21 +73,19 @@ public Mono> setWithResponse(RequestOptions requestOptions) {
      * The omit operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java
index b6d71686573..57705293b7e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/OptionalExplicitClient.java
@@ -40,21 +40,19 @@ public final class OptionalExplicitClient {
      * The set operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,21 +71,19 @@ public Response setWithResponse(RequestOptions requestOptions) {
      * The omit operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java
index 0056f1e1593..a7bb7cc5e5f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/BodyOptionalityClientImpl.java
@@ -184,14 +184,13 @@ Response requiredImplicitSync(@HostParam("endpoint") String endpoint,
     /**
      * The requiredExplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -211,14 +210,13 @@ public Mono> requiredExplicitWithResponseAsync(BinaryData body, R
     /**
      * The requiredExplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -237,14 +235,13 @@ public Response requiredExplicitWithResponse(BinaryData body, RequestOptio
     /**
      * The requiredImplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyModel The bodyModel parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -264,14 +261,13 @@ public Mono> requiredImplicitWithResponseAsync(BinaryData bodyMod
     /**
      * The requiredImplicit operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyModel The bodyModel parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java
index 4dc7b914048..7daad77dec9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyoptionality/implementation/OptionalExplicitsImpl.java
@@ -95,21 +95,19 @@ Mono> omit(@HostParam("endpoint") String endpoint, RequestOptions
      * The set operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -133,21 +131,19 @@ public Mono> setWithResponseAsync(RequestOptions requestOptions)
      * The set operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -171,21 +167,19 @@ public Response setWithResponse(RequestOptions requestOptions) {
      * The omit operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -209,21 +203,19 @@ public Mono> omitWithResponseAsync(RequestOptions requestOptions)
      * The omit operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootAsyncClient.java
index 473ea7fc80f..d54183b7159 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootAsyncClient.java
@@ -41,16 +41,15 @@ public final class BodyRootAsyncClient {
     /**
      * The nested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     category: String (Optional)
      *     linkType: String (Optional)
      *     wasSuccessful: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyRootParameters The bodyRootParameters parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootClient.java
index 70be9e5e742..5c50fb8d09e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/BodyRootClient.java
@@ -39,16 +39,15 @@ public final class BodyRootClient {
     /**
      * The nested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     category: String (Optional)
      *     linkType: String (Optional)
      *     wasSuccessful: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyRootParameters The bodyRootParameters parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/implementation/BodyRootClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/implementation/BodyRootClientImpl.java
index 6ace16374d5..d857e5421cd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/implementation/BodyRootClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/bodyroot/implementation/BodyRootClientImpl.java
@@ -149,16 +149,15 @@ Response nestedSync(@HostParam("endpoint") String endpoint,
     /**
      * The nested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     category: String (Optional)
      *     linkType: String (Optional)
      *     wasSuccessful: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyRootParameters The bodyRootParameters parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -178,16 +177,15 @@ public Mono> nestedWithResponseAsync(BinaryData bodyRootParameter
     /**
      * The nested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     category: String (Optional)
      *     linkType: String (Optional)
      *     wasSuccessful: Boolean (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyRootParameters The bodyRootParameters parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasAsyncClient.java
index 974e5d7b741..72eefb53a9b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasAsyncClient.java
@@ -46,14 +46,13 @@ public final class AliasAsyncClient {
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -73,14 +72,13 @@ public Mono> spreadAsRequestBodyWithResponse(BinaryData spreadAsR
     /**
      * The spreadParameterWithInnerModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -103,14 +101,13 @@ public Mono> spreadParameterWithInnerModelWithResponse(String id,
     /**
      * The spreadAsRequestParameter operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -133,9 +130,8 @@ public Mono> spreadAsRequestParameterWithResponse(String id, Stri
     /**
      * The spreadWithMultipleParameters operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredString: String (Required)
      *     optionalInt: Integer (Optional)
@@ -146,8 +142,8 @@ public Mono> spreadAsRequestParameterWithResponse(String id, Stri
      *         String (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -170,15 +166,14 @@ public Mono> spreadWithMultipleParametersWithResponse(String id,
     /**
      * spread an alias with contains another alias property as body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasClient.java
index a8faa210759..b9d7170576e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/AliasClient.java
@@ -44,14 +44,13 @@ public final class AliasClient {
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -71,14 +70,13 @@ public Response spreadAsRequestBodyWithResponse(BinaryData spreadAsRequest
     /**
      * The spreadParameterWithInnerModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -101,14 +99,13 @@ public Response spreadParameterWithInnerModelWithResponse(String id, Strin
     /**
      * The spreadAsRequestParameter operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -131,9 +128,8 @@ public Response spreadAsRequestParameterWithResponse(String id, String xMs
     /**
      * The spreadWithMultipleParameters operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredString: String (Required)
      *     optionalInt: Integer (Optional)
@@ -144,8 +140,8 @@ public Response spreadAsRequestParameterWithResponse(String id, String xMs
      *         String (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -168,15 +164,14 @@ public Response spreadWithMultipleParametersWithResponse(String id, String
     /**
      * spread an alias with contains another alias property as body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelAsyncClient.java
index 0bb9d5521a8..9d7bc9b0232 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelAsyncClient.java
@@ -42,14 +42,13 @@ public final class ModelAsyncClient {
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyParameter The bodyParameter parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,14 +68,13 @@ public Mono> spreadAsRequestBodyWithResponse(BinaryData bodyParam
     /**
      * The spreadCompositeRequestOnlyWithBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +113,13 @@ public Mono> spreadCompositeRequestWithoutBodyWithResponse(String
     /**
      * The spreadCompositeRequest operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
@@ -144,14 +141,13 @@ public Mono> spreadCompositeRequestWithResponse(String name, Stri
     /**
      * The spreadCompositeRequestMix operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelClient.java
index 3870ce5b144..10a5d80430a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/ModelClient.java
@@ -40,14 +40,13 @@ public final class ModelClient {
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyParameter The bodyParameter parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -66,14 +65,13 @@ public Response spreadAsRequestBodyWithResponse(BinaryData bodyParameter,
     /**
      * The spreadCompositeRequestOnlyWithBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -112,14 +110,13 @@ public Response spreadCompositeRequestWithoutBodyWithResponse(String name,
     /**
      * The spreadCompositeRequest operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
@@ -141,14 +138,13 @@ public Response spreadCompositeRequestWithResponse(String name, String tes
     /**
      * The spreadCompositeRequestMix operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/AliasImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/AliasImpl.java
index 3e3a5c432a5..192fedf0034 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/AliasImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/AliasImpl.java
@@ -180,14 +180,13 @@ Response spreadParameterWithInnerAliasSync(@HostParam("endpoint") String e
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -208,14 +207,13 @@ public Mono> spreadAsRequestBodyWithResponseAsync(BinaryData spre
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -236,14 +234,13 @@ public Response spreadAsRequestBodyWithResponse(BinaryData spreadAsRequest
     /**
      * The spreadParameterWithInnerModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -266,14 +263,13 @@ public Mono> spreadParameterWithInnerModelWithResponseAsync(Strin
     /**
      * The spreadParameterWithInnerModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -296,14 +292,13 @@ public Response spreadParameterWithInnerModelWithResponse(String id, Strin
     /**
      * The spreadAsRequestParameter operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -326,14 +321,13 @@ public Mono> spreadAsRequestParameterWithResponseAsync(String id,
     /**
      * The spreadAsRequestParameter operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -356,9 +350,8 @@ public Response spreadAsRequestParameterWithResponse(String id, String xMs
     /**
      * The spreadWithMultipleParameters operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredString: String (Required)
      *     optionalInt: Integer (Optional)
@@ -369,8 +362,8 @@ public Response spreadAsRequestParameterWithResponse(String id, String xMs
      *         String (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -393,9 +386,8 @@ public Mono> spreadWithMultipleParametersWithResponseAsync(String
     /**
      * The spreadWithMultipleParameters operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredString: String (Required)
      *     optionalInt: Integer (Optional)
@@ -406,8 +398,8 @@ public Mono> spreadWithMultipleParametersWithResponseAsync(String
      *         String (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -430,15 +422,14 @@ public Response spreadWithMultipleParametersWithResponse(String id, String
     /**
      * spread an alias with contains another alias property as body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
@@ -461,15 +452,14 @@ public Mono> spreadParameterWithInnerAliasWithResponseAsync(Strin
     /**
      * spread an alias with contains another alias property as body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param xMsTestHeader The xMsTestHeader parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/ModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/ModelsImpl.java
index 1f35a3fb6a2..840e0ddd3fe 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/ModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/parameters/spread/implementation/ModelsImpl.java
@@ -168,14 +168,13 @@ Response spreadCompositeRequestMixSync(@HostParam("endpoint") String endpo
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyParameter The bodyParameter parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -196,14 +195,13 @@ public Mono> spreadAsRequestBodyWithResponseAsync(BinaryData body
     /**
      * The spreadAsRequestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param bodyParameter The bodyParameter parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -223,14 +221,13 @@ public Response spreadAsRequestBodyWithResponse(BinaryData bodyParameter,
     /**
      * The spreadCompositeRequestOnlyWithBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -251,14 +248,13 @@ public Mono> spreadCompositeRequestOnlyWithBodyWithResponseAsync(
     /**
      * The spreadCompositeRequestOnlyWithBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -317,14 +313,13 @@ public Response spreadCompositeRequestWithoutBodyWithResponse(String name,
     /**
      * The spreadCompositeRequest operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
@@ -347,14 +342,13 @@ public Mono> spreadCompositeRequestWithResponseAsync(String name,
     /**
      * The spreadCompositeRequest operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
@@ -377,14 +371,13 @@ public Response spreadCompositeRequestWithResponse(String name, String tes
     /**
      * The spreadCompositeRequestMix operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
@@ -407,14 +400,13 @@ public Mono> spreadCompositeRequestMixWithResponseAsync(String na
     /**
      * The spreadCompositeRequestMix operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param testHeader The testHeader parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyAsyncClient.java
index 8353e6ec89e..a28e269b488 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyAsyncClient.java
@@ -41,12 +41,11 @@ public final class DifferentBodyAsyncClient {
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Mono> getAvatarAsPngWithResponse(RequestOptions requ
     /**
      * The getAvatarAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     content: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyClient.java
index 4e72b809bfb..87978906442 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/DifferentBodyClient.java
@@ -39,12 +39,11 @@ public final class DifferentBodyClient {
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,14 +61,13 @@ public Response getAvatarAsPngWithResponse(RequestOptions requestOpt
     /**
      * The getAvatarAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     content: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyAsyncClient.java
index 5bea329b843..386b8ab0498 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyAsyncClient.java
@@ -40,12 +40,11 @@ public final class SameBodyAsyncClient {
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -63,12 +62,11 @@ public Mono> getAvatarAsPngWithResponse(RequestOptions requ
     /**
      * The getAvatarAsJpeg operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyClient.java
index bbb4817ab0d..844211737e8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/SameBodyClient.java
@@ -38,12 +38,11 @@ public final class SameBodyClient {
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -61,12 +60,11 @@ public Response getAvatarAsPngWithResponse(RequestOptions requestOpt
     /**
      * The getAvatarAsJpeg operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java
index 4928bf2b6d8..db667e0e248 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/DifferentBodiesImpl.java
@@ -97,12 +97,11 @@ Response getAvatarAsJsonSync(@HostParam("endpoint") String endpoint,
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -121,12 +120,11 @@ public Mono> getAvatarAsPngWithResponseAsync(RequestOptions
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -144,14 +142,13 @@ public Response getAvatarAsPngWithResponse(RequestOptions requestOpt
     /**
      * The getAvatarAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     content: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -170,14 +167,13 @@ public Mono> getAvatarAsJsonWithResponseAsync(RequestOption
     /**
      * The getAvatarAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     content: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java
index 44bdf30e76c..5f2de4e0bf0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/contentnegotiation/implementation/SameBodiesImpl.java
@@ -97,12 +97,11 @@ Response getAvatarAsJpegSync(@HostParam("endpoint") String endpoint,
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -121,12 +120,11 @@ public Mono> getAvatarAsPngWithResponseAsync(RequestOptions
     /**
      * The getAvatarAsPng operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -144,12 +142,11 @@ public Response getAvatarAsPngWithResponse(RequestOptions requestOpt
     /**
      * The getAvatarAsJpeg operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,12 +165,11 @@ public Mono> getAvatarAsJpegWithResponseAsync(RequestOption
     /**
      * The getAvatarAsJpeg operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchAsyncClient.java
index d7542a08fb8..5936bcc41a1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchAsyncClient.java
@@ -43,9 +43,8 @@ public final class JsonMergePatchAsyncClient {
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -65,13 +64,11 @@ public final class JsonMergePatchAsyncClient {
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -91,8 +88,8 @@ public final class JsonMergePatchAsyncClient {
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,9 +108,8 @@ public Mono> createResourceWithResponse(BinaryData body, Re
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -132,13 +128,11 @@ public Mono> createResourceWithResponse(BinaryData body, Re
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -158,8 +152,8 @@ public Mono> createResourceWithResponse(BinaryData body, Re
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -179,16 +173,14 @@ public Mono> updateResourceWithResponse(BinaryData body, Re
      * Test content-type: application/merge-patch+json with optional body.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -207,13 +199,11 @@ public Mono> updateResourceWithResponse(BinaryData body, Re
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -233,8 +223,8 @@ public Mono> updateResourceWithResponse(BinaryData body, Re
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java
index 7db0b977781..6a468000c2c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/JsonMergePatchClient.java
@@ -41,9 +41,8 @@ public final class JsonMergePatchClient {
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -63,13 +62,11 @@ public final class JsonMergePatchClient {
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -89,8 +86,8 @@ public final class JsonMergePatchClient {
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -109,9 +106,8 @@ public Response createResourceWithResponse(BinaryData body, RequestO
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -130,13 +126,11 @@ public Response createResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -156,8 +150,8 @@ public Response createResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,16 +171,14 @@ public Response updateResourceWithResponse(BinaryData body, RequestO
      * Test content-type: application/merge-patch+json with optional body.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -205,13 +197,11 @@ public Response updateResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -231,8 +221,8 @@ public Response updateResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java
index 78afebd7113..5bde85b1f7c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/jsonmergepatch/implementation/JsonMergePatchClientImpl.java
@@ -189,9 +189,8 @@ Response updateOptionalResourceSync(@HostParam("endpoint") String en
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -211,13 +210,11 @@ Response updateOptionalResourceSync(@HostParam("endpoint") String en
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -237,8 +234,8 @@ Response updateOptionalResourceSync(@HostParam("endpoint") String en
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -259,9 +256,8 @@ public Mono> createResourceWithResponseAsync(BinaryData bod
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -281,13 +277,11 @@ public Mono> createResourceWithResponseAsync(BinaryData bod
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -307,8 +301,8 @@ public Mono> createResourceWithResponseAsync(BinaryData bod
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -328,9 +322,8 @@ public Response createResourceWithResponse(BinaryData body, RequestO
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -349,13 +342,11 @@ public Response createResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -375,8 +366,8 @@ public Response createResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -397,9 +388,8 @@ public Mono> updateResourceWithResponseAsync(BinaryData bod
     /**
      * Test content-type: application/merge-patch+json with required body.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -418,13 +408,11 @@ public Mono> updateResourceWithResponseAsync(BinaryData bod
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -444,8 +432,8 @@ public Mono> updateResourceWithResponseAsync(BinaryData bod
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -466,16 +454,14 @@ public Response updateResourceWithResponse(BinaryData body, RequestO
      * Test content-type: application/merge-patch+json with optional body.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -494,13 +480,11 @@ public Response updateResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -520,8 +504,8 @@ public Response updateResourceWithResponse(BinaryData body, RequestO
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -547,16 +531,14 @@ public Mono> updateOptionalResourceWithResponseAsync(Reques
      * Test content-type: application/merge-patch+json with optional body.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     description: String (Optional)
      *     map (Optional): {
@@ -575,13 +557,11 @@ public Mono> updateOptionalResourceWithResponseAsync(Reques
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     description: String (Optional)
@@ -601,8 +581,8 @@ public Mono> updateOptionalResourceWithResponseAsync(Reques
      *         int (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeAsyncClient.java
index 0f46513bbb1..a2dbc5459e4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeAsyncClient.java
@@ -40,12 +40,11 @@ public final class MediaTypeAsyncClient {
     /**
      * The sendAsText operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -64,12 +63,11 @@ public Mono> sendAsTextWithResponse(BinaryData text, RequestOptio
     /**
      * The getAsText operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -87,12 +85,11 @@ public Mono> getAsTextWithResponse(RequestOptions requestOp
     /**
      * The sendAsJson operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,12 +108,11 @@ public Mono> sendAsJsonWithResponse(BinaryData text, RequestOptio
     /**
      * The getAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeClient.java
index c436537812f..ea113a8454e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/MediaTypeClient.java
@@ -38,12 +38,11 @@ public final class MediaTypeClient {
     /**
      * The sendAsText operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -62,12 +61,11 @@ public Response sendAsTextWithResponse(BinaryData text, RequestOptions req
     /**
      * The getAsText operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -85,12 +83,11 @@ public Response getAsTextWithResponse(RequestOptions requestOptions)
     /**
      * The sendAsJson operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -109,12 +106,11 @@ public Response sendAsJsonWithResponse(BinaryData text, RequestOptions req
     /**
      * The getAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/implementation/StringBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/implementation/StringBodiesImpl.java
index e7a784ff33c..e5139212cb5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/implementation/StringBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/mediatype/implementation/StringBodiesImpl.java
@@ -139,12 +139,11 @@ Response getAsJsonSync(@HostParam("endpoint") String endpoint, @Head
     /**
      * The sendAsText operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -164,12 +163,11 @@ public Mono> sendAsTextWithResponseAsync(BinaryData text, Request
     /**
      * The sendAsText operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -188,12 +186,11 @@ public Response sendAsTextWithResponse(BinaryData text, RequestOptions req
     /**
      * The getAsText operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -212,12 +209,11 @@ public Mono> getAsTextWithResponseAsync(RequestOptions requ
     /**
      * The getAsText operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -235,12 +231,11 @@ public Response getAsTextWithResponse(RequestOptions requestOptions)
     /**
      * The sendAsJson operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -260,12 +255,11 @@ public Mono> sendAsJsonWithResponseAsync(BinaryData text, Request
     /**
      * The sendAsJson operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param text The text parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -284,12 +278,11 @@ public Response sendAsJsonWithResponse(BinaryData text, RequestOptions req
     /**
      * The getAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -308,12 +301,11 @@ public Mono> getAsJsonWithResponseAsync(RequestOptions requ
     /**
      * The getAsJson operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java
index 18289d7262f..b82a181fb0f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java
@@ -687,13 +687,11 @@ public Mono checkFileNameAndContentType(MultiPartRequest body) {
     public Mono> anonymousModelWithResponse(AnonymousModelRequest body, RequestOptions requestOptions) {
         // Generated convenience method for anonymousModelWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return anonymousModelWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -713,12 +711,10 @@ public Mono> anonymousModelWithResponse(AnonymousModelRequest bod
     public Mono anonymousModel(AnonymousModelRequest body) {
         // Generated convenience method for anonymousModelWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return anonymousModelWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).flatMap(FluxUtil::toMono);
+        return anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java
index 6eac4cc2b57..10f8e6b00b2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java
@@ -670,13 +670,11 @@ public void checkFileNameAndContentType(MultiPartRequest body) {
     public Response anonymousModelWithResponse(AnonymousModelRequest body, RequestOptions requestOptions) {
         // Generated convenience method for anonymousModelWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return anonymousModelWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -695,12 +693,10 @@ public Response anonymousModelWithResponse(AnonymousModelRequest body, Req
     public void anonymousModel(AnonymousModelRequest body) {
         // Generated convenience method for anonymousModelWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        anonymousModelWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).getValue();
+        anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).getValue();
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java
index dca7b5d274b..2febe24ad3d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java
@@ -122,8 +122,11 @@ public Mono> uploadFileSpecificContentTypeWithResponse(UploadFile
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions);
     }
 
@@ -145,8 +148,11 @@ public Mono uploadFileSpecificContentType(UploadFileSpecificContentTypeReq
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         return uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions).flatMap(FluxUtil::toMono);
     }
 
@@ -170,8 +176,11 @@ public Mono> uploadFileRequiredFilenameWithResponse(UploadFileReq
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions);
     }
 
@@ -193,8 +202,11 @@ public Mono uploadFileRequiredFilename(UploadFileRequiredFilenameRequest b
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         return uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions).flatMap(FluxUtil::toMono);
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java
index aeb7757e1a6..af10e8f0082 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java
@@ -118,8 +118,11 @@ public Response uploadFileSpecificContentTypeWithResponse(UploadFileSpecif
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions);
     }
 
@@ -140,8 +143,11 @@ public void uploadFileSpecificContentType(UploadFileSpecificContentTypeRequest b
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions).getValue();
     }
 
@@ -165,8 +171,11 @@ public Response uploadFileRequiredFilenameWithResponse(UploadFileRequiredF
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions);
     }
 
@@ -187,8 +196,11 @@ public void uploadFileRequiredFilename(UploadFileRequiredFilenameRequest body) {
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
-                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
+                    body.getFile().getFilename())
+                .end()
+                .getRequestBody(),
             requestOptions).getValue();
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java
index 01d9c144196..a0165e6bd67 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java
@@ -117,13 +117,11 @@ public Mono> imageJpegContentTypeWithResponse(FileWithHttpPartSpe
         RequestOptions requestOptions) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return imageJpegContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -143,13 +141,11 @@ public Mono> imageJpegContentTypeWithResponse(FileWithHttpPartSpe
     public Mono imageJpegContentType(FileWithHttpPartSpecificContentTypeRequest body) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return imageJpegContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).flatMap(FluxUtil::toMono);
+        return imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
     }
 
     /**
@@ -171,13 +167,11 @@ public Mono> requiredContentTypeWithResponse(FileWithHttpPartRequ
         RequestOptions requestOptions) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return requiredContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -197,13 +191,11 @@ public Mono> requiredContentTypeWithResponse(FileWithHttpPartRequ
     public Mono requiredContentType(FileWithHttpPartRequiredContentTypeRequest body) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return requiredContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).flatMap(FluxUtil::toMono);
+        return requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
     }
 
     /**
@@ -225,13 +217,11 @@ public Mono> optionalContentTypeWithResponse(FileWithHttpPartOpti
         RequestOptions requestOptions) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return optionalContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -251,12 +241,10 @@ public Mono> optionalContentTypeWithResponse(FileWithHttpPartOpti
     public Mono optionalContentType(FileWithHttpPartOptionalContentTypeRequest body) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return optionalContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).flatMap(FluxUtil::toMono);
+        return optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java
index a1cf05bee3c..f8e98bbfdfb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java
@@ -115,13 +115,11 @@ public Response imageJpegContentTypeWithResponse(FileWithHttpPartSpecificC
         RequestOptions requestOptions) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return imageJpegContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -140,13 +138,11 @@ public Response imageJpegContentTypeWithResponse(FileWithHttpPartSpecificC
     public void imageJpegContentType(FileWithHttpPartSpecificContentTypeRequest body) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        imageJpegContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).getValue();
+        imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).getValue();
     }
 
     /**
@@ -168,13 +164,11 @@ public Response requiredContentTypeWithResponse(FileWithHttpPartRequiredCo
         RequestOptions requestOptions) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return requiredContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -193,13 +187,11 @@ public Response requiredContentTypeWithResponse(FileWithHttpPartRequiredCo
     public void requiredContentType(FileWithHttpPartRequiredContentTypeRequest body) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        requiredContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).getValue();
+        requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).getValue();
     }
 
     /**
@@ -221,13 +213,11 @@ public Response optionalContentTypeWithResponse(FileWithHttpPartOptionalCo
         RequestOptions requestOptions) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return optionalContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions);
+        return optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions);
     }
 
     /**
@@ -246,12 +236,10 @@ public Response optionalContentTypeWithResponse(FileWithHttpPartOptionalCo
     public void optionalContentType(FileWithHttpPartOptionalContentTypeRequest body) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        optionalContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-                .end()
-                .getRequestBody(),
-            requestOptions).getValue();
+        optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
+            .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+            .end()
+            .getRequestBody(), requestOptions).getValue();
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeAsyncClient.java
index 7747db081e9..bda33b112ed 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeAsyncClient.java
@@ -43,15 +43,14 @@ public final class PageSizeAsyncClient {
     /**
      * The listWithoutContinuation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,21 +69,20 @@ public PagedFlux listWithoutContinuation(RequestOptions requestOptio
      * The listWithPageSize operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeClient.java
index a8bd6756150..7592afa6fcb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/PageSizeClient.java
@@ -39,15 +39,14 @@ public final class PageSizeClient {
     /**
      * The listWithoutContinuation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,21 +65,20 @@ public PagedIterable listWithoutContinuation(RequestOptions requestO
      * The listWithPageSize operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbAsyncClient.java
index b9479350f9b..6326614b69b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbAsyncClient.java
@@ -45,25 +45,22 @@ public final class ServerDrivenPaginationAlternateInitialVerbAsyncClient {
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     filter: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java
index abb9613f7dd..830629c9747 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java
@@ -40,25 +40,22 @@ public final class ServerDrivenPaginationAlternateInitialVerbClient {
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     filter: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAsyncClient.java
index 9a09fca9053..34a23402c8b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationAsyncClient.java
@@ -43,15 +43,14 @@ public final class ServerDrivenPaginationAsyncClient {
     /**
      * The link operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,15 +68,14 @@ public PagedFlux link(RequestOptions requestOptions) {
     /**
      * The linkString operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -95,15 +93,14 @@ public PagedFlux linkString(RequestOptions requestOptions) {
     /**
      * The nestedLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationClient.java
index 329043a905a..19dd4e01d99 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationClient.java
@@ -39,15 +39,14 @@ public final class ServerDrivenPaginationClient {
     /**
      * The link operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,15 +64,14 @@ public PagedIterable link(RequestOptions requestOptions) {
     /**
      * The linkString operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -91,15 +89,14 @@ public PagedIterable linkString(RequestOptions requestOptions) {
     /**
      * The nestedLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenAsyncClient.java
index ff4ef0ad14c..b3a31e51e10 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenAsyncClient.java
@@ -45,29 +45,28 @@ public final class ServerDrivenPaginationContinuationTokenAsyncClient {
      * The requestQueryResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -86,29 +85,28 @@ public PagedFlux requestQueryResponseBody(RequestOptions requestOpti
      * The requestHeaderResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,29 +125,28 @@ public PagedFlux requestHeaderResponseBody(RequestOptions requestOpt
      * The requestQueryResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,29 +165,28 @@ public PagedFlux requestQueryResponseHeader(RequestOptions requestOp
      * The requestHeaderResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -209,29 +205,28 @@ public PagedFlux requestHeaderResponseHeader(RequestOptions requestO
      * The requestQueryNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -250,29 +245,28 @@ public PagedFlux requestQueryNestedResponseBody(RequestOptions reque
      * The requestHeaderNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java
index 545b4d29e28..79d523de755 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java
@@ -41,29 +41,28 @@ public final class ServerDrivenPaginationContinuationTokenClient {
      * The requestQueryResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -82,29 +81,28 @@ public PagedIterable requestQueryResponseBody(RequestOptions request
      * The requestHeaderResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -123,29 +121,28 @@ public PagedIterable requestHeaderResponseBody(RequestOptions reques
      * The requestQueryResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -164,29 +161,28 @@ public PagedIterable requestQueryResponseHeader(RequestOptions reque
      * The requestHeaderResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -205,29 +201,28 @@ public PagedIterable requestHeaderResponseHeader(RequestOptions requ
      * The requestQueryNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -246,29 +241,28 @@ public PagedIterable requestQueryNestedResponseBody(RequestOptions r
      * The requestHeaderNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationAsyncClient.java
index 817d8cdf127..7dc1d627cc0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationAsyncClient.java
@@ -49,21 +49,20 @@ public final class XmlPaginationAsyncClient {
      * The listWithContinuation operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -81,15 +80,14 @@ public PagedFlux listWithContinuation(RequestOptions requestOptions)
     /**
      * The listWithNextLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationClient.java
index c1d5f6fd3d5..8d2544bcbfc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/XmlPaginationClient.java
@@ -45,21 +45,20 @@ public final class XmlPaginationClient {
      * The listWithContinuation operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -77,15 +76,14 @@ public PagedIterable listWithContinuation(RequestOptions requestOpti
     /**
      * The listWithNextLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/PageSizesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/PageSizesImpl.java
index fc09d13caa9..610954d7d37 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/PageSizesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/PageSizesImpl.java
@@ -104,15 +104,14 @@ Response listWithPageSizeSync(@HostParam("endpoint") String endpoint
     /**
      * The listWithoutContinuation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,15 +133,14 @@ private Mono> listWithoutContinuationSinglePageAsync(R
     /**
      * The listWithoutContinuation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -159,15 +157,14 @@ public PagedFlux listWithoutContinuationAsync(RequestOptions request
     /**
      * The listWithoutContinuation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -188,15 +185,14 @@ private PagedResponse listWithoutContinuationSinglePage(RequestOptio
     /**
      * The listWithoutContinuation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -214,21 +210,20 @@ public PagedIterable listWithoutContinuation(RequestOptions requestO
      * The listWithPageSize operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -251,21 +246,20 @@ private Mono> listWithPageSizeSinglePageAsync(RequestO
      * The listWithPageSize operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -283,21 +277,20 @@ public PagedFlux listWithPageSizeAsync(RequestOptions requestOptions
      * The listWithPageSize operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -319,21 +312,20 @@ private PagedResponse listWithPageSizeSinglePage(RequestOptions requ
      * The listWithPageSize operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter
Query Parameters
NameTypeRequiredDescription
pageSizeIntegerNoThe pageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java
index 91e69804914..18ebf9b3976 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java
@@ -110,25 +110,22 @@ Response postNextSync(@PathParam(value = "nextLink", encoded = true)
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     filter: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -150,25 +147,22 @@ private Mono> postSinglePageAsync(BinaryData body, Req
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     filter: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -190,25 +184,22 @@ public PagedFlux postAsync(BinaryData body, RequestOptions requestOp
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     filter: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -230,25 +221,22 @@ private PagedResponse postSinglePage(BinaryData body, RequestOptions
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     filter: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,15 +258,14 @@ public PagedIterable post(BinaryData body, RequestOptions requestOpt
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -301,15 +288,14 @@ private Mono> postNextSinglePageAsync(String nextLink,
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java
index 3594168cfdd..4b284a76722 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java
@@ -177,29 +177,28 @@ Response requestHeaderNestedResponseBodySync(@HostParam("endpoint")
      * The requestQueryResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -222,29 +221,28 @@ private Mono> requestQueryResponseBodySinglePageAsync(
      * The requestQueryResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -262,29 +260,28 @@ public PagedFlux requestQueryResponseBodyAsync(RequestOptions reques
      * The requestQueryResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -306,29 +303,28 @@ private PagedResponse requestQueryResponseBodySinglePage(RequestOpti
      * The requestQueryResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -346,29 +342,28 @@ public PagedIterable requestQueryResponseBody(RequestOptions request
      * The requestHeaderResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -390,29 +385,28 @@ private Mono> requestHeaderResponseBodySinglePageAsync
      * The requestHeaderResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -430,29 +424,28 @@ public PagedFlux requestHeaderResponseBodyAsync(RequestOptions reque
      * The requestHeaderResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -474,29 +467,28 @@ private PagedResponse requestHeaderResponseBodySinglePage(RequestOpt
      * The requestHeaderResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -514,29 +506,28 @@ public PagedIterable requestHeaderResponseBody(RequestOptions reques
      * The requestQueryResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -558,29 +549,28 @@ private Mono> requestQueryResponseHeaderSinglePageAsyn
      * The requestQueryResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -598,29 +588,28 @@ public PagedFlux requestQueryResponseHeaderAsync(RequestOptions requ
      * The requestQueryResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -642,29 +631,28 @@ private PagedResponse requestQueryResponseHeaderSinglePage(RequestOp
      * The requestQueryResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -682,29 +670,28 @@ public PagedIterable requestQueryResponseHeader(RequestOptions reque
      * The requestHeaderResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -726,29 +713,28 @@ private Mono> requestHeaderResponseHeaderSinglePageAsy
      * The requestHeaderResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -766,29 +752,28 @@ public PagedFlux requestHeaderResponseHeaderAsync(RequestOptions req
      * The requestHeaderResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -810,29 +795,28 @@ private PagedResponse requestHeaderResponseHeaderSinglePage(RequestO
      * The requestHeaderResponseHeader operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -850,29 +834,28 @@ public PagedIterable requestHeaderResponseHeader(RequestOptions requ
      * The requestQueryNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -896,29 +879,28 @@ public PagedIterable requestHeaderResponseHeader(RequestOptions requ
      * The requestQueryNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -936,29 +918,28 @@ public PagedFlux requestQueryNestedResponseBodyAsync(RequestOptions
      * The requestQueryNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -980,29 +961,28 @@ private PagedResponse requestQueryNestedResponseBodySinglePage(Reque
      * The requestQueryNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1020,29 +1000,28 @@ public PagedIterable requestQueryNestedResponseBody(RequestOptions r
      * The requestHeaderNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1066,29 +1045,28 @@ public PagedIterable requestQueryNestedResponseBody(RequestOptions r
      * The requestHeaderNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1106,29 +1084,28 @@ public PagedFlux requestHeaderNestedResponseBodyAsync(RequestOptions
      * The requestHeaderNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1150,29 +1127,28 @@ private PagedResponse requestHeaderNestedResponseBodySinglePage(Requ
      * The requestHeaderNestedResponseBody operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter
Header Parameters
NameTypeRequiredDescription
tokenStringNoThe token parameter
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java
index 7555bae0133..44b7dd681f5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java
@@ -183,15 +183,14 @@ Response nestedLinkNextSync(@PathParam(value = "nextLink", encoded =
     /**
      * The link operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -211,15 +210,14 @@ private Mono> linkSinglePageAsync(RequestOptions reque
     /**
      * The link operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -240,15 +238,14 @@ public PagedFlux linkAsync(RequestOptions requestOptions) {
     /**
      * The link operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -268,15 +265,14 @@ private PagedResponse linkSinglePage(RequestOptions requestOptions)
     /**
      * The link operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -297,15 +293,14 @@ public PagedIterable link(RequestOptions requestOptions) {
     /**
      * The linkString operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -326,15 +321,14 @@ private Mono> linkStringSinglePageAsync(RequestOptions
     /**
      * The linkString operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -355,15 +349,14 @@ public PagedFlux linkStringAsync(RequestOptions requestOptions) {
     /**
      * The linkString operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -384,15 +377,14 @@ private PagedResponse linkStringSinglePage(RequestOptions requestOpt
     /**
      * The linkString operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -413,15 +405,14 @@ public PagedIterable linkString(RequestOptions requestOptions) {
     /**
      * The nestedLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -443,15 +434,14 @@ private Mono> nestedLinkSinglePageAsync(RequestOptions
     /**
      * The nestedLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -472,15 +462,14 @@ public PagedFlux nestedLinkAsync(RequestOptions requestOptions) {
     /**
      * The nestedLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -501,15 +490,14 @@ private PagedResponse nestedLinkSinglePage(RequestOptions requestOpt
     /**
      * The nestedLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -530,15 +518,14 @@ public PagedIterable nestedLink(RequestOptions requestOptions) {
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -561,15 +548,14 @@ private Mono> linkNextSinglePageAsync(String nextLink,
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -591,15 +577,14 @@ private PagedResponse linkNextSinglePage(String nextLink, RequestOpt
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -623,15 +608,14 @@ private Mono> linkStringNextSinglePageAsync(String nex
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -653,15 +637,14 @@ private PagedResponse linkStringNextSinglePage(String nextLink, Requ
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -686,15 +669,14 @@ private Mono> nestedLinkNextSinglePageAsync(String nex
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java
index 8986bca9518..2f4daa14789 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java
@@ -126,29 +126,27 @@ Response listWithNextLinkNextSync(@PathParam(value = "nextLink", enc
      * The listWithContinuation operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the XML response for listing pets along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the XML response for listing pets along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithContinuationSinglePageAsync(RequestOptions requestOptions) {
@@ -171,21 +169,20 @@ private Mono> listWithContinuationSinglePageAsync(Requ
      * The listWithContinuation operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -203,21 +200,20 @@ public PagedFlux listWithContinuationAsync(RequestOptions requestOpt
      * The listWithContinuation operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -245,21 +241,20 @@ private PagedResponse listWithContinuationSinglePage(RequestOptions
      * The listWithContinuation operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter
Query Parameters
NameTypeRequiredDescription
markerStringNoThe marker parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -276,23 +271,21 @@ public PagedIterable listWithContinuation(RequestOptions requestOpti
     /**
      * The listWithNextLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the XML response for listing pets with next link along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return the XML response for listing pets with next link along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithNextLinkSinglePageAsync(RequestOptions requestOptions) {
@@ -314,15 +307,14 @@ private Mono> listWithNextLinkSinglePageAsync(RequestO
     /**
      * The listWithNextLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -343,15 +335,14 @@ public PagedFlux listWithNextLinkAsync(RequestOptions requestOptions
     /**
      * The listWithNextLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -378,15 +369,14 @@ private PagedResponse listWithNextLinkSinglePage(RequestOptions requ
     /**
      * The listWithNextLink operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -407,15 +397,14 @@ public PagedIterable listWithNextLink(RequestOptions requestOptions)
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -423,8 +412,7 @@ public PagedIterable listWithNextLink(RequestOptions requestOptions)
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the XML response for listing pets with next link along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return the XML response for listing pets with next link along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithNextLinkNextSinglePageAsync(String nextLink,
@@ -447,15 +435,14 @@ private Mono> listWithNextLinkNextSinglePageAsync(Stri
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Id: String (Required)
      *     Name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueAsyncClient.java
index babb0ce6830..2d5043b4d11 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithArrayOfModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -57,8 +56,8 @@ public final class ModelWithArrayOfModelValueAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -76,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -87,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java
index 3744c0aab86..39ee0f43c78 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithArrayOfModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -55,8 +54,8 @@ public final class ModelWithArrayOfModelValueClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -85,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueAsyncClient.java
index 84e4b7e049b..1a3667ff201 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueAsyncClient.java
@@ -46,24 +46,22 @@ public final class ModelWithAttributesValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §5.1 — Contains fields that are XML attributes along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §5.1 — Contains fields that are XML attributes along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -74,16 +72,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java
index 7f4bbf0ead3..7c71b93e3a9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java
@@ -44,16 +44,15 @@ public final class ModelWithAttributesValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,16 +70,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueAsyncClient.java
index 75ebfe7ba75..13d2ade76b7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueAsyncClient.java
@@ -46,23 +46,21 @@ public final class ModelWithDatetimeValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains datetime properties with different encodings along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return contains datetime properties with different encodings along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -73,15 +71,14 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java
index 87b0b627c02..a891ccf5144 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDatetimeValueClient.java
@@ -44,15 +44,14 @@ public final class ModelWithDatetimeValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +69,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueAsyncClient.java
index 159bce11961..bcc88b8eced 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueAsyncClient.java
@@ -46,24 +46,22 @@ public final class ModelWithDictionaryValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains a dictionary of key value pairs along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return contains a dictionary of key value pairs along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -74,16 +72,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueClient.java
index 39f59b981a5..27f913d741f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithDictionaryValueClient.java
@@ -44,16 +44,15 @@ public final class ModelWithDictionaryValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,16 +70,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueAsyncClient.java
index 7e1c583b9e6..636c3048c5e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithEmptyArrayValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -57,16 +56,15 @@ public final class ModelWithEmptyArrayValueAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java
index 52b57d7b036..8de559dee10 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithEmptyArrayValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -55,16 +54,15 @@ public final class ModelWithEmptyArrayValueClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with
-     * {@link Response}.
+     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -75,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -86,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueAsyncClient.java
index bb628afd86a..c4445d40156 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithEncodedNamesValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -58,16 +57,15 @@ public final class ModelWithEncodedNamesValueAsyncClient {
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return uses encodedName instead of Xml.Name which is functionally equivalent along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return uses encodedName instead of Xml.Name which is functionally equivalent along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -78,9 +76,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -90,8 +87,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java
index 6f248bc20af..b344ad0802b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithEncodedNamesValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -56,8 +55,8 @@ public final class ModelWithEncodedNamesValueClient {
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -75,9 +74,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -87,8 +85,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueAsyncClient.java
index 4dc46a81d40..ba3c7afc1b5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueAsyncClient.java
@@ -46,22 +46,20 @@ public final class ModelWithEnumValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains a single property with an enum value along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return contains a single property with an enum value along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -72,14 +70,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueClient.java
index 10b19d7c64d..2960f04ccd7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithEnumValueClient.java
@@ -44,14 +44,13 @@ public final class ModelWithEnumValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,14 +68,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueAsyncClient.java
index 324185ca275..0606839f395 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueAsyncClient.java
@@ -46,24 +46,22 @@ public final class ModelWithNamespaceOnPropertiesValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -74,16 +72,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java
index 0e8d2538712..52db56acc36 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java
@@ -44,24 +44,22 @@ public final class ModelWithNamespaceOnPropertiesValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with
-     * {@link Response}.
+     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -72,16 +70,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueAsyncClient.java
index eee95e9b17c..4cbee8f8fe5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueAsyncClient.java
@@ -46,23 +46,21 @@ public final class ModelWithNamespaceValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -73,15 +71,14 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java
index ae190101897..834d2b2293d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java
@@ -44,15 +44,14 @@ public final class ModelWithNamespaceValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +69,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueAsyncClient.java
index e3d2e270649..b2b4a918acc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueAsyncClient.java
@@ -46,25 +46,23 @@ public final class ModelWithNestedModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §2.1 — Contains a property that references another model along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return §2.1 — Contains a property that references another model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -75,17 +73,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java
index 3be2b03651d..a680576a906 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java
@@ -44,17 +44,16 @@ public final class ModelWithNestedModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,17 +71,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueAsyncClient.java
index af6b9336c82..b30c74b700d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueAsyncClient.java
@@ -46,15 +46,14 @@ public final class ModelWithOptionalFieldValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,15 +71,14 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java
index d6647b8b829..e377adc4582 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java
@@ -44,15 +44,14 @@ public final class ModelWithOptionalFieldValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +69,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueAsyncClient.java
index b3e0fa7a83e..fe7f1018efa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithRenamedArraysValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -57,16 +56,15 @@ public final class ModelWithRenamedArraysValueAsyncClient {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML
-     * representations along with {@link Response} on successful completion of {@link Mono}.
+     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java
index e405d116947..7e72fa53689 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithRenamedArraysValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -55,16 +54,15 @@ public final class ModelWithRenamedArraysValueClient {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML
-     * representations along with {@link Response}.
+     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -75,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -86,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueAsyncClient.java
index 7af625c648c..c7aa233a6f6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueAsyncClient.java
@@ -46,24 +46,22 @@ public final class ModelWithRenamedAttributeValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §5.2 — Contains a renamed XML attribute along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §5.2 — Contains a renamed XML attribute along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -74,16 +72,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java
index 0c8211652fb..882ac18529d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java
@@ -44,16 +44,15 @@ public final class ModelWithRenamedAttributeValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,16 +70,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueAsyncClient.java
index b309fd15e80..36b4b4a4073 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithRenamedFieldsValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -56,16 +55,15 @@ public final class ModelWithRenamedFieldsValueAsyncClient {
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -76,9 +74,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -86,8 +83,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java
index e3f47f41d23..ca443849572 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithRenamedFieldsValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -54,16 +53,15 @@ public final class ModelWithRenamedFieldsValueClient {
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with
-     * {@link Response}.
+     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -74,9 +72,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -84,8 +81,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueAsyncClient.java
index 9d002686663..c39b0e78c42 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueAsyncClient.java
@@ -46,24 +46,22 @@ public final class ModelWithRenamedNestedModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §2.2 — Contains a property whose type has along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §2.2 — Contains a property whose type has along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -74,16 +72,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java
index b63c9d8d0ca..646e8767dcc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java
@@ -44,16 +44,15 @@ public final class ModelWithRenamedNestedModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,16 +70,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueAsyncClient.java
index 6946bf19d05..4e4ae068c27 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueAsyncClient.java
@@ -46,23 +46,21 @@ public final class ModelWithRenamedPropertyValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -73,15 +71,14 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java
index acd82c57fd7..ca3e10a29aa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java
@@ -44,15 +44,14 @@ public final class ModelWithRenamedPropertyValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +69,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueAsyncClient.java
index 9b4c54d5638..facbebd3597 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithRenamedUnwrappedModelArrayValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -57,16 +56,15 @@ public final class ModelWithRenamedUnwrappedModelArrayValueAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java
index 8cf3d973817..e037b3d15ce 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithRenamedUnwrappedModelArrayValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -55,8 +54,8 @@ public final class ModelWithRenamedUnwrappedModelArrayValueClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -85,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueAsyncClient.java
index 3edda815c07..1534425dc42 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueAsyncClient.java
@@ -47,9 +47,8 @@ public final class ModelWithRenamedWrappedAndItemModelArrayValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -57,16 +56,15 @@ public final class ModelWithRenamedWrappedAndItemModelArrayValueAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response}
-     * on successful completion of {@link Mono}.
+     * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -87,8 +84,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java
index 1bbb9df5243..d36d97dfb8f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java
@@ -45,9 +45,8 @@ public final class ModelWithRenamedWrappedAndItemModelArrayValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -55,8 +54,8 @@ public final class ModelWithRenamedWrappedAndItemModelArrayValueClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -84,8 +82,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueAsyncClient.java
index 135585aaf81..f1512c77a98 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithRenamedWrappedModelArrayValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -57,16 +56,15 @@ public final class ModelWithRenamedWrappedModelArrayValueAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java
index 7b4081ed533..6c0061efb9d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithRenamedWrappedModelArrayValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -55,8 +54,8 @@ public final class ModelWithRenamedWrappedModelArrayValueClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -85,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueAsyncClient.java
index b2f1886ac4d..5f5beb9188d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithSimpleArraysValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -57,16 +56,15 @@ public final class ModelWithSimpleArraysValueAsyncClient {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java
index b4c62ee9f4b..1f170c8d7a3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithSimpleArraysValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -55,8 +54,8 @@ public final class ModelWithSimpleArraysValueClient {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -85,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueAsyncClient.java
index 50bc2035d8f..ea97894de23 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueAsyncClient.java
@@ -46,23 +46,21 @@ public final class ModelWithTextValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §8.1 — Contains an attribute and text along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §8.1 — Contains an attribute and text along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -73,15 +71,14 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueClient.java
index 37d7122f090..24c63149922 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithTextValueClient.java
@@ -44,15 +44,14 @@ public final class ModelWithTextValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +69,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueAsyncClient.java
index 1d6501a0d75..70cbb469061 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithUnwrappedArrayValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -57,16 +56,15 @@ public final class ModelWithUnwrappedArrayValueAsyncClient {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java
index c90326741ef..b3a32efdc25 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithUnwrappedArrayValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -55,8 +54,8 @@ public final class ModelWithUnwrappedArrayValueClient {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -85,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueAsyncClient.java
index d775e563442..a4634a6776f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueAsyncClient.java
@@ -46,9 +46,8 @@ public final class ModelWithUnwrappedModelArrayValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -57,16 +56,15 @@ public final class ModelWithUnwrappedModelArrayValueAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.2 — Contains an unwrapped array of models along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §4.2 — Contains an unwrapped array of models along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -77,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -88,8 +85,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java
index d285f308d93..975e8171c9c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java
@@ -44,9 +44,8 @@ public final class ModelWithUnwrappedModelArrayValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -55,8 +54,8 @@ public final class ModelWithUnwrappedModelArrayValueClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -85,8 +83,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueAsyncClient.java
index 24d60771dd2..08e71ea975e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueAsyncClient.java
@@ -47,24 +47,22 @@ public final class ModelWithWrappedPrimitiveCustomItemNamesValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response}
-     * on successful completion of {@link Mono}.
+     * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -75,16 +73,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java
index 2d271747f24..171659a3c15 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java
@@ -45,16 +45,15 @@ public final class ModelWithWrappedPrimitiveCustomItemNamesValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,16 +71,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueAsyncClient.java
index a44b9f9c0bd..6fe5cd399e6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueAsyncClient.java
@@ -46,23 +46,21 @@ public final class SimpleModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -73,15 +71,14 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueClient.java
index a5598e7f4a6..c732387060c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/SimpleModelValueClient.java
@@ -44,15 +44,14 @@ public final class SimpleModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +69,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueAsyncClient.java
index 5489545fdfd..173dd4b6074 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueAsyncClient.java
@@ -46,23 +46,21 @@ public final class XmlErrorValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueClient.java
index 828e2e61228..01ec5fa2f2c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/XmlErrorValueClient.java
@@ -44,15 +44,14 @@ public final class XmlErrorValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java
index 25fb8840bca..213d6a928d2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java
index 9179deb03db..6efa88185a9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java
@@ -100,24 +100,22 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §5.1 — Contains fields that are XML attributes along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §5.1 — Contains fields that are XML attributes along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -128,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -155,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -184,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id1: int (Required)
      *     id2: String (Required)
      *     enabled: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java
index efcb2723116..93144a88a56 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java
@@ -100,23 +100,21 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains datetime properties with different encodings along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return contains datetime properties with different encodings along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -127,15 +125,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,15 +150,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -181,15 +177,14 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     rfc3339: OffsetDateTime (Required)
      *     rfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java
index 9badecf1983..638787d7b8d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java
@@ -100,24 +100,22 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains a dictionary of key value pairs along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return contains a dictionary of key value pairs along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -128,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -155,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -184,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     metadata (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java
index b718e492aba..159f20bac7f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -142,16 +139,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with
-     * {@link Response}.
+     * @return contains an array of models that's supposed to be sent/received as an empty XML element along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWithResponse(RequestOptions requestOptions) {
@@ -162,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -173,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -205,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java
index 7632f29359c..79e17738df8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -112,16 +111,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return uses encodedName instead of Xml.Name which is functionally equivalent along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return uses encodedName instead of Xml.Name which is functionally equivalent along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -132,9 +130,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -144,8 +141,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -163,9 +160,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -175,8 +171,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -196,9 +192,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SimpleModelData (Required): {
      *         name: String (Required)
@@ -208,8 +203,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java
index 519cadc6cbc..e9e455ae8c9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java
@@ -100,22 +100,20 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains a single property with an enum value along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return contains a single property with an enum value along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -126,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -151,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -178,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     status: String(pending/success/error) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java
index b4071042553..5bc3fbb9b59 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java
@@ -100,24 +100,22 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -128,24 +126,22 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with
-     * {@link Response}.
+     * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWithResponse(RequestOptions requestOptions) {
@@ -156,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -185,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java
index 883a9aa16a4..a67482ee3d4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java
@@ -100,23 +100,21 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -127,15 +125,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,15 +150,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -181,15 +177,14 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     title: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java
index e268ba5a383..7cc61f35d09 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java
@@ -100,25 +100,23 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §2.1 — Contains a property that references another model along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return §2.1 — Contains a property that references another model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -129,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -157,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -187,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested (Required): {
      *         name: String (Required)
      *         age: int (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java
index c92669917ba..1c61a02dd61 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java
@@ -100,15 +100,14 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -126,15 +125,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -152,15 +150,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -180,15 +177,14 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     item: String (Required)
      *     value: Integer (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java
index d385e242bfd..11353f8397a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML
-     * representations along with {@link Response} on successful completion of {@link Mono}.
+     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -142,16 +139,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML
-     * representations along with {@link Response}.
+     * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWithResponse(RequestOptions requestOptions) {
@@ -162,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -173,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     Colors (Required): [
      *         String (Required)
@@ -205,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java
index 584f5ede3a8..0bd928b3c32 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java
@@ -100,24 +100,22 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §5.2 — Contains a renamed XML attribute along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §5.2 — Contains a renamed XML attribute along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -128,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -155,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -184,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     xml-id: int (Required)
      *     title: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java
index 0e03e2846e8..140607b56c3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -110,16 +109,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -130,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -140,16 +137,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with
-     * {@link Response}.
+     * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWithResponse(RequestOptions requestOptions) {
@@ -160,9 +156,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -170,8 +165,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,9 +186,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     InputData (Required): {
      *         name: String (Required)
@@ -201,8 +195,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *     }
      *     OutputData (Required): (recursive schema, see OutputData above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java
index d9f80b9e44d..602f72db522 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java
@@ -100,24 +100,22 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §2.2 — Contains a property whose type has along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §2.2 — Contains a property whose type has along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -128,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -155,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -184,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     author (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java
index 96d7a28d586..f5e8a9de17f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java
@@ -100,23 +100,21 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -127,15 +125,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,15 +150,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -181,15 +177,14 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     renamedTitle: String (Required)
      *     author: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java
index c04789a86ae..6b16e8ed6c1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -142,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -161,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -172,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ModelItem (Required): [
      *          (Required){
@@ -204,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java
index a7c9f36b2d9..ac0ca3bd4e4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java
@@ -101,9 +101,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response}
-     * on successful completion of {@link Mono}.
+     * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -141,8 +138,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +157,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -170,8 +166,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,9 +187,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllBooks (Required): [
      *          (Required){
@@ -201,8 +196,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java
index 4cc47a6fb03..97825ea89a6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -142,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -161,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -172,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     AllItems (Required): [
      *          (Required){
@@ -204,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java
index b9ebe06e11e..84f1d59d7dc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -142,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -161,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -172,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -204,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java
index 95af58d7dab..5fdfe9cfdf9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java
@@ -100,23 +100,21 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §8.1 — Contains an attribute and text along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §8.1 — Contains an attribute and text along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -127,15 +125,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,15 +150,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -181,15 +177,14 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     language: String (Required)
      *     content: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java
index b4b5a36f89d..30e6f66d4f9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -142,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -161,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -172,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     colors (Required): [
      *         String (Required)
@@ -204,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java
index 6916e345448..f11ae0dad10 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -111,16 +110,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §4.2 — Contains an unwrapped array of models along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §4.2 — Contains an unwrapped array of models along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -131,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -142,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -161,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -172,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *          (Required){
@@ -204,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java
index 6e75b937e9d..a20ea6d963f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java
@@ -101,24 +101,22 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response}
-     * on successful completion of {@link Mono}.
+     * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -129,16 +127,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,16 +153,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -185,16 +181,15 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     ItemsTags (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java
index c7118dac973..d316d502ffa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java
@@ -100,23 +100,21 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -127,15 +125,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,15 +150,14 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -181,15 +177,14 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java
index 7afe99f802f..21939cf139e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java
@@ -79,23 +79,21 @@ Response getSync(@HostParam("endpoint") String endpoint, @HeaderPara
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return §1.1 — Contains fields of primitive types along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWithResponseAsync(RequestOptions requestOptions) {
@@ -106,15 +104,14 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonAsyncClient.java
index f1e39fce7d4..12d8091239e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonAsyncClient.java
@@ -41,14 +41,13 @@ public final class JsonAsyncClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,14 +66,13 @@ public Mono> sendWithResponse(BinaryData body, RequestOptions req
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonClient.java
index f3fe2bc3621..baf380fcf87 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/JsonClient.java
@@ -39,14 +39,13 @@ public final class JsonClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -65,14 +64,13 @@ public Response sendWithResponse(BinaryData body, RequestOptions requestOp
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java
index 07565d3e69f..33efa169ee5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/serialization/encodedname/json/implementation/PropertiesImpl.java
@@ -100,14 +100,13 @@ Response getSync(@HostParam("endpoint") String endpoint, @HeaderPara
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -127,14 +126,13 @@ public Mono> sendWithResponseAsync(BinaryData body, RequestOption
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -153,14 +151,13 @@ public Response sendWithResponse(BinaryData body, RequestOptions requestOp
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -178,14 +175,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     wireName: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java
index aeeab3d03ff..8cd1b0416b1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java
@@ -41,20 +41,17 @@ public final class ExtensibleStringsAsyncClient {
     /**
      * The putExtensibleStringValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -62,8 +59,7 @@ public final class ExtensibleStringsAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return verify enum member names that are special words using extensible enum (union) along with {@link Response}
-     * on successful completion of {@link Mono}.
+     * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -92,6 +88,6 @@ public Mono putExtensibleStringValue(ExtensibleString body) {
         RequestOptions requestOptions = new RequestOptions();
         return putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()),
             requestOptions).flatMap(FluxUtil::toMono)
-                .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class)));
+            .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class)));
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java
index 05656c704df..92a5af777c2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsClient.java
@@ -39,20 +39,17 @@ public final class ExtensibleStringsClient {
     /**
      * The putExtensibleStringValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -60,8 +57,7 @@ public final class ExtensibleStringsClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return verify enum member names that are special words using extensible enum (union) along with
-     * {@link Response}.
+     * @return verify enum member names that are special words using extensible enum (union) along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesAsyncClient.java
index 038d5d8305b..11fd576f5a7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesAsyncClient.java
@@ -43,14 +43,13 @@ public final class ModelPropertiesAsyncClient {
     /**
      * The sameAsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SameAsModel: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,9 +68,8 @@ public Mono> sameAsModelWithResponse(BinaryData body, RequestOpti
     /**
      * The dictMethods operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     keys: String (Required)
      *     items: String (Required)
@@ -84,8 +82,8 @@ public Mono> sameAsModelWithResponse(BinaryData body, RequestOpti
      *     get: String (Required)
      *     copy: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -104,14 +102,13 @@ public Mono> dictMethodsWithResponse(BinaryData body, RequestOpti
     /**
      * The withList operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     list: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesClient.java
index bd6f5ed1f00..37199be7912 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelPropertiesClient.java
@@ -41,14 +41,13 @@ public final class ModelPropertiesClient {
     /**
      * The sameAsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SameAsModel: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,9 +66,8 @@ public Response sameAsModelWithResponse(BinaryData body, RequestOptions re
     /**
      * The dictMethods operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     keys: String (Required)
      *     items: String (Required)
@@ -82,8 +80,8 @@ public Response sameAsModelWithResponse(BinaryData body, RequestOptions re
      *     get: String (Required)
      *     copy: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -102,14 +100,13 @@ public Response dictMethodsWithResponse(BinaryData body, RequestOptions re
     /**
      * The withList operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     list: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsAsyncClient.java
index e36add4ca6f..48921fc20ae 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsAsyncClient.java
@@ -73,14 +73,13 @@ public final class ModelsAsyncClient {
     /**
      * The withAnd operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -99,14 +98,13 @@ public Mono> withAndWithResponse(BinaryData body, RequestOptions
     /**
      * The withAs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -125,14 +123,13 @@ public Mono> withAsWithResponse(BinaryData body, RequestOptions r
     /**
      * The withAssert operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -151,14 +148,13 @@ public Mono> withAssertWithResponse(BinaryData body, RequestOptio
     /**
      * The withAsync operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +173,13 @@ public Mono> withAsyncWithResponse(BinaryData body, RequestOption
     /**
      * The withAwait operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -203,14 +198,13 @@ public Mono> withAwaitWithResponse(BinaryData body, RequestOption
     /**
      * The withBreak operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -229,14 +223,13 @@ public Mono> withBreakWithResponse(BinaryData body, RequestOption
     /**
      * The withClass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -255,14 +248,13 @@ public Mono> withClassWithResponse(BinaryData body, RequestOption
     /**
      * The withConstructor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -281,14 +273,13 @@ public Mono> withConstructorWithResponse(BinaryData body, Request
     /**
      * The withContinue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -307,14 +298,13 @@ public Mono> withContinueWithResponse(BinaryData body, RequestOpt
     /**
      * The withDef operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -333,14 +323,13 @@ public Mono> withDefWithResponse(BinaryData body, RequestOptions
     /**
      * The withDel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -359,14 +348,13 @@ public Mono> withDelWithResponse(BinaryData body, RequestOptions
     /**
      * The withElif operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -385,14 +373,13 @@ public Mono> withElifWithResponse(BinaryData body, RequestOptions
     /**
      * The withElse operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -411,14 +398,13 @@ public Mono> withElseWithResponse(BinaryData body, RequestOptions
     /**
      * The withExcept operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -437,14 +423,13 @@ public Mono> withExceptWithResponse(BinaryData body, RequestOptio
     /**
      * The withExec operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -463,14 +448,13 @@ public Mono> withExecWithResponse(BinaryData body, RequestOptions
     /**
      * The withFinally operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -489,14 +473,13 @@ public Mono> withFinallyWithResponse(BinaryData body, RequestOpti
     /**
      * The withFor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -515,14 +498,13 @@ public Mono> withForWithResponse(BinaryData body, RequestOptions
     /**
      * The withFrom operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -541,14 +523,13 @@ public Mono> withFromWithResponse(BinaryData body, RequestOptions
     /**
      * The withGlobal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -567,14 +548,13 @@ public Mono> withGlobalWithResponse(BinaryData body, RequestOptio
     /**
      * The withIf operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -593,14 +573,13 @@ public Mono> withIfWithResponse(BinaryData body, RequestOptions r
     /**
      * The withImport operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -619,14 +598,13 @@ public Mono> withImportWithResponse(BinaryData body, RequestOptio
     /**
      * The withIn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -645,14 +623,13 @@ public Mono> withInWithResponse(BinaryData body, RequestOptions r
     /**
      * The withIs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -671,14 +648,13 @@ public Mono> withIsWithResponse(BinaryData body, RequestOptions r
     /**
      * The withLambda operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -697,14 +673,13 @@ public Mono> withLambdaWithResponse(BinaryData body, RequestOptio
     /**
      * The withNot operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -723,14 +698,13 @@ public Mono> withNotWithResponse(BinaryData body, RequestOptions
     /**
      * The withOr operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -749,14 +723,13 @@ public Mono> withOrWithResponse(BinaryData body, RequestOptions r
     /**
      * The withPass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -775,14 +748,13 @@ public Mono> withPassWithResponse(BinaryData body, RequestOptions
     /**
      * The withRaise operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -801,14 +773,13 @@ public Mono> withRaiseWithResponse(BinaryData body, RequestOption
     /**
      * The withReturn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -827,14 +798,13 @@ public Mono> withReturnWithResponse(BinaryData body, RequestOptio
     /**
      * The withTry operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -853,14 +823,13 @@ public Mono> withTryWithResponse(BinaryData body, RequestOptions
     /**
      * The withWhile operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -879,14 +848,13 @@ public Mono> withWhileWithResponse(BinaryData body, RequestOption
     /**
      * The withWith operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -905,14 +873,13 @@ public Mono> withWithWithResponse(BinaryData body, RequestOptions
     /**
      * The withYield operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsClient.java
index d38e17b174e..faa86400e35 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ModelsClient.java
@@ -71,14 +71,13 @@ public final class ModelsClient {
     /**
      * The withAnd operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -97,14 +96,13 @@ public Response withAndWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withAs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,14 +121,13 @@ public Response withAsWithResponse(BinaryData body, RequestOptions request
     /**
      * The withAssert operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,14 +146,13 @@ public Response withAssertWithResponse(BinaryData body, RequestOptions req
     /**
      * The withAsync operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -175,14 +171,13 @@ public Response withAsyncWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withAwait operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -201,14 +196,13 @@ public Response withAwaitWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withBreak operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -227,14 +221,13 @@ public Response withBreakWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withClass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -253,14 +246,13 @@ public Response withClassWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withConstructor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -279,14 +271,13 @@ public Response withConstructorWithResponse(BinaryData body, RequestOption
     /**
      * The withContinue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -305,14 +296,13 @@ public Response withContinueWithResponse(BinaryData body, RequestOptions r
     /**
      * The withDef operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -331,14 +321,13 @@ public Response withDefWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withDel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -357,14 +346,13 @@ public Response withDelWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withElif operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -383,14 +371,13 @@ public Response withElifWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withElse operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -409,14 +396,13 @@ public Response withElseWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withExcept operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -435,14 +421,13 @@ public Response withExceptWithResponse(BinaryData body, RequestOptions req
     /**
      * The withExec operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -461,14 +446,13 @@ public Response withExecWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withFinally operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -487,14 +471,13 @@ public Response withFinallyWithResponse(BinaryData body, RequestOptions re
     /**
      * The withFor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -513,14 +496,13 @@ public Response withForWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withFrom operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -539,14 +521,13 @@ public Response withFromWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withGlobal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -565,14 +546,13 @@ public Response withGlobalWithResponse(BinaryData body, RequestOptions req
     /**
      * The withIf operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -591,14 +571,13 @@ public Response withIfWithResponse(BinaryData body, RequestOptions request
     /**
      * The withImport operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -617,14 +596,13 @@ public Response withImportWithResponse(BinaryData body, RequestOptions req
     /**
      * The withIn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -643,14 +621,13 @@ public Response withInWithResponse(BinaryData body, RequestOptions request
     /**
      * The withIs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -669,14 +646,13 @@ public Response withIsWithResponse(BinaryData body, RequestOptions request
     /**
      * The withLambda operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -695,14 +671,13 @@ public Response withLambdaWithResponse(BinaryData body, RequestOptions req
     /**
      * The withNot operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -721,14 +696,13 @@ public Response withNotWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withOr operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -747,14 +721,13 @@ public Response withOrWithResponse(BinaryData body, RequestOptions request
     /**
      * The withPass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -773,14 +746,13 @@ public Response withPassWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withRaise operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -799,14 +771,13 @@ public Response withRaiseWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withReturn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -825,14 +796,13 @@ public Response withReturnWithResponse(BinaryData body, RequestOptions req
     /**
      * The withTry operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -851,14 +821,13 @@ public Response withTryWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withWhile operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -877,14 +846,13 @@ public Response withWhileWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withWith operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -903,14 +871,13 @@ public Response withWithWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withYield operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsAsyncClient.java
index 620df8e4cfd..d3ac5281653 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsAsyncClient.java
@@ -42,16 +42,15 @@ public final class ReservedOperationBodyParamsAsyncClient {
     /**
      * The withItems operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param withItemsRequest The withItemsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsClient.java
index 259e94c0441..bbbedaa7ab7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ReservedOperationBodyParamsClient.java
@@ -40,16 +40,15 @@ public final class ReservedOperationBodyParamsClient {
     /**
      * The withItems operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param withItemsRequest The withItemsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java
index bfc14dc2403..25872002ca8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ExtensibleStringsImpl.java
@@ -82,20 +82,17 @@ Response putExtensibleStringValueSync(@HostParam("endpoint") String
     /**
      * The putExtensibleStringValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -103,8 +100,7 @@ Response putExtensibleStringValueSync(@HostParam("endpoint") String
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return verify enum member names that are special words using extensible enum (union) along with {@link Response}
-     * on successful completion of {@link Mono}.
+     * @return verify enum member names that are special words using extensible enum (union) along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putExtensibleStringValueWithResponseAsync(BinaryData body,
@@ -118,20 +114,17 @@ public Mono> putExtensibleStringValueWithResponseAsync(Bina
     /**
      * The putExtensibleStringValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(and/as/assert/async/await/break/class/constructor/continue/def/del/elif/else/except/exec/finally/for/from/global/if/import/in/is/lambda/not/or/pass/raise/return/try/while/with/yield)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -139,8 +132,7 @@ public Mono> putExtensibleStringValueWithResponseAsync(Bina
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return verify enum member names that are special words using extensible enum (union) along with
-     * {@link Response}.
+     * @return verify enum member names that are special words using extensible enum (union) along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response putExtensibleStringValueWithResponse(BinaryData body, RequestOptions requestOptions) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelPropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelPropertiesImpl.java
index af4e50603a5..ab6177958b2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelPropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelPropertiesImpl.java
@@ -122,14 +122,13 @@ Response withListSync(@HostParam("endpoint") String endpoint,
     /**
      * The sameAsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SameAsModel: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,14 +148,13 @@ public Mono> sameAsModelWithResponseAsync(BinaryData body, Reques
     /**
      * The sameAsModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     SameAsModel: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -175,9 +173,8 @@ public Response sameAsModelWithResponse(BinaryData body, RequestOptions re
     /**
      * The dictMethods operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     keys: String (Required)
      *     items: String (Required)
@@ -190,8 +187,8 @@ public Response sameAsModelWithResponse(BinaryData body, RequestOptions re
      *     get: String (Required)
      *     copy: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -211,9 +208,8 @@ public Mono> dictMethodsWithResponseAsync(BinaryData body, Reques
     /**
      * The dictMethods operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     keys: String (Required)
      *     items: String (Required)
@@ -226,8 +222,8 @@ public Mono> dictMethodsWithResponseAsync(BinaryData body, Reques
      *     get: String (Required)
      *     copy: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -246,14 +242,13 @@ public Response dictMethodsWithResponse(BinaryData body, RequestOptions re
     /**
      * The withList operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     list: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -273,14 +268,13 @@ public Mono> withListWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withList operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     list: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelsImpl.java
index 2061d477dbf..273b9b0bba8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ModelsImpl.java
@@ -721,14 +721,13 @@ Response withYieldSync(@HostParam("endpoint") String endpoint,
     /**
      * The withAnd operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -748,14 +747,13 @@ public Mono> withAndWithResponseAsync(BinaryData body, RequestOpt
     /**
      * The withAnd operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -774,14 +772,13 @@ public Response withAndWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withAs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -801,14 +798,13 @@ public Mono> withAsWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The withAs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -827,14 +823,13 @@ public Response withAsWithResponse(BinaryData body, RequestOptions request
     /**
      * The withAssert operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -854,14 +849,13 @@ public Mono> withAssertWithResponseAsync(BinaryData body, Request
     /**
      * The withAssert operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -880,14 +874,13 @@ public Response withAssertWithResponse(BinaryData body, RequestOptions req
     /**
      * The withAsync operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -907,14 +900,13 @@ public Mono> withAsyncWithResponseAsync(BinaryData body, RequestO
     /**
      * The withAsync operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -933,14 +925,13 @@ public Response withAsyncWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withAwait operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -960,14 +951,13 @@ public Mono> withAwaitWithResponseAsync(BinaryData body, RequestO
     /**
      * The withAwait operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -986,14 +976,13 @@ public Response withAwaitWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withBreak operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1013,14 +1002,13 @@ public Mono> withBreakWithResponseAsync(BinaryData body, RequestO
     /**
      * The withBreak operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1039,14 +1027,13 @@ public Response withBreakWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withClass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1066,14 +1053,13 @@ public Mono> withClassWithResponseAsync(BinaryData body, RequestO
     /**
      * The withClass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1092,14 +1078,13 @@ public Response withClassWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withConstructor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1119,14 +1104,13 @@ public Mono> withConstructorWithResponseAsync(BinaryData body, Re
     /**
      * The withConstructor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1145,14 +1129,13 @@ public Response withConstructorWithResponse(BinaryData body, RequestOption
     /**
      * The withContinue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1172,14 +1155,13 @@ public Mono> withContinueWithResponseAsync(BinaryData body, Reque
     /**
      * The withContinue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1198,14 +1180,13 @@ public Response withContinueWithResponse(BinaryData body, RequestOptions r
     /**
      * The withDef operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1225,14 +1206,13 @@ public Mono> withDefWithResponseAsync(BinaryData body, RequestOpt
     /**
      * The withDef operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1251,14 +1231,13 @@ public Response withDefWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withDel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1278,14 +1257,13 @@ public Mono> withDelWithResponseAsync(BinaryData body, RequestOpt
     /**
      * The withDel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1304,14 +1282,13 @@ public Response withDelWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withElif operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1331,14 +1308,13 @@ public Mono> withElifWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withElif operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1357,14 +1333,13 @@ public Response withElifWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withElse operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1384,14 +1359,13 @@ public Mono> withElseWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withElse operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1410,14 +1384,13 @@ public Response withElseWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withExcept operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1437,14 +1410,13 @@ public Mono> withExceptWithResponseAsync(BinaryData body, Request
     /**
      * The withExcept operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1463,14 +1435,13 @@ public Response withExceptWithResponse(BinaryData body, RequestOptions req
     /**
      * The withExec operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1490,14 +1461,13 @@ public Mono> withExecWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withExec operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1516,14 +1486,13 @@ public Response withExecWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withFinally operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1543,14 +1512,13 @@ public Mono> withFinallyWithResponseAsync(BinaryData body, Reques
     /**
      * The withFinally operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1569,14 +1537,13 @@ public Response withFinallyWithResponse(BinaryData body, RequestOptions re
     /**
      * The withFor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1596,14 +1563,13 @@ public Mono> withForWithResponseAsync(BinaryData body, RequestOpt
     /**
      * The withFor operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1622,14 +1588,13 @@ public Response withForWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withFrom operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1649,14 +1614,13 @@ public Mono> withFromWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withFrom operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1675,14 +1639,13 @@ public Response withFromWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withGlobal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1702,14 +1665,13 @@ public Mono> withGlobalWithResponseAsync(BinaryData body, Request
     /**
      * The withGlobal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1728,14 +1690,13 @@ public Response withGlobalWithResponse(BinaryData body, RequestOptions req
     /**
      * The withIf operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1755,14 +1716,13 @@ public Mono> withIfWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The withIf operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1781,14 +1741,13 @@ public Response withIfWithResponse(BinaryData body, RequestOptions request
     /**
      * The withImport operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1808,14 +1767,13 @@ public Mono> withImportWithResponseAsync(BinaryData body, Request
     /**
      * The withImport operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1834,14 +1792,13 @@ public Response withImportWithResponse(BinaryData body, RequestOptions req
     /**
      * The withIn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1861,14 +1818,13 @@ public Mono> withInWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The withIn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1887,14 +1843,13 @@ public Response withInWithResponse(BinaryData body, RequestOptions request
     /**
      * The withIs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1914,14 +1869,13 @@ public Mono> withIsWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The withIs operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1940,14 +1894,13 @@ public Response withIsWithResponse(BinaryData body, RequestOptions request
     /**
      * The withLambda operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1967,14 +1920,13 @@ public Mono> withLambdaWithResponseAsync(BinaryData body, Request
     /**
      * The withLambda operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1993,14 +1945,13 @@ public Response withLambdaWithResponse(BinaryData body, RequestOptions req
     /**
      * The withNot operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2020,14 +1971,13 @@ public Mono> withNotWithResponseAsync(BinaryData body, RequestOpt
     /**
      * The withNot operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2046,14 +1996,13 @@ public Response withNotWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withOr operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2073,14 +2022,13 @@ public Mono> withOrWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The withOr operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2099,14 +2047,13 @@ public Response withOrWithResponse(BinaryData body, RequestOptions request
     /**
      * The withPass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2126,14 +2073,13 @@ public Mono> withPassWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withPass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2152,14 +2098,13 @@ public Response withPassWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withRaise operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2179,14 +2124,13 @@ public Mono> withRaiseWithResponseAsync(BinaryData body, RequestO
     /**
      * The withRaise operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2205,14 +2149,13 @@ public Response withRaiseWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withReturn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2232,14 +2175,13 @@ public Mono> withReturnWithResponseAsync(BinaryData body, Request
     /**
      * The withReturn operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2258,14 +2200,13 @@ public Response withReturnWithResponse(BinaryData body, RequestOptions req
     /**
      * The withTry operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2285,14 +2226,13 @@ public Mono> withTryWithResponseAsync(BinaryData body, RequestOpt
     /**
      * The withTry operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2311,14 +2251,13 @@ public Response withTryWithResponse(BinaryData body, RequestOptions reques
     /**
      * The withWhile operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2338,14 +2277,13 @@ public Mono> withWhileWithResponseAsync(BinaryData body, RequestO
     /**
      * The withWhile operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2364,14 +2302,13 @@ public Response withWhileWithResponse(BinaryData body, RequestOptions requ
     /**
      * The withWith operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2391,14 +2328,13 @@ public Mono> withWithWithResponseAsync(BinaryData body, RequestOp
     /**
      * The withWith operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2417,14 +2353,13 @@ public Response withWithWithResponse(BinaryData body, RequestOptions reque
     /**
      * The withYield operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2444,14 +2379,13 @@ public Mono> withYieldWithResponseAsync(BinaryData body, RequestO
     /**
      * The withYield operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ReservedOperationBodyParamsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ReservedOperationBodyParamsImpl.java
index 95e0c17916f..a9cd6601ce7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ReservedOperationBodyParamsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/implementation/ReservedOperationBodyParamsImpl.java
@@ -82,16 +82,15 @@ Response withItemsSync(@HostParam("endpoint") String endpoint,
     /**
      * The withItems operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param withItemsRequest The withItemsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,16 +110,15 @@ public Mono> withItemsWithResponseAsync(BinaryData withItemsReque
     /**
      * The withItems operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     items (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param withItemsRequest The withItemsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlAsyncClient.java
index 53049ae37d3..2ee7b27742b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlAsyncClient.java
@@ -40,12 +40,11 @@ public final class JsonlAsyncClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -64,12 +63,11 @@ public Mono> sendWithResponse(BinaryData body, RequestOptions req
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlClient.java
index 4b5a4666fcb..140613cb547 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/JsonlClient.java
@@ -38,12 +38,11 @@ public final class JsonlClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -62,12 +61,11 @@ public Response sendWithResponse(BinaryData body, RequestOptions requestOp
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/implementation/BasicsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/implementation/BasicsImpl.java
index 633eb69a5e1..c8fde233a76 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/implementation/BasicsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/jsonl/implementation/BasicsImpl.java
@@ -99,12 +99,11 @@ Response receiveSync(@HostParam("endpoint") String endpoint, @Header
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -124,12 +123,11 @@ public Mono> sendWithResponseAsync(BinaryData body, RequestOption
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -148,12 +146,11 @@ public Response sendWithResponse(BinaryData body, RequestOptions requestOp
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -172,12 +169,11 @@ public Mono> receiveWithResponseAsync(RequestOptions reques
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedAsyncClient.java
index f7bf75c3120..72c15ec0767 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedAsyncClient.java
@@ -40,12 +40,11 @@ public final class NamedAsyncClient {
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedClient.java
index 918a35562e1..3a111a727dc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/NamedClient.java
@@ -38,12 +38,11 @@ public final class NamedClient {
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveAsyncClient.java
index 2d67ca67fef..9c7ac76bddd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveAsyncClient.java
@@ -41,22 +41,19 @@ public final class RetrieveAsyncClient {
     /**
      * The stream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     query: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveClient.java
index 9f9df3a0e8d..7e33f1c7e2d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/RetrieveClient.java
@@ -39,22 +39,19 @@ public final class RetrieveClient {
     /**
      * The stream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     query: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedAsyncClient.java
index 9b91d60e2e7..0baf0924f50 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedAsyncClient.java
@@ -40,12 +40,11 @@ public final class UnnamedAsyncClient {
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedClient.java
index d093242a98f..676b5e81aa2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/UnnamedClient.java
@@ -38,12 +38,11 @@ public final class UnnamedClient {
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/NamedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/NamedsImpl.java
index 5076f93eb62..ae4b7e01203 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/NamedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/NamedsImpl.java
@@ -78,12 +78,11 @@ Response receiveSync(@HostParam("endpoint") String endpoint, @Header
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -102,12 +101,11 @@ public Mono> receiveWithResponseAsync(RequestOptions reques
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/RetrievesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/RetrievesImpl.java
index 8cc1d7cb9ec..ad9dd15449c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/RetrievesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/RetrievesImpl.java
@@ -82,22 +82,19 @@ Response streamSync(@HostParam("endpoint") String endpoint,
     /**
      * The stream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     query: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -118,22 +115,19 @@ public Mono> streamWithResponseAsync(BinaryData request, Re
     /**
      * The stream operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     query: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/UnnamedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/UnnamedsImpl.java
index fae4d12235b..997379b55eb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/UnnamedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/streaming/sse/implementation/UnnamedsImpl.java
@@ -78,12 +78,11 @@ Response receiveSync(@HostParam("endpoint") String endpoint, @Header
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -102,12 +101,11 @@ public Mono> receiveWithResponseAsync(RequestOptions reques
     /**
      * The receive operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinAsyncClient.java
index d5741af7c39..afb0917a6f9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinAsyncClient.java
@@ -45,24 +45,23 @@ public final class BuiltinAsyncClient {
      * The read operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -103,8 +102,8 @@ public final class BuiltinAsyncClient {
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param queryParamEncoded The queryParamEncoded parameter.
@@ -125,9 +124,8 @@ public Mono> readWithResponse(String queryParam, String que
     /**
      * The write operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -168,8 +166,8 @@ public Mono> readWithResponse(String queryParam, String que
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinClient.java
index bd2fb3d0c98..6f719a95061 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/BuiltinClient.java
@@ -43,24 +43,23 @@ public final class BuiltinClient {
      * The read operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -101,8 +100,8 @@ public final class BuiltinClient {
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param queryParamEncoded The queryParamEncoded parameter.
@@ -123,9 +122,8 @@ public Response readWithResponse(String queryParam, String queryPara
     /**
      * The write operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -166,8 +164,8 @@ public Response readWithResponse(String queryParam, String queryPara
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java
index 009b00691a7..2c6a72f292b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/builtin/implementation/BuiltinOpsImpl.java
@@ -105,24 +105,23 @@ Response writeSync(@HostParam("endpoint") String endpoint,
      * The read operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -163,8 +162,8 @@ Response writeSync(@HostParam("endpoint") String endpoint,
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param queryParamEncoded The queryParamEncoded parameter.
@@ -187,24 +186,23 @@ public Mono> readWithResponseAsync(String queryParam, Strin
      * The read operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
query-optStringNoThe queryParamOptional parameter
query-opt-encodedStringNoThe queryParamOptionalEncoded parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter
Header Parameters
NameTypeRequiredDescription
x-ms-dateOffsetDateTimeNoThe dateTime parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -245,8 +243,8 @@ public Mono> readWithResponseAsync(String queryParam, Strin
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryParam The queryParam parameter.
      * @param queryParamEncoded The queryParamEncoded parameter.
@@ -268,9 +266,8 @@ public Response readWithResponse(String queryParam, String queryPara
     /**
      * The write operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -311,8 +308,8 @@ public Response readWithResponse(String queryParam, String queryPara
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -332,9 +329,8 @@ public Mono> writeWithResponseAsync(BinaryData body, RequestOptio
     /**
      * The write operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
@@ -375,8 +371,8 @@ public Mono> writeWithResponseAsync(BinaryData body, RequestOptio
      *     }
      *     uuid: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionAsyncClient.java
index 39d64dd2d43..5359a661138 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionAsyncClient.java
@@ -41,15 +41,14 @@ public final class ClientOptionAsyncClient {
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timespan: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param filter The filter parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionClient.java
index 4cf55e99169..a5b1306d5a0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/ClientOptionClient.java
@@ -39,15 +39,14 @@ public final class ClientOptionClient {
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timespan: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param filter The filter parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/implementation/ClientRequiredsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/implementation/ClientRequiredsImpl.java
index 7b1e038a3c9..5ae8422e9fc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/implementation/ClientRequiredsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/clientoption/implementation/ClientRequiredsImpl.java
@@ -83,15 +83,14 @@ Response postSync(@HostParam("endpoint") String endpoint, @HeaderParam("ac
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timespan: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param filter The filter parameter.
      * @param body The body parameter.
@@ -113,15 +112,14 @@ public Mono> postWithResponseAsync(String filter, BinaryData body
     /**
      * The post operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     timespan: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param filter The filter parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java
index 615aa6128a5..62d697e2b0f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesAsyncClient.java
@@ -43,16 +43,15 @@ public final class DiscriminatorEdgeCasesAsyncClient {
     /**
      * The getChildRequiredDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     anotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,17 +69,16 @@ public Mono> getChildRequiredDiscrimWithResponse(RequestOpt
     /**
      * The getChildNewDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     differentDiscriminator: String (Required)
      *     yetAnotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -98,15 +96,14 @@ public Mono> getChildNewDiscrimWithResponse(RequestOptions
     /**
      * The getNoSubtypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java
index 81006ef04e8..6635de3282b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/DiscriminatorEdgeCasesClient.java
@@ -41,16 +41,15 @@ public final class DiscriminatorEdgeCasesClient {
     /**
      * The getChildRequiredDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     anotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,17 +67,16 @@ public Response getChildRequiredDiscrimWithResponse(RequestOptions r
     /**
      * The getChildNewDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     differentDiscriminator: String (Required)
      *     yetAnotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -96,15 +94,14 @@ public Response getChildNewDiscrimWithResponse(RequestOptions reques
     /**
      * The getNoSubtypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java
index f76c06ec6ca..9cb4a35896d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/implementation/DiscriminatorEdgeCasesClientImpl.java
@@ -183,16 +183,15 @@ Response getNoSubtypesSync(@HostParam("endpoint") String endpoint,
     /**
      * The getChildRequiredDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     anotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -211,16 +210,15 @@ public Mono> getChildRequiredDiscrimWithResponseAsync(Reque
     /**
      * The getChildRequiredDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     anotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -238,17 +236,16 @@ public Response getChildRequiredDiscrimWithResponse(RequestOptions r
     /**
      * The getChildNewDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     differentDiscriminator: String (Required)
      *     yetAnotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -267,17 +264,16 @@ public Mono> getChildNewDiscrimWithResponseAsync(RequestOpt
     /**
      * The getChildNewDiscrim operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     discriminator: String (Required)
      *     aProperty: String (Required)
      *     differentDiscriminator: String (Required)
      *     yetAnotherProperty: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -295,15 +291,14 @@ public Response getChildNewDiscrimWithResponse(RequestOptions reques
     /**
      * The getNoSubtypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -322,15 +317,14 @@ public Mono> getNoSubtypesWithResponseAsync(RequestOptions
     /**
      * The getNoSubtypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorAsyncClient.java
index 9cef4295ee5..45ab2bf644e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorAsyncClient.java
@@ -41,23 +41,21 @@ public final class EnumNestedDiscriminatorAsyncClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -68,15 +66,14 @@ public Mono> getModelWithResponse(RequestOptions requestOpt
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -95,23 +92,21 @@ public Mono> putModelWithResponse(BinaryData input, RequestOption
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -122,15 +117,14 @@ public Mono> getRecursiveModelWithResponse(RequestOptions r
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,23 +143,21 @@ public Mono> putRecursiveModelWithResponse(BinaryData input, Requ
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -176,23 +168,21 @@ public Mono> getMissingDiscriminatorWithResponse(RequestOpt
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClient.java
index d301486fc39..9acbed27157 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/EnumNestedDiscriminatorClient.java
@@ -39,23 +39,21 @@ public final class EnumNestedDiscriminatorClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -66,15 +64,14 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -93,23 +90,21 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -120,15 +115,14 @@ public Response getRecursiveModelWithResponse(RequestOptions request
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -147,23 +141,21 @@ public Response putRecursiveModelWithResponse(BinaryData input, RequestOpt
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -174,23 +166,21 @@ public Response getMissingDiscriminatorWithResponse(RequestOptions r
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/implementation/EnumNestedDiscriminatorClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/implementation/EnumNestedDiscriminatorClientImpl.java
index 5fe19752988..e56359a54b9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/implementation/EnumNestedDiscriminatorClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/implementation/EnumNestedDiscriminatorClientImpl.java
@@ -243,23 +243,21 @@ Response getWrongDiscriminatorSync(@HostParam("endpoint") String end
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getModelWithResponseAsync(RequestOptions requestOptions) {
@@ -270,23 +268,21 @@ public Mono> getModelWithResponseAsync(RequestOptions reque
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getModelWithResponse(RequestOptions requestOptions) {
@@ -297,15 +293,14 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -325,15 +320,14 @@ public Mono> putModelWithResponseAsync(BinaryData input, RequestO
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -352,23 +346,21 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getRecursiveModelWithResponseAsync(RequestOptions requestOptions) {
@@ -380,23 +372,21 @@ public Mono> getRecursiveModelWithResponseAsync(RequestOpti
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getRecursiveModelWithResponse(RequestOptions requestOptions) {
@@ -407,15 +397,14 @@ public Response getRecursiveModelWithResponse(RequestOptions request
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -435,15 +424,14 @@ public Mono> putRecursiveModelWithResponseAsync(BinaryData input,
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -462,23 +450,21 @@ public Response putRecursiveModelWithResponse(BinaryData input, RequestOpt
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getMissingDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -490,23 +476,21 @@ public Mono> getMissingDiscriminatorWithResponseAsync(Reque
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getMissingDiscriminatorWithResponse(RequestOptions requestOptions) {
@@ -517,23 +501,21 @@ public Response getMissingDiscriminatorWithResponse(RequestOptions r
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWrongDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -545,23 +527,21 @@ public Mono> getWrongDiscriminatorWithResponseAsync(Request
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(shark/salmon) (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWrongDiscriminatorWithResponse(RequestOptions requestOptions) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java
index 05cdcbebba0..b5edf6020ba 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java
@@ -51,12 +51,11 @@ public final class EnumServiceAsyncClient {
     /**
      * The getColor operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,12 +73,11 @@ public Mono> getColorWithResponse(RequestOptions requestOpt
     /**
      * The getColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -97,9 +95,8 @@ public Mono> getColorModelWithResponse(RequestOptions reque
     /**
      * The setColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -115,8 +112,8 @@ public Mono> getColorModelWithResponse(RequestOptions reque
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param color The color parameter. Allowed values: "Red", "Blue", "Green".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -135,9 +132,8 @@ public Mono> setColorModelWithResponse(String color, Reques
     /**
      * The setPriority operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -153,8 +149,8 @@ public Mono> setColorModelWithResponse(String color, Reques
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param priority The priority parameter. Allowed values: 100, 0.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -173,9 +169,8 @@ public Mono> setPriorityWithResponse(String priority, Reque
     /**
      * The getRunningOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -191,8 +186,8 @@ public Mono> setPriorityWithResponse(String priority, Reque
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -210,9 +205,8 @@ public Mono> getRunningOperationWithResponse(RequestOptions
     /**
      * The getOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -228,8 +222,8 @@ public Mono> getRunningOperationWithResponse(RequestOptions
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param state The state parameter. Allowed values: "Running", "Completed", "Failed".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -249,19 +243,17 @@ public Mono> getOperationWithResponse(String state, Request
      * The setStringEnumArray operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of
-     * "," separated string.
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of "," separated string.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param colorArray The colorArray parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -481,20 +473,17 @@ public Mono> setStringEnumArrayHeaderWithResponse(List co
     /**
      * The getWrongBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -658,7 +647,7 @@ public Mono setStringEnumArray(List colorArray, List Objects.toString(paramItemValue, ""))
             .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono)
-                .map(protocolMethodData -> protocolMethodData.toString());
+            .map(protocolMethodData -> protocolMethodData.toString());
     }
 
     /**
@@ -681,7 +670,7 @@ public Mono setStringEnumArray(List colorArray) {
         return setStringEnumArrayWithResponse(colorArray.stream()
             .map(paramItemValue -> Objects.toString(paramItemValue, ""))
             .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono)
-                .map(protocolMethodData -> protocolMethodData.toString());
+            .map(protocolMethodData -> protocolMethodData.toString());
     }
 
     /**
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java
index bb7644b4002..7c5294af598 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceClient.java
@@ -49,12 +49,11 @@ public final class EnumServiceClient {
     /**
      * The getColor operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,12 +71,11 @@ public Response getColorWithResponse(RequestOptions requestOptions)
     /**
      * The getColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -95,9 +93,8 @@ public Response getColorModelWithResponse(RequestOptions requestOpti
     /**
      * The setColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -113,8 +110,8 @@ public Response getColorModelWithResponse(RequestOptions requestOpti
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param color The color parameter. Allowed values: "Red", "Blue", "Green".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -133,9 +130,8 @@ public Response setColorModelWithResponse(String color, RequestOptio
     /**
      * The setPriority operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -151,8 +147,8 @@ public Response setColorModelWithResponse(String color, RequestOptio
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param priority The priority parameter. Allowed values: 100, 0.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -171,9 +167,8 @@ public Response setPriorityWithResponse(String priority, RequestOpti
     /**
      * The getRunningOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -189,8 +184,8 @@ public Response setPriorityWithResponse(String priority, RequestOpti
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -208,9 +203,8 @@ public Response getRunningOperationWithResponse(RequestOptions reque
     /**
      * The getOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -226,8 +220,8 @@ public Response getRunningOperationWithResponse(RequestOptions reque
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param state The state parameter. Allowed values: "Running", "Completed", "Failed".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -247,19 +241,17 @@ public Response getOperationWithResponse(String state, RequestOption
      * The setStringEnumArray operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of
-     * "," separated string.
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of "," separated string.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param colorArray The colorArray parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -477,20 +469,17 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr
     /**
      * The getWrongBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java
index f625bf86399..4b465fe96d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/implementation/EnumServiceClientImpl.java
@@ -441,12 +441,11 @@ Response getWrongBodySync(@HostParam("endpoint") String endpoint,
     /**
      * The getColor operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -464,12 +463,11 @@ public Mono> getColorWithResponseAsync(RequestOptions reque
     /**
      * The getColor operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -487,12 +485,11 @@ public Response getColorWithResponse(RequestOptions requestOptions)
     /**
      * The getColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -511,12 +508,11 @@ public Mono> getColorModelWithResponseAsync(RequestOptions
     /**
      * The getColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Red/Blue/Green)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -534,9 +530,8 @@ public Response getColorModelWithResponse(RequestOptions requestOpti
     /**
      * The setColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -552,8 +547,8 @@ public Response getColorModelWithResponse(RequestOptions requestOpti
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param color The color parameter. Allowed values: "Red", "Blue", "Green".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -573,9 +568,8 @@ public Mono> setColorModelWithResponseAsync(String color, R
     /**
      * The setColorModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -591,8 +585,8 @@ public Mono> setColorModelWithResponseAsync(String color, R
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param color The color parameter. Allowed values: "Red", "Blue", "Green".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -611,9 +605,8 @@ public Response setColorModelWithResponse(String color, RequestOptio
     /**
      * The setPriority operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -629,8 +622,8 @@ public Response setColorModelWithResponse(String color, RequestOptio
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param priority The priority parameter. Allowed values: 100, 0.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -650,9 +643,8 @@ public Mono> setPriorityWithResponseAsync(String priority,
     /**
      * The setPriority operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -668,8 +660,8 @@ public Mono> setPriorityWithResponseAsync(String priority,
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param priority The priority parameter. Allowed values: 100, 0.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -688,9 +680,8 @@ public Response setPriorityWithResponse(String priority, RequestOpti
     /**
      * The getRunningOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -706,8 +697,8 @@ public Response setPriorityWithResponse(String priority, RequestOpti
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -727,9 +718,8 @@ public Mono> getRunningOperationWithResponseAsync(RequestOp
     /**
      * The getRunningOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -745,8 +735,8 @@ public Mono> getRunningOperationWithResponseAsync(RequestOp
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -765,9 +755,8 @@ public Response getRunningOperationWithResponse(RequestOptions reque
     /**
      * The getOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -783,8 +772,8 @@ public Response getRunningOperationWithResponse(RequestOptions reque
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param state The state parameter. Allowed values: "Running", "Completed", "Failed".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -804,9 +793,8 @@ public Mono> getOperationWithResponseAsync(String state, Re
     /**
      * The getOperation operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String(Read/Write) (Required)
      *     best: boolean (Required)
@@ -822,8 +810,8 @@ public Mono> getOperationWithResponseAsync(String state, Re
      *     olympicRecordValue: String(9.58/19.3) (Optional)
      *     reasoning_effort: String(none/minimal/low/medium/high/xhigh) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param state The state parameter. Allowed values: "Running", "Completed", "Failed".
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -843,19 +831,17 @@ public Response getOperationWithResponse(String state, RequestOption
      * The setStringEnumArray operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of
-     * "," separated string.
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of "," separated string.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param colorArray The colorArray parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -880,19 +866,17 @@ public Mono> setStringEnumArrayWithResponseAsync(ListQuery Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of
-     * "," separated string.
Query Parameters
NameTypeRequiredDescription
colorArrayOptList<String>NoThe colorArrayOpt parameter. In the form of "," separated string.

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param colorArray The colorArray parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1350,20 +1334,17 @@ public Response setStringEnumArrayHeaderWithResponse(List colorArr
     /**
      * The getWrongBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1384,20 +1365,17 @@ public Mono> getWrongBodyWithResponseAsync(BinaryData body,
     /**
      * The getWrongBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java
index 5626e971b47..9b06cebfe03 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java
@@ -40,9 +40,8 @@ public final class ErrorModelAsyncClient {
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     error (Required): {
@@ -68,8 +67,8 @@ public final class ErrorModelAsyncClient {
      *         subCode: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws BatchErrorException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelClient.java
index 7e18ba75330..871fe612d01 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/ErrorModelClient.java
@@ -38,9 +38,8 @@ public final class ErrorModelClient {
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     error (Required): {
@@ -66,8 +65,8 @@ public final class ErrorModelClient {
      *         subCode: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws BatchErrorException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java
index 3f1ae69cf89..7dfea81beae 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java
@@ -75,9 +75,8 @@ Response readSync(@HostParam("endpoint") String endpoint, @HeaderPar
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     error (Required): {
@@ -103,8 +102,8 @@ Response readSync(@HostParam("endpoint") String endpoint, @HeaderPar
      *         subCode: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws BatchErrorException thrown if the request is rejected by server.
@@ -122,9 +121,8 @@ public Mono> readWithResponseAsync(RequestOptions requestOp
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     error (Required): {
@@ -150,8 +148,8 @@ public Mono> readWithResponseAsync(RequestOptions requestOp
      *         subCode: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws BatchErrorException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java
index cdc91d4602e..21d98f8689a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalAsyncClient.java
@@ -41,26 +41,23 @@ public final class ExternalAsyncClient {
     /**
      * The postExternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java
index 0cec3803c0d..50291c48ef4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/ExternalClient.java
@@ -39,26 +39,23 @@ public final class ExternalClient {
     /**
      * The postExternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java
index ecb9a4c1626..1c8fbd7d342 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/external/implementation/ExternalOpsImpl.java
@@ -82,26 +82,23 @@ Response postExternalSync(@HostParam("endpoint") String endpoint,
     /**
      * The postExternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -122,26 +119,23 @@ public Mono> postExternalWithResponseAsync(BinaryData body,
     /**
      * The postExternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     cloudEventDataFormat: String(BYTES/JSON) (Optional)
      *     dayOfWeek: String(Sunday/Monday/Tuesday/Wednesday/Thursday/Friday/Saturday) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java
index 783df036517..7e8197d9102 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java
@@ -50,15 +50,14 @@ public final class FlattenAsyncClient {
      * The send operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     endpoint: String (Required)
      *     user (Optional): {
@@ -68,8 +67,8 @@ public final class FlattenAsyncClient {
      *     constant: String (Required)
      *     requiredInt: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -89,14 +88,13 @@ public Mono> sendWithResponse(String id, BinaryData sendRequest,
     /**
      * The sendProjectedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     file_id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendProjectedNameRequest The sendProjectedNameRequest parameter.
@@ -118,15 +116,14 @@ public Mono> sendProjectedNameWithResponse(String id, BinaryData
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -144,8 +141,8 @@ public Mono> sendProjectedNameWithResponse(String id, BinaryData
      *     _dummy: String (Optional)
      *     constant: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -166,9 +163,8 @@ public Mono> sendLongWithResponse(String name, BinaryData sendLon
     /**
      * The update operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     patch (Optional, Required on create): {
      *         title: String (Optional)
@@ -176,13 +172,11 @@ public Mono> sendLongWithResponse(String name, BinaryData sendLon
      *         status: String(NotStarted/InProgress/Completed) (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: long (Required)
      *     title: String (Required)
@@ -193,8 +187,8 @@ public Mono> sendLongWithResponse(String name, BinaryData sendLon
      *     completedAt: OffsetDateTime (Optional)
      *     _dummy: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param updateRequest The updateRequest parameter.
@@ -215,14 +209,13 @@ public Mono> updateWithResponse(long id, BinaryData updateR
     /**
      * The sendOptionalBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendOptionalBodyRequest The sendOptionalBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -338,12 +331,12 @@ public Mono sendLong(SendLongOptions options) {
         String filter = options.getFilter();
         SendLongRequest sendLongRequestObj = new SendLongRequest(options.getInput(), options.getDataInt(),
             options.getRequiredUser(), options.getTitle(), options.getStatus()).setUser(options.getUser())
-                .setDataIntOptional(options.getDataIntOptional())
-                .setDataLong(options.getDataLong())
-                .setDataFloat(options.getDataFloat())
-                .setLongProperty(options.getLongParameter())
-                .setDescription(options.getDescription())
-                .setDummy(options.getDummy());
+            .setDataIntOptional(options.getDataIntOptional())
+            .setDataLong(options.getDataLong())
+            .setDataFloat(options.getDataFloat())
+            .setLongProperty(options.getLongParameter())
+            .setDescription(options.getDescription())
+            .setDummy(options.getDummy());
         BinaryData sendLongRequest = BinaryData.fromObject(sendLongRequestObj);
         if (filter != null) {
             requestOptions.addQueryParam("filter", filter, false);
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java
index 43889d1c8df..cdece140688 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java
@@ -48,15 +48,14 @@ public final class FlattenClient {
      * The send operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     endpoint: String (Required)
      *     user (Optional): {
@@ -66,8 +65,8 @@ public final class FlattenClient {
      *     constant: String (Required)
      *     requiredInt: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -87,14 +86,13 @@ public Response sendWithResponse(String id, BinaryData sendRequest, Reques
     /**
      * The sendProjectedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     file_id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendProjectedNameRequest The sendProjectedNameRequest parameter.
@@ -116,15 +114,14 @@ public Response sendProjectedNameWithResponse(String id, BinaryData sendPr
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -142,8 +139,8 @@ public Response sendProjectedNameWithResponse(String id, BinaryData sendPr
      *     _dummy: String (Optional)
      *     constant: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -163,9 +160,8 @@ public Response sendLongWithResponse(String name, BinaryData sendLongReque
     /**
      * The update operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     patch (Optional, Required on create): {
      *         title: String (Optional)
@@ -173,13 +169,11 @@ public Response sendLongWithResponse(String name, BinaryData sendLongReque
      *         status: String(NotStarted/InProgress/Completed) (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: long (Required)
      *     title: String (Required)
@@ -190,8 +184,8 @@ public Response sendLongWithResponse(String name, BinaryData sendLongReque
      *     completedAt: OffsetDateTime (Optional)
      *     _dummy: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param updateRequest The updateRequest parameter.
@@ -211,14 +205,13 @@ public Response updateWithResponse(long id, BinaryData updateRequest
     /**
      * The sendOptionalBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendOptionalBodyRequest The sendOptionalBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,12 +323,12 @@ public void sendLong(SendLongOptions options) {
         String filter = options.getFilter();
         SendLongRequest sendLongRequestObj = new SendLongRequest(options.getInput(), options.getDataInt(),
             options.getRequiredUser(), options.getTitle(), options.getStatus()).setUser(options.getUser())
-                .setDataIntOptional(options.getDataIntOptional())
-                .setDataLong(options.getDataLong())
-                .setDataFloat(options.getDataFloat())
-                .setLongProperty(options.getLongParameter())
-                .setDescription(options.getDescription())
-                .setDummy(options.getDummy());
+            .setDataIntOptional(options.getDataIntOptional())
+            .setDataLong(options.getDataLong())
+            .setDataFloat(options.getDataFloat())
+            .setLongProperty(options.getLongParameter())
+            .setDescription(options.getDescription())
+            .setDummy(options.getDummy());
         BinaryData sendLongRequest = BinaryData.fromObject(sendLongRequestObj);
         if (filter != null) {
             requestOptions.addQueryParam("filter", filter, false);
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/implementation/FlattenClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/implementation/FlattenClientImpl.java
index c4fa3266149..9c8ca3078e8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/implementation/FlattenClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/implementation/FlattenClientImpl.java
@@ -258,15 +258,14 @@ Response sendOptionalBodySync(@HostParam("endpoint") String endpoint,
      * The send operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     endpoint: String (Required)
      *     user (Optional): {
@@ -276,8 +275,8 @@ Response sendOptionalBodySync(@HostParam("endpoint") String endpoint,
      *     constant: String (Required)
      *     requiredInt: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -301,15 +300,14 @@ public Mono> sendWithResponseAsync(String id, BinaryData sendRequ
      * The send operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxpagesizeIntegerNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     endpoint: String (Required)
      *     user (Optional): {
@@ -319,8 +317,8 @@ public Mono> sendWithResponseAsync(String id, BinaryData sendRequ
      *     constant: String (Required)
      *     requiredInt: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -342,14 +340,13 @@ public Response sendWithResponse(String id, BinaryData sendRequest, Reques
     /**
      * The sendProjectedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     file_id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendProjectedNameRequest The sendProjectedNameRequest parameter.
@@ -371,14 +368,13 @@ public Mono> sendProjectedNameWithResponseAsync(String id, Binary
     /**
      * The sendProjectedName operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     file_id: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendProjectedNameRequest The sendProjectedNameRequest parameter.
@@ -401,15 +397,14 @@ public Response sendProjectedNameWithResponse(String id, BinaryData sendPr
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -427,8 +422,8 @@ public Response sendProjectedNameWithResponse(String id, BinaryData sendPr
      *     _dummy: String (Optional)
      *     constant: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -451,15 +446,14 @@ public Mono> sendLongWithResponseAsync(String name, BinaryData se
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -477,8 +471,8 @@ public Mono> sendLongWithResponseAsync(String name, BinaryData se
      *     _dummy: String (Optional)
      *     constant: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -499,9 +493,8 @@ public Response sendLongWithResponse(String name, BinaryData sendLongReque
     /**
      * The update operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     patch (Optional, Required on create): {
      *         title: String (Optional)
@@ -509,13 +502,11 @@ public Response sendLongWithResponse(String name, BinaryData sendLongReque
      *         status: String(NotStarted/InProgress/Completed) (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: long (Required)
      *     title: String (Required)
@@ -526,8 +517,8 @@ public Response sendLongWithResponse(String name, BinaryData sendLongReque
      *     completedAt: OffsetDateTime (Optional)
      *     _dummy: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param updateRequest The updateRequest parameter.
@@ -550,9 +541,8 @@ public Mono> updateWithResponseAsync(long id, BinaryData up
     /**
      * The update operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     patch (Optional, Required on create): {
      *         title: String (Optional)
@@ -560,13 +550,11 @@ public Mono> updateWithResponseAsync(long id, BinaryData up
      *         status: String(NotStarted/InProgress/Completed) (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: long (Required)
      *     title: String (Required)
@@ -577,8 +565,8 @@ public Mono> updateWithResponseAsync(long id, BinaryData up
      *     completedAt: OffsetDateTime (Optional)
      *     _dummy: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param updateRequest The updateRequest parameter.
@@ -600,14 +588,13 @@ public Response updateWithResponse(long id, BinaryData updateRequest
     /**
      * The sendOptionalBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendOptionalBodyRequest The sendOptionalBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -628,14 +615,13 @@ public Mono> sendOptionalBodyWithResponseAsync(BinaryData sendOpt
     /**
      * The sendOptionalBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendOptionalBodyRequest The sendOptionalBodyRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalAsyncClient.java
index 741e46e36a7..89970344b2d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalAsyncClient.java
@@ -43,28 +43,25 @@ public final class InternalAsyncClient {
     /**
      * The postInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -83,14 +80,13 @@ public Mono> postInternalWithResponse(BinaryData body, Requ
     /**
      * The getInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -108,14 +104,13 @@ Mono> getInternalWithResponse(RequestOptions requestOptions
     /**
      * The postProtocalInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalClient.java
index 229e175da20..64f89c58d6d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/InternalClient.java
@@ -41,28 +41,25 @@ public final class InternalClient {
     /**
      * The postInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -81,14 +78,13 @@ public Response postInternalWithResponse(BinaryData body, RequestOpt
     /**
      * The getInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -106,14 +102,13 @@ Response getInternalWithResponse(RequestOptions requestOptions) {
     /**
      * The postProtocalInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/implementation/InternalOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/implementation/InternalOpsImpl.java
index 03198d62bf8..feeb5b003a4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/implementation/InternalOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/internal/implementation/InternalOpsImpl.java
@@ -121,28 +121,25 @@ Response postProtocalInternalSync(@HostParam("endpoint") String endpoint,
     /**
      * The postInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -163,28 +160,25 @@ public Mono> postInternalWithResponseAsync(BinaryData body,
     /**
      * The postInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -205,14 +199,13 @@ public Response postInternalWithResponse(BinaryData body, RequestOpt
     /**
      * The getInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -231,14 +224,13 @@ public Mono> getInternalWithResponseAsync(RequestOptions re
     /**
      * The getInternal operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -256,14 +248,13 @@ public Response getInternalWithResponse(RequestOptions requestOption
     /**
      * The postProtocalInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -283,14 +274,13 @@ public Mono> postProtocalInternalWithResponseAsync(BinaryData bod
     /**
      * The postProtocalInternal operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceAsyncClient.java
index eb1a0778eaa..a1277f3a5df 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceAsyncClient.java
@@ -43,33 +43,29 @@ public final class LiteralServiceAsyncClient {
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed
-     * values: "optionalLiteralParam".
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed values: "optionalLiteralParam".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceClient.java
index 75ff2aacc58..a5c0e0d4eff 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/LiteralServiceClient.java
@@ -41,33 +41,29 @@ public final class LiteralServiceClient {
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed
-     * values: "optionalLiteralParam".
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed values: "optionalLiteralParam".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/implementation/LiteralOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/implementation/LiteralOpsImpl.java
index b6bcb81fce3..2fe0f210419 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/implementation/LiteralOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/literalservice/implementation/LiteralOpsImpl.java
@@ -86,33 +86,29 @@ Response putSync(@HostParam("endpoint") String endpoint,
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed
-     * values: "optionalLiteralParam".
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed values: "optionalLiteralParam".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -135,33 +131,29 @@ public Mono> putWithResponseAsync(BinaryData body, RequestO
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed
-     * values: "optionalLiteralParam".
Query Parameters
NameTypeRequiredDescription
optionalLiteralParamStringNoThe optionalLiteralParam parameter. Allowed values: "optionalLiteralParam".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     literal: String (Required)
      *     optionalLiteral: String(optionalLiteral) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningAsyncClient.java
index d9657320b70..c381f1686f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningAsyncClient.java
@@ -61,9 +61,8 @@ public PollerFlux beginLongRunning(RequestOptions reques
     /**
      * A remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -86,15 +85,13 @@ public PollerFlux beginLongRunning(RequestOptions reques
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait
-     * before polling the operation status.
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait before polling the operation status.

      * 
      * @param id The id parameter.
@@ -115,30 +112,26 @@ public Mono> getJobWithResponse(String id, RequestOptions r
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -158,8 +151,8 @@ public Mono> getJobWithResponse(String id, RequestOptions r
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningClient.java
index 6943afdf042..f7fa3d5ac08 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningClient.java
@@ -59,9 +59,8 @@ public SyncPoller beginLongRunning(RequestOptions reques
     /**
      * A remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -84,15 +83,13 @@ public SyncPoller beginLongRunning(RequestOptions reques
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait
-     * before polling the operation status.
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait before polling the operation status.

      * 
      * @param id The id parameter.
@@ -113,30 +110,26 @@ public Response getJobWithResponse(String id, RequestOptions request
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -156,8 +149,8 @@ public Response getJobWithResponse(String id, RequestOptions request
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/implementation/LongRunningClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/implementation/LongRunningClientImpl.java
index 867fe722bbf..000e923def3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/implementation/LongRunningClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/implementation/LongRunningClientImpl.java
@@ -339,9 +339,8 @@ public SyncPoller beginLongRunning(RequestOptions reques
     /**
      * A remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -364,15 +363,13 @@ public SyncPoller beginLongRunning(RequestOptions reques
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait
-     * before polling the operation status.
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait before polling the operation status.

      * 
      * @param id The id parameter.
@@ -393,9 +390,8 @@ public Mono> getJobWithResponseAsync(String id, RequestOpti
     /**
      * A remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -418,15 +414,13 @@ public Mono> getJobWithResponseAsync(String id, RequestOpti
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait
-     * before polling the operation status.
Response Headers
NameTypeDescription
Retry-AfterintThe Retry-After header can indicate how long the client should wait before polling the operation status.

      * 
      * @param id The id parameter.
@@ -448,30 +442,26 @@ public Response getJobWithResponse(String id, RequestOptions request
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -491,8 +481,8 @@ public Response getJobWithResponse(String id, RequestOptions request
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -528,30 +518,26 @@ private Mono> createJobWithResponseAsync(BinaryData body, R
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -571,8 +557,8 @@ private Mono> createJobWithResponseAsync(BinaryData body, R
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -608,30 +594,26 @@ private Response createJobWithResponse(BinaryData body, RequestOptio
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -651,8 +633,8 @@ private Response createJobWithResponse(BinaryData body, RequestOptio
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -681,30 +663,26 @@ public PollerFlux beginCreateJobWithModelAsync(Binar
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -724,8 +702,8 @@ public PollerFlux beginCreateJobWithModelAsync(Binar
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -754,30 +732,26 @@ public SyncPoller beginCreateJobWithModel(BinaryData
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -797,8 +771,8 @@ public SyncPoller beginCreateJobWithModel(BinaryData
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -826,30 +800,26 @@ public PollerFlux beginCreateJobAsync(BinaryData body, R
      * A remote procedure call (RPC) operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     configuration: String (Optional)
      *     nullableFloatDict (Required): {
      *         String: Double (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(notStarted/running/Succeeded/Failed/canceled) (Required)
@@ -869,8 +839,8 @@ public PollerFlux beginCreateJobAsync(BinaryData body, R
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelAsyncClient.java
index 5cae4024e55..57bcb3e2e69 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelAsyncClient.java
@@ -58,31 +58,28 @@ public final class MaxOverloadModelAsyncClient {
      * The create operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param body The body parameter.
@@ -102,21 +99,19 @@ Mono> createWithResponseInternal(String id, BinaryData body
     /**
      * The getWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param id The id parameter.
@@ -136,26 +131,23 @@ Mono> getWithHeadersWithResponseInternal(String id, Request
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -177,16 +169,15 @@ PollerFlux beginCreateOrReplaceInternal(String name, Bin
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -207,8 +198,8 @@ PollerFlux beginCreateOrReplaceInternal(String name, Bin
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -227,9 +218,8 @@ PollerFlux beginExportInternal(String name, RequestOptio
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -250,8 +240,8 @@ PollerFlux beginExportInternal(String name, RequestOptio
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -271,22 +261,21 @@ PollerFlux beginArchiveInternal(String name, RequestOpti
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -304,15 +293,14 @@ PagedFlux listInternal(RequestOptions requestOptions) {
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -353,21 +341,19 @@ Mono> getResourceMetadataWithResponseInternal(RequestOptions requ
     /**
      * The getInternalHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelClient.java
index 925cee30cdf..b21e6b7c915 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelClient.java
@@ -53,31 +53,28 @@ public final class MaxOverloadModelClient {
      * The create operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param body The body parameter.
@@ -97,21 +94,19 @@ Response createWithResponseInternal(String id, BinaryData body, Requ
     /**
      * The getWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param id The id parameter.
@@ -131,26 +126,23 @@ Response getWithHeadersWithResponseInternal(String id, RequestOption
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -172,16 +164,15 @@ SyncPoller beginCreateOrReplaceInternal(String name, Bin
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -202,8 +193,8 @@ SyncPoller beginCreateOrReplaceInternal(String name, Bin
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -222,9 +213,8 @@ SyncPoller beginExportInternal(String name, RequestOptio
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -245,8 +235,8 @@ SyncPoller beginExportInternal(String name, RequestOptio
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -266,22 +256,21 @@ SyncPoller beginArchiveInternal(String name, RequestOpti
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -299,15 +288,14 @@ PagedIterable listInternal(RequestOptions requestOptions) {
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -348,21 +336,19 @@ Response getResourceMetadataWithResponseInternal(RequestOptions requestOpt
     /**
      * The getInternalHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/implementation/MaxOverloadModelClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/implementation/MaxOverloadModelClientImpl.java
index cc4053882ed..2898ac1eb51 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/implementation/MaxOverloadModelClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/implementation/MaxOverloadModelClientImpl.java
@@ -386,31 +386,28 @@ Response listWithoutOptionsNextSync(@PathParam(value = "nextLink", e
      * The create operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param body The body parameter.
@@ -434,31 +431,28 @@ public Mono> createWithResponseInternalAsync(String id, Bin
      * The create operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param body The body parameter.
@@ -479,21 +473,19 @@ public Response createWithResponseInternal(String id, BinaryData bod
     /**
      * The getWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param id The id parameter.
@@ -515,21 +507,19 @@ public Mono> getWithHeadersWithResponseInternalAsync(String
     /**
      * The getWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param id The id parameter.
@@ -549,26 +539,23 @@ public Response getWithHeadersWithResponseInternal(String id, Reques
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -591,26 +578,23 @@ private Mono> createOrReplaceWithResponseAsync(String name,
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -633,26 +617,23 @@ private Response createOrReplaceWithResponse(String name, BinaryData
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -682,26 +663,23 @@ public PollerFlux beginCreateOrReplaceWithM
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -731,26 +709,23 @@ public SyncPoller beginCreateOrReplaceWithM
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -779,26 +754,23 @@ public PollerFlux beginCreateOrReplaceInternalAsync(Stri
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -828,16 +800,15 @@ public SyncPoller beginCreateOrReplaceInternal(String na
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -858,8 +829,8 @@ public SyncPoller beginCreateOrReplaceInternal(String na
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -867,8 +838,7 @@ public SyncPoller beginCreateOrReplaceInternal(String na
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> exportWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -881,16 +851,15 @@ private Mono> exportWithResponseAsync(String name, RequestO
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -911,8 +880,8 @@ private Mono> exportWithResponseAsync(String name, RequestO
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -933,16 +902,15 @@ private Response exportWithResponse(String name, RequestOptions requ
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -963,8 +931,8 @@ private Response exportWithResponse(String name, RequestOptions requ
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -994,16 +962,15 @@ public PollerFlux beginExportWithModelAsync
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1024,8 +991,8 @@ public PollerFlux beginExportWithModelAsync
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1055,16 +1022,15 @@ public SyncPoller beginExportWithModel(Stri
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1085,8 +1051,8 @@ public SyncPoller beginExportWithModel(Stri
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1114,16 +1080,15 @@ public PollerFlux beginExportInternalAsync(String name,
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
optionalStringNoThe optional parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1144,8 +1109,8 @@ public PollerFlux beginExportInternalAsync(String name,
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1172,9 +1137,8 @@ public SyncPoller beginExportInternal(String name, Reque
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1195,8 +1159,8 @@ public SyncPoller beginExportInternal(String name, Reque
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1204,8 +1168,7 @@ public SyncPoller beginExportInternal(String name, Reque
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> archiveWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -1217,9 +1180,8 @@ private Mono> archiveWithResponseAsync(String name, Request
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1240,8 +1202,8 @@ private Mono> archiveWithResponseAsync(String name, Request
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1261,9 +1223,8 @@ private Response archiveWithResponse(String name, RequestOptions req
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1284,8 +1245,8 @@ private Response archiveWithResponse(String name, RequestOptions req
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1314,9 +1275,8 @@ public PollerFlux beginArchiveWithModelAsyn
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1337,8 +1297,8 @@ public PollerFlux beginArchiveWithModelAsyn
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1367,9 +1327,8 @@ public SyncPoller beginArchiveWithModel(Str
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1390,8 +1349,8 @@ public SyncPoller beginArchiveWithModel(Str
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1418,9 +1377,8 @@ public PollerFlux beginArchiveInternalAsync(String name,
     /**
      * Long-running resource action operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -1441,8 +1399,8 @@ public PollerFlux beginArchiveInternalAsync(String name,
      *         name: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1470,30 +1428,28 @@ public SyncPoller beginArchiveInternal(String name, Requ
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listSinglePageAsync(RequestOptions requestOptions) {
@@ -1509,22 +1465,21 @@ private Mono> listSinglePageAsync(RequestOptions reque
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1546,22 +1501,21 @@ public PagedFlux listInternalAsync(RequestOptions requestOptions) {
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1583,22 +1537,21 @@ private PagedResponse listSinglePage(RequestOptions requestOptions)
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
addedStringNoThe added parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1619,23 +1572,21 @@ public PagedIterable listInternal(RequestOptions requestOptions) {
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceWithoutOptionsModel items along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return paged collection of ResourceWithoutOptionsModel items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithoutOptionsSinglePageAsync(RequestOptions requestOptions) {
@@ -1650,15 +1601,14 @@ private Mono> listWithoutOptionsSinglePageAsync(Reques
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1679,15 +1629,14 @@ public PagedFlux listWithoutOptionsInternalAsync(RequestOptions requ
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1708,15 +1657,14 @@ private PagedResponse listWithoutOptionsSinglePage(RequestOptions re
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1782,21 +1730,19 @@ public Response getResourceMetadataWithResponseInternal(RequestOptions req
     /**
      * The getInternalHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1816,21 +1762,19 @@ public Mono> getInternalHeadersWithResponseInternalAsync(Re
     /**
      * The getInternalHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.
Response Headers
NameTypeDescription
x-request-idStringThe x-request-id response header.
x-request-statusStringThe x-request-status response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1849,15 +1793,14 @@ public Response getInternalHeadersWithResponseInternal(RequestOption
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1865,8 +1808,7 @@ public Response getInternalHeadersWithResponseInternal(RequestOption
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listNextSinglePageAsync(String nextLink, RequestOptions requestOptions) {
@@ -1880,15 +1822,14 @@ private Mono> listNextSinglePageAsync(String nextLink,
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1910,15 +1851,14 @@ private PagedResponse listNextSinglePage(String nextLink, RequestOpt
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1926,8 +1866,7 @@ private PagedResponse listNextSinglePage(String nextLink, RequestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceWithoutOptionsModel items along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return paged collection of ResourceWithoutOptionsModel items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithoutOptionsNextSinglePageAsync(String nextLink,
@@ -1942,15 +1881,14 @@ private Mono> listWithoutOptionsNextSinglePageAsync(St
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideAsyncClient.java
index ad44bbc0867..50101a706a4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideAsyncClient.java
@@ -78,22 +78,21 @@ public Mono> groupQueryWithResponse(RequestOptions requestOptions
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupAllRequest The groupAllRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -113,22 +112,21 @@ public Mono> groupAllWithResponse(BinaryData groupAllRequest, Req
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartRequest The groupPartRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -148,32 +146,31 @@ public Mono> groupPartWithResponse(BinaryData groupPartRequest, R
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartETagRequest The groupPartETagRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,22 +191,21 @@ public Mono> groupPartETagWithResponse(BinaryData groupPartETagRe
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -229,22 +225,21 @@ public Mono> groupExcludeBodyWithResponse(BinaryData body, Reques
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
@@ -253,8 +248,8 @@ public Mono> groupExcludeBodyWithResponse(BinaryData body, Reques
      *     prop5: String (Optional)
      *     prop6: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupNoneRequest The groupNoneRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideClient.java
index c7f2ca77e3b..f117b77da9a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/MethodOverrideClient.java
@@ -76,22 +76,21 @@ public Response groupQueryWithResponse(RequestOptions requestOptions) {
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupAllRequest The groupAllRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,22 +110,21 @@ public Response groupAllWithResponse(BinaryData groupAllRequest, RequestOp
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartRequest The groupPartRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -146,32 +144,31 @@ public Response groupPartWithResponse(BinaryData groupPartRequest, Request
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartETagRequest The groupPartETagRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,22 +188,21 @@ public Response groupPartETagWithResponse(BinaryData groupPartETagRequest,
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -226,22 +222,21 @@ public Response groupExcludeBodyWithResponse(BinaryData body, RequestOptio
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
@@ -250,8 +245,8 @@ public Response groupExcludeBodyWithResponse(BinaryData body, RequestOptio
      *     prop5: String (Optional)
      *     prop6: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupNoneRequest The groupNoneRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/implementation/MethodOverrideClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/implementation/MethodOverrideClientImpl.java
index 88a822d3760..7d6303ba715 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/implementation/MethodOverrideClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/methodoverride/implementation/MethodOverrideClientImpl.java
@@ -321,22 +321,21 @@ public Response groupQueryWithResponse(RequestOptions requestOptions) {
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupAllRequest The groupAllRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -357,22 +356,21 @@ public Mono> groupAllWithResponseAsync(BinaryData groupAllRequest
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupAllRequest The groupAllRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -393,22 +391,21 @@ public Response groupAllWithResponse(BinaryData groupAllRequest, RequestOp
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartRequest The groupPartRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -429,22 +426,21 @@ public Mono> groupPartWithResponseAsync(BinaryData groupPartReque
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartRequest The groupPartRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -465,32 +461,31 @@ public Response groupPartWithResponse(BinaryData groupPartRequest, Request
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartETagRequest The groupPartETagRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -512,32 +507,31 @@ public Mono> groupPartETagWithResponseAsync(BinaryData groupPartE
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter
Header Parameters
NameTypeRequiredDescription
If-Modified-SinceOffsetDateTimeNoThe ifModifiedSince parameter
If-Unmodified-SinceOffsetDateTimeNoThe ifUnmodifiedSince parameter
If-MatchStringNoThe ifMatch parameter
If-None-MatchStringNoThe ifNoneMatch parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupPartETagRequest The groupPartETagRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -558,22 +552,21 @@ public Response groupPartETagWithResponse(BinaryData groupPartETagRequest,
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -594,22 +587,21 @@ public Mono> groupExcludeBodyWithResponseAsync(BinaryData body, R
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -630,22 +622,21 @@ public Response groupExcludeBodyWithResponse(BinaryData body, RequestOptio
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
@@ -654,8 +645,8 @@ public Response groupExcludeBodyWithResponse(BinaryData body, RequestOptio
      *     prop5: String (Optional)
      *     prop6: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupNoneRequest The groupNoneRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -676,22 +667,21 @@ public Mono> groupNoneWithResponseAsync(BinaryData groupNoneReque
      * A remote procedure call (RPC) operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter
Query Parameters
NameTypeRequiredDescription
fooStringNoThe foo parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter
Header Parameters
NameTypeRequiredDescription
barStringNoThe bar parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop1: String (Required)
      *     prop2: String (Optional)
@@ -700,8 +690,8 @@ public Mono> groupNoneWithResponseAsync(BinaryData groupNoneReque
      *     prop5: String (Optional)
      *     prop6: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param groupNoneRequest The groupNoneRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelAsyncClient.java
index 574b1c35a0f..f32a7a59a6d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelAsyncClient.java
@@ -44,9 +44,8 @@ public final class ModelAsyncClient {
     /**
      * The put1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -56,13 +55,11 @@ public final class ModelAsyncClient {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -72,8 +69,8 @@ public final class ModelAsyncClient {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -92,30 +89,27 @@ public Mono> put1WithResponse(BinaryData body, RequestOptio
     /**
      * The put2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -134,17 +128,16 @@ public Mono> put2WithResponse(BinaryData body, RequestOptio
     /**
      * The get3 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData3 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -162,9 +155,8 @@ public Mono> get3WithResponse(RequestOptions requestOptions
     /**
      * The putNested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -172,13 +164,11 @@ public Mono> get3WithResponse(RequestOptions requestOptions
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -186,8 +176,8 @@ public Mono> get3WithResponse(RequestOptions requestOptions
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelClient.java
index 4185f37bdb5..a15bfb5770c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/ModelClient.java
@@ -42,9 +42,8 @@ public final class ModelClient {
     /**
      * The put1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -54,13 +53,11 @@ public final class ModelClient {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -70,8 +67,8 @@ public final class ModelClient {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -90,30 +87,27 @@ public Response put1WithResponse(BinaryData body, RequestOptions req
     /**
      * The put2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -132,17 +126,16 @@ public Response put2WithResponse(BinaryData body, RequestOptions req
     /**
      * The get3 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData3 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +153,8 @@ public Response get3WithResponse(RequestOptions requestOptions) {
     /**
      * The putNested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -170,13 +162,11 @@ public Response get3WithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -184,8 +174,8 @@ public Response get3WithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/implementation/ModelOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/implementation/ModelOpsImpl.java
index 31441b34c72..1e4b507b253 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/implementation/ModelOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/model/implementation/ModelOpsImpl.java
@@ -140,9 +140,8 @@ Response putNestedSync(@HostParam("endpoint") String endpoint,
     /**
      * The put1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -152,13 +151,11 @@ Response putNestedSync(@HostParam("endpoint") String endpoint,
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -168,8 +165,8 @@ Response putNestedSync(@HostParam("endpoint") String endpoint,
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -190,9 +187,8 @@ public Mono> put1WithResponseAsync(BinaryData body, Request
     /**
      * The put1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -202,13 +198,11 @@ public Mono> put1WithResponseAsync(BinaryData body, Request
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData (Required): {
@@ -218,8 +212,8 @@ public Mono> put1WithResponseAsync(BinaryData body, Request
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -239,30 +233,27 @@ public Response put1WithResponse(BinaryData body, RequestOptions req
     /**
      * The put2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -283,30 +274,27 @@ public Mono> put2WithResponseAsync(BinaryData body, Request
     /**
      * The put2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data2 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -326,17 +314,16 @@ public Response put2WithResponse(BinaryData body, RequestOptions req
     /**
      * The get3 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData3 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -355,17 +342,16 @@ public Mono> get3WithResponseAsync(RequestOptions requestOp
     /**
      * The get3 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     outputData3 (Required): {
      *         data: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -383,9 +369,8 @@ public Response get3WithResponse(RequestOptions requestOptions) {
     /**
      * The putNested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -393,13 +378,11 @@ public Response get3WithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -407,8 +390,8 @@ public Response get3WithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -429,9 +412,8 @@ public Mono> putNestedWithResponseAsync(BinaryData body, Re
     /**
      * The putNested operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -439,13 +421,11 @@ public Mono> putNestedWithResponseAsync(BinaryData body, Re
      *         }
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     nested1 (Required): {
      *         nested2 (Required): {
@@ -453,8 +433,8 @@ public Mono> putNestedWithResponseAsync(BinaryData body, Re
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesAsyncClient.java
index 5cd3c7365d5..015954b1902 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesAsyncClient.java
@@ -39,15 +39,13 @@ public final class MultiContentTypesAsyncClient {
     /**
      * multiple data types map to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json",
-     * "application/octet-stream", "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesClient.java
index 9648124a0cf..ca14fe29f15 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultiContentTypesClient.java
@@ -38,15 +38,13 @@ public final class MultiContentTypesClient {
     /**
      * multiple data types map to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json",
-     * "application/octet-stream", "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java
index 61c77a150ab..20e4f042e11 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestAsyncClient.java
@@ -41,15 +41,13 @@ public final class MultipleContentTypesOnRequestAsyncClient {
     /**
      * one data type maps to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png", "application/json-patch+json".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,15 +70,13 @@ public Mono> uploadBytesWithSingleBodyTypeForMultiContentTypesWit
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -103,15 +99,14 @@ public Mono> uploadBytesWithMultiBodyTypesForMultiContentTypesWit
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -132,15 +127,13 @@ public Mono> uploadJsonWithMultiBodyTypesForMultiContentTypesWith
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream",
-     * "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestClient.java
index 4756ef09f19..7e53b275a71 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/MultipleContentTypesOnRequestClient.java
@@ -39,15 +39,13 @@ public final class MultipleContentTypesOnRequestClient {
     /**
      * one data type maps to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png", "application/json-patch+json".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,15 +68,13 @@ public Response uploadBytesWithSingleBodyTypeForMultiContentTypesWithRespo
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -101,15 +97,14 @@ public Response uploadBytesWithMultiBodyTypesForMultiContentTypesWithRespo
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -129,15 +124,13 @@ public Response uploadJsonWithMultiBodyTypesForMultiContentTypesWithRespon
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream",
-     * "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeAsyncClient.java
index adbde39c36e..89848cf8332 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeAsyncClient.java
@@ -40,12 +40,11 @@ public final class SingleContentTypeAsyncClient {
     /**
      * response is binary.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -63,12 +62,11 @@ public Mono> downloadImageForSingleContentTypeWithResponse(
     /**
      * request is binary.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeClient.java
index a31f6b5dbf3..a8cd9f836fc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/SingleContentTypeClient.java
@@ -38,12 +38,11 @@ public final class SingleContentTypeClient {
     /**
      * response is binary.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -61,12 +60,11 @@ public Response downloadImageForSingleContentTypeWithResponse(Reques
     /**
      * request is binary.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultiContentTypesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultiContentTypesClientImpl.java
index b673c499564..3e5cdcf0d36 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultiContentTypesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultiContentTypesClientImpl.java
@@ -180,15 +180,13 @@ Response uploadWithOverloadSync(@HostParam("endpoint") String endpoint,
     /**
      * multiple data types map to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json",
-     * "application/octet-stream", "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -207,15 +205,13 @@ public Mono> uploadWithOverloadWithResponseAsync(String contentTy
     /**
      * multiple data types map to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json",
-     * "application/octet-stream", "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "text/plain", "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java
index eee0c3448f0..64c17d66d8f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/MultipleContentTypesOnRequestsImpl.java
@@ -142,15 +142,13 @@ Response uploadJsonOrBytesWithMultiBodyTypesForMultiContentTypesSync(
     /**
      * one data type maps to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png", "application/json-patch+json".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -170,15 +168,13 @@ public Mono> uploadBytesWithSingleBodyTypeForMultiContentTypesWit
     /**
      * one data type maps to multiple content types.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png", "application/json-patch+json".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png", "application/json-patch+json".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -197,15 +193,13 @@ public Response uploadBytesWithSingleBodyTypeForMultiContentTypesWithRespo
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -225,15 +219,13 @@ public Mono> uploadBytesWithMultiBodyTypesForMultiContentTypesWit
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg",
-     * "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -252,15 +244,14 @@ public Response uploadBytesWithMultiBodyTypesForMultiContentTypesWithRespo
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -282,15 +273,14 @@ public Mono> uploadJsonWithMultiBodyTypesForMultiContentTypesWith
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -311,15 +301,13 @@ public Response uploadJsonWithMultiBodyTypesForMultiContentTypesWithRespon
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream",
-     * "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -338,15 +326,13 @@ public Mono> uploadJsonOrBytesWithMultiBodyTypesForMultiContentTy
     /**
      * multiple data types map to multiple content types using shared route.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream",
-     * "image/jpeg", "image/png".
+     * @param contentType The contentType parameter. Allowed values: "application/json", "application/octet-stream", "image/jpeg", "image/png".
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/SingleContentTypesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/SingleContentTypesImpl.java
index a5ff02e2145..46bb652d8d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/SingleContentTypesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multicontenttypes/implementation/SingleContentTypesImpl.java
@@ -101,12 +101,11 @@ Response uploadImageForSingleContentTypeSync(@HostParam("endpoint") String
     /**
      * response is binary.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -126,12 +125,11 @@ Response uploadImageForSingleContentTypeSync(@HostParam("endpoint") String
     /**
      * response is binary.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,12 +148,11 @@ public Response downloadImageForSingleContentTypeWithResponse(Reques
     /**
      * request is binary.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -176,12 +173,11 @@ public Mono> uploadImageForSingleContentTypeWithResponseAsync(Bin
     /**
      * request is binary.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param data The data parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaAsyncClient.java
index 8226df498a8..6dd94f40a0c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaAsyncClient.java
@@ -41,15 +41,14 @@ public final class AlphaAsyncClient {
     /**
      * The getAlpha operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaClient.java
index c8e309abce2..1b1bc540f40 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/AlphaClient.java
@@ -39,15 +39,14 @@ public final class AlphaClient {
     /**
      * The getAlpha operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaAsyncClient.java
index 690fc2052de..653cda9b63b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaAsyncClient.java
@@ -41,15 +41,14 @@ public final class BetaAsyncClient {
     /**
      * The getBeta operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaClient.java
index 7e039a02d2c..6f77ac07093 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/BetaClient.java
@@ -39,15 +39,14 @@ public final class BetaClient {
     /**
      * The getBeta operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/AlphaClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/AlphaClientImpl.java
index bde42377dfa..d74631a6a74 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/AlphaClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/AlphaClientImpl.java
@@ -166,15 +166,14 @@ Response getAlphaSync(@HostParam("endpoint") String endpoint, @PathP
     /**
      * The getAlpha operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,15 +193,14 @@ public Mono> getAlphaWithResponseAsync(String id, RequestOp
     /**
      * The getAlpha operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/BetaClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/BetaClientImpl.java
index 95c3e234d70..402885b948b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/BetaClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/multipleclientssameversion/implementation/BetaClientImpl.java
@@ -166,15 +166,14 @@ Response getBetaSync(@HostParam("endpoint") String endpoint, @PathPa
     /**
      * The getBeta operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,15 +193,14 @@ public Mono> getBetaWithResponseAsync(String id, RequestOpt
     /**
      * The getBeta operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceAsyncClient.java
index 0cb9b4e6969..6d215e2ba19 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceAsyncClient.java
@@ -41,14 +41,13 @@ public final class NamespaceAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceClient.java
index 1bd2a5e86b4..6efcd6e04cf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/NamespaceClient.java
@@ -39,14 +39,13 @@ public final class NamespaceClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/implementation/NamespaceClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/implementation/NamespaceClientImpl.java
index c58ec9223bb..ab0655d4a8d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/implementation/NamespaceClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namespaceclient/implementation/NamespaceClientImpl.java
@@ -145,14 +145,13 @@ Response getSync(@HostParam("endpoint") String endpoint, @HeaderPara
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -170,14 +169,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingAsyncClient.java
index 6344b136f0f..5dd307c4c19 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingAsyncClient.java
@@ -47,34 +47,31 @@ public final class NamingAsyncClient {
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      * 
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -86,8 +83,8 @@ public final class NamingAsyncClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name summary of name query parameter
      * 
@@ -109,14 +106,13 @@ public Mono> postWithResponse(String name, BinaryData body,
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingClient.java
index cb8985e33f8..79ccd755ec1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/NamingClient.java
@@ -62,14 +62,13 @@ public Response postWithResponse(String name, BinaryData body, Reque
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      *
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/implementation/NamingOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/implementation/NamingOpsImpl.java
index ac85523dc45..52948690f23 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/implementation/NamingOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/naming/implementation/NamingOpsImpl.java
@@ -105,34 +105,31 @@ Response getAnonymousSync(@HostParam("endpoint") String endpoint,
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      * 
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -144,8 +141,8 @@ Response getAnonymousSync(@HostParam("endpoint") String endpoint,
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name summary of name query parameter
      * 
@@ -173,34 +170,31 @@ public Mono> postWithResponseAsync(String name, BinaryData
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      * 
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -212,8 +206,8 @@ public Mono> postWithResponseAsync(String name, BinaryData
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name summary of name query parameter
      * 
@@ -237,14 +231,13 @@ public Response postWithResponse(String name, BinaryData body, Reque
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -263,14 +256,13 @@ public Mono> getAnonymousWithResponseAsync(RequestOptions r
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserAsyncClient.java
index dd21304c508..58fbf62eb8e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserAsyncClient.java
@@ -47,34 +47,31 @@ public final class NamingJavaParserAsyncClient {
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      * 
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -85,8 +82,8 @@ public final class NamingJavaParserAsyncClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name summary of name query parameter
      * 
@@ -108,14 +105,13 @@ public Mono> postWithResponse(String name, BinaryData body,
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserClient.java
index a132fc27fb5..8ed05ef6048 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/NamingJavaParserClient.java
@@ -45,34 +45,31 @@ public final class NamingJavaParserClient {
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      *
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -83,8 +80,8 @@ public final class NamingJavaParserClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      *
      * @param name summary of name query parameter
      *
@@ -106,14 +103,13 @@ public Response postWithResponse(String name, BinaryData body, Reque
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      *
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/implementation/NamingOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/implementation/NamingOpsImpl.java
index 0f333bd6bfa..59b624d1f09 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/implementation/NamingOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/namingjavaparser/implementation/NamingOpsImpl.java
@@ -105,34 +105,31 @@ Response getAnonymousSync(@HostParam("endpoint") String endpoint,
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      * 
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -143,8 +140,8 @@ Response getAnonymousSync(@HostParam("endpoint") String endpoint,
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name summary of name query parameter
      * 
@@ -172,34 +169,31 @@ public Mono> postWithResponseAsync(String name, BinaryData
      * description of POST op.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
+     *     
Header Parameters
NameTypeRequiredDescription
etagStringNosummary of etag header parameter
      * 
      * description of etag header parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     parameters (Optional): {
      *         type: String(Type1/Type2) (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     data (Required): {
      *         data (Required): {
-     *             @data.kind: String (Required)
+     *             @data.kind: String (Required)
      *         }
      *     }
      *     type: String(Blob/File) (Required)
@@ -210,8 +204,8 @@ public Mono> postWithResponseAsync(String name, BinaryData
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name summary of name query parameter
      * 
@@ -235,14 +229,13 @@ public Response postWithResponse(String name, BinaryData body, Reque
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -261,14 +254,13 @@ public Mono> getAnonymousWithResponseAsync(RequestOptions r
     /**
      * The getAnonymous operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java
index 390292f1b51..8fc12518fe4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java
@@ -44,26 +44,24 @@ public final class OptionalAsyncClient {
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -89,13 +87,11 @@ public final class OptionalAsyncClient {
      *     epochDateTimeRequiredNullable: Long (Required)
      *     epochDateTimeNullable: Long (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -125,15 +121,14 @@ public final class OptionalAsyncClient {
      *         stringReadOnlyOptional: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.

      * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
@@ -203,7 +198,7 @@ public Mono put(String requestHeaderRequired, boolean boo
         }
         return putWithResponse(requestHeaderRequired, booleanRequired, booleanRequiredNullable, stringRequired,
             stringRequiredNullable, requestOptions).flatMap(FluxUtil::toMono)
-                .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
+            .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
     }
 
     /**
@@ -230,6 +225,6 @@ public Mono put(String requestHeaderRequired, boolean boo
         RequestOptions requestOptions = new RequestOptions();
         return putWithResponse(requestHeaderRequired, booleanRequired, booleanRequiredNullable, stringRequired,
             stringRequiredNullable, requestOptions).flatMap(FluxUtil::toMono)
-                .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
+            .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalClient.java
index d89138485b2..d57a229b2d5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalClient.java
@@ -42,26 +42,24 @@ public final class OptionalClient {
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -87,13 +85,11 @@ public final class OptionalClient {
      *     epochDateTimeRequiredNullable: Long (Required)
      *     epochDateTimeNullable: Long (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -123,15 +119,14 @@ public final class OptionalClient {
      *         stringReadOnlyOptional: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.

      * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/implementation/OptionalOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/implementation/OptionalOpsImpl.java
index 76a0c73cd10..ff4e1614498 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/implementation/OptionalOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/implementation/OptionalOpsImpl.java
@@ -92,26 +92,24 @@ Response putSync(@HostParam("endpoint") String endpoint,
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -137,13 +135,11 @@ Response putSync(@HostParam("endpoint") String endpoint,
      *     epochDateTimeRequiredNullable: Long (Required)
      *     epochDateTimeNullable: Long (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -173,15 +169,14 @@ Response putSync(@HostParam("endpoint") String endpoint,
      *         stringReadOnlyOptional: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.

      * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
@@ -216,26 +211,24 @@ public Mono> putWithResponseAsync(String requestHeaderRequi
      * The put operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter
Query Parameters
NameTypeRequiredDescription
booleanNullableBooleanNoThe booleanNullable parameter
stringStringNoThe string parameter
stringNullableStringNoThe stringNullable parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
request-header-optionalStringNoThe requestHeaderOptional parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -261,13 +254,11 @@ public Mono> putWithResponseAsync(String requestHeaderRequi
      *     epochDateTimeRequiredNullable: Long (Required)
      *     epochDateTimeNullable: Long (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: Boolean (Optional)
      *     booleanNullable: Boolean (Optional)
@@ -297,15 +288,14 @@ public Mono> putWithResponseAsync(String requestHeaderRequi
      *         stringReadOnlyOptional: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.
Response Headers
NameTypeDescription
header-requiredStringThe header-required response header.
header-optionalStringThe header-optional response header.

      * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateAsyncClient.java
index 677ff4a35ed..17a82498fa7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateAsyncClient.java
@@ -41,17 +41,16 @@ public final class PartialUpdateAsyncClient {
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
      *     bytes: byte[] (Required)
      *     aggregate: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      *
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateClient.java
index b7c1417a37b..c3a7d810112 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/PartialUpdateClient.java
@@ -39,17 +39,16 @@ public final class PartialUpdateClient {
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
      *     bytes: byte[] (Required)
      *     aggregate: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      *
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/implementation/PartialUpdateClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/implementation/PartialUpdateClientImpl.java
index 1fdd7c44cb2..115ffa4ed65 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/implementation/PartialUpdateClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/partialupdate/implementation/PartialUpdateClientImpl.java
@@ -146,17 +146,16 @@ Response readSync(@HostParam("endpoint") String endpoint, @HeaderPar
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
      *     bytes: byte[] (Required)
      *     aggregate: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -174,17 +173,16 @@ public Mono> readWithResponseAsync(RequestOptions requestOp
     /**
      * The read operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     boolean: boolean (Required)
      *     string: String (Required)
      *     bytes: byte[] (Required)
      *     aggregate: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchAsyncClient.java
index 6588150ae49..77deef7e3d7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchAsyncClient.java
@@ -44,9 +44,8 @@ public final class PatchAsyncClient {
     /**
      * The createOrUpdateResource operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -72,13 +71,11 @@ public final class PatchAsyncClient {
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -104,8 +101,8 @@ public final class PatchAsyncClient {
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param resource The resource parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -126,16 +123,14 @@ public Mono> createOrUpdateResourceWithResponse(BinaryData
      * The createOrUpdateOptionalResource operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -161,13 +156,11 @@ public Mono> createOrUpdateResourceWithResponse(BinaryData
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -193,8 +186,8 @@ public Mono> createOrUpdateResourceWithResponse(BinaryData
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -212,9 +205,8 @@ public Mono> createOrUpdateOptionalResourceWithResponse(Req
     /**
      * The createOrUpdateFish operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -222,13 +214,11 @@ public Mono> createOrUpdateOptionalResourceWithResponse(Req
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -236,8 +226,8 @@ public Mono> createOrUpdateOptionalResourceWithResponse(Req
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -245,8 +235,7 @@ public Mono> createOrUpdateOptionalResourceWithResponse(Req
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -257,9 +246,8 @@ public Mono> createOrUpdateFishWithResponse(BinaryData fish
     /**
      * The createOrUpdateSalmon operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -280,13 +268,11 @@ public Mono> createOrUpdateFishWithResponse(BinaryData fish
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -307,8 +293,8 @@ public Mono> createOrUpdateFishWithResponse(BinaryData fish
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -316,8 +302,7 @@ public Mono> createOrUpdateFishWithResponse(BinaryData fish
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the second level model in polymorphic multiple levels inheritance which contains references to other
-     * polymorphic instances along with {@link Response} on successful completion of {@link Mono}.
+     * @return the second level model in polymorphic multiple levels inheritance which contains references to other polymorphic instances along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchClient.java
index 4ea8bd7f036..510597e5533 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/PatchClient.java
@@ -42,9 +42,8 @@ public final class PatchClient {
     /**
      * The createOrUpdateResource operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -70,13 +69,11 @@ public final class PatchClient {
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -102,8 +99,8 @@ public final class PatchClient {
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param resource The resource parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,16 +120,14 @@ public Response createOrUpdateResourceWithResponse(BinaryData resour
      * The createOrUpdateOptionalResource operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -158,13 +153,11 @@ public Response createOrUpdateResourceWithResponse(BinaryData resour
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -190,8 +183,8 @@ public Response createOrUpdateResourceWithResponse(BinaryData resour
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -209,9 +202,8 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
     /**
      * The createOrUpdateFish operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -219,13 +211,11 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -233,8 +223,8 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -242,8 +232,7 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -254,9 +243,8 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
     /**
      * The createOrUpdateSalmon operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -277,13 +265,11 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -304,8 +290,8 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -313,8 +299,7 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the second level model in polymorphic multiple levels inheritance which contains references to other
-     * polymorphic instances along with {@link Response}.
+     * @return the second level model in polymorphic multiple levels inheritance which contains references to other polymorphic instances along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/implementation/PatchesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/implementation/PatchesImpl.java
index 71c6372db7c..173caed882c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/implementation/PatchesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/implementation/PatchesImpl.java
@@ -142,9 +142,8 @@ Response createOrUpdateSalmonSync(@HostParam("endpoint") String endp
     /**
      * The createOrUpdateResource operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -170,13 +169,11 @@ Response createOrUpdateSalmonSync(@HostParam("endpoint") String endp
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -202,8 +199,8 @@ Response createOrUpdateSalmonSync(@HostParam("endpoint") String endp
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param resource The resource parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -225,9 +222,8 @@ public Mono> createOrUpdateResourceWithResponseAsync(Binary
     /**
      * The createOrUpdateResource operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -253,13 +249,11 @@ public Mono> createOrUpdateResourceWithResponseAsync(Binary
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -285,8 +279,8 @@ public Mono> createOrUpdateResourceWithResponseAsync(Binary
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param resource The resource parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -308,16 +302,14 @@ public Response createOrUpdateResourceWithResponse(BinaryData resour
      * The createOrUpdateOptionalResource operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -343,13 +335,11 @@ public Response createOrUpdateResourceWithResponse(BinaryData resour
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -375,8 +365,8 @@ public Response createOrUpdateResourceWithResponse(BinaryData resour
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -402,16 +392,14 @@ public Mono> createOrUpdateOptionalResourceWithResponseAsyn
      * The createOrUpdateOptionalResource operation.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/merge-patch+json".
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/merge-patch+json".

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -437,13 +425,11 @@ public Mono> createOrUpdateOptionalResourceWithResponseAsyn
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
@@ -469,8 +455,8 @@ public Mono> createOrUpdateOptionalResourceWithResponseAsyn
      *         color: String (Optional)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -495,9 +481,8 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
     /**
      * The createOrUpdateFish operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -505,13 +490,11 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -519,8 +502,8 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -528,8 +511,7 @@ public Response createOrUpdateOptionalResourceWithResponse(RequestOp
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createOrUpdateFishWithResponseAsync(BinaryData fish,
@@ -543,9 +525,8 @@ public Mono> createOrUpdateFishWithResponseAsync(BinaryData
     /**
      * The createOrUpdateFish operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -553,13 +534,11 @@ public Mono> createOrUpdateFishWithResponseAsync(BinaryData
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -567,8 +546,8 @@ public Mono> createOrUpdateFishWithResponseAsync(BinaryData
      *     age: int (Optional, Required on create)
      *     color: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -576,8 +555,7 @@ public Mono> createOrUpdateFishWithResponseAsync(BinaryData
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createOrUpdateFishWithResponse(BinaryData fish, RequestOptions requestOptions) {
@@ -590,9 +568,8 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
     /**
      * The createOrUpdateSalmon operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -613,13 +590,11 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -640,8 +615,8 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -649,8 +624,7 @@ public Response createOrUpdateFishWithResponse(BinaryData fish, Requ
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the second level model in polymorphic multiple levels inheritance which contains references to other
-     * polymorphic instances along with {@link Response} on successful completion of {@link Mono}.
+     * @return the second level model in polymorphic multiple levels inheritance which contains references to other polymorphic instances along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createOrUpdateSalmonWithResponseAsync(BinaryData fish,
@@ -664,9 +638,8 @@ public Mono> createOrUpdateSalmonWithResponseAsync(BinaryDa
     /**
      * The createOrUpdateSalmon operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -687,13 +660,11 @@ public Mono> createOrUpdateSalmonWithResponseAsync(BinaryDa
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     id: String (Required)
@@ -714,8 +685,8 @@ public Mono> createOrUpdateSalmonWithResponseAsync(BinaryDa
      *     }
      *     partner (Optional): (recursive schema, see partner above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param fish The fish parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -723,8 +694,7 @@ public Mono> createOrUpdateSalmonWithResponseAsync(BinaryDa
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the second level model in polymorphic multiple levels inheritance which contains references to other
-     * polymorphic instances along with {@link Response}.
+     * @return the second level model in polymorphic multiple levels inheritance which contains references to other polymorphic instances along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createOrUpdateSalmonWithResponse(BinaryData fish, RequestOptions requestOptions) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientAsyncClient.java
index d7eca7c7241..8cc647947e7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientAsyncClient.java
@@ -53,26 +53,23 @@ public final class ProtocolAndConvenientAsyncClient {
     /**
      * When set protocol false and convenient true, then the protocol method should be package private.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -89,29 +86,25 @@ Mono> onlyConvenientWithResponseInternal(BinaryData body, R
     }
 
     /**
-     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and
-     * ResourceD should not be generated.
+     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and ResourceD should not be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -130,26 +123,23 @@ public Mono> onlyProtocolWithResponse(BinaryData body, Requ
     /**
      * Setting protocol true and convenient true, both convenient and protocol methods will be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -169,26 +159,23 @@ public Mono> bothConvenientAndProtocolWithResponse(BinaryDa
     /**
      * When set protocol false and convenient false.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -207,28 +194,25 @@ Mono> errorSettingWithResponseInternal(BinaryData body, Req
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -250,22 +234,21 @@ PollerFlux beginCreateOrReplaceInternal(String name, Bin
      * Paging operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClient.java
index c590841bd09..0fc64bc4b5b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/ProtocolAndConvenientClient.java
@@ -47,26 +47,23 @@ public final class ProtocolAndConvenientClient {
     /**
      * When set protocol false and convenient true, then the protocol method should be package private.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -83,29 +80,25 @@ Response onlyConvenientWithResponseInternal(BinaryData body, Request
     }
 
     /**
-     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and
-     * ResourceD should not be generated.
+     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and ResourceD should not be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -124,26 +117,23 @@ public Response onlyProtocolWithResponse(BinaryData body, RequestOpt
     /**
      * Setting protocol true and convenient true, both convenient and protocol methods will be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -162,26 +152,23 @@ public Response bothConvenientAndProtocolWithResponse(BinaryData bod
     /**
      * When set protocol false and convenient false.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -200,28 +187,25 @@ Response errorSettingWithResponseInternal(BinaryData body, RequestOp
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -243,22 +227,21 @@ SyncPoller beginCreateOrReplaceInternal(String name, Bin
      * Paging operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenienceOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenienceOpsImpl.java
index 8257065624a..74218e704cc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenienceOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolandconvenient/implementation/ProtocolAndConvenienceOpsImpl.java
@@ -233,26 +233,23 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
     /**
      * When set protocol false and convenient true, then the protocol method should be package private.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -274,26 +271,23 @@ public Mono> onlyConvenientWithResponseInternalAsync(Binary
     /**
      * When set protocol false and convenient true, then the protocol method should be package private.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -312,29 +306,25 @@ public Response onlyConvenientWithResponseInternal(BinaryData body,
     }
 
     /**
-     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and
-     * ResourceD should not be generated.
+     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and ResourceD should not be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -353,29 +343,25 @@ public Mono> onlyProtocolWithResponseAsync(BinaryData body,
     }
 
     /**
-     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and
-     * ResourceD should not be generated.
+     * When set protocol true and convenient false, only the protocol method should be generated, ResourceC and ResourceD should not be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -396,26 +382,23 @@ public Response onlyProtocolWithResponse(BinaryData body, RequestOpt
     /**
      * Setting protocol true and convenient true, both convenient and protocol methods will be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -437,26 +420,23 @@ public Mono> bothConvenientAndProtocolWithResponseAsync(Bin
     /**
      * Setting protocol true and convenient true, both convenient and protocol methods will be generated.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -477,26 +457,23 @@ public Response bothConvenientAndProtocolWithResponse(BinaryData bod
     /**
      * When set protocol false and convenient false.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -518,26 +495,23 @@ public Mono> errorSettingWithResponseInternalAsync(BinaryDa
     /**
      * When set protocol false and convenient false.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -558,28 +532,25 @@ public Response errorSettingWithResponseInternal(BinaryData body, Re
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -603,28 +574,25 @@ private Mono> createOrReplaceWithResponseAsync(String name,
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -647,28 +615,25 @@ private Response createOrReplaceWithResponse(String name, BinaryData
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -697,28 +662,25 @@ public PollerFlux beginCreateOrReplaceWithModel
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -747,28 +709,25 @@ public SyncPoller beginCreateOrReplaceWithModel
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -797,28 +756,25 @@ public PollerFlux beginCreateOrReplaceInternalAsync(Stri
     /**
      * Long running operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -848,30 +804,28 @@ public SyncPoller beginCreateOrReplaceInternal(String na
      * Paging operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceJ items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of ResourceJ items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listSinglePageAsync(RequestOptions requestOptions) {
@@ -887,22 +841,21 @@ private Mono> listSinglePageAsync(RequestOptions reque
      * Paging operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -944,22 +897,21 @@ public PagedFlux listInternalAsync(RequestOptions requestOptions) {
      * Paging operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -981,22 +933,21 @@ private PagedResponse listSinglePage(RequestOptions requestOptions)
      * Paging operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter
Query Parameters
NameTypeRequiredDescription
maxresultsLongNoThe maxPageSize parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1037,16 +988,15 @@ public PagedIterable listInternal(RequestOptions requestOptions) {
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1054,8 +1004,7 @@ public PagedIterable listInternal(RequestOptions requestOptions) {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceJ items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of ResourceJ items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listNextSinglePageAsync(String nextLink, RequestOptions requestOptions) {
@@ -1070,16 +1019,15 @@ private Mono> listNextSinglePageAsync(String nextLink,
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncAsyncClient.java
index 2b8b1e51a36..66cd1d60db2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncAsyncClient.java
@@ -48,24 +48,21 @@ public final class ProtocolApiSyncOverAsyncAsyncClient {
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -84,15 +81,14 @@ Mono> createWithResponseInternal(BinaryData body, RequestOp
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param apiVersion The API version to use for this operation.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncClient.java
index 633497a5d2a..31c896c3f77 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/ProtocolApiSyncOverAsyncClient.java
@@ -41,24 +41,21 @@ public final class ProtocolApiSyncOverAsyncClient {
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -77,15 +74,14 @@ Response createWithResponseInternal(BinaryData body, RequestOptions
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param apiVersion The API version to use for this operation.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/implementation/ProtocolApiSyncOverAsyncClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/implementation/ProtocolApiSyncOverAsyncClientImpl.java
index 46f9c80b978..c12dd240134 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/implementation/ProtocolApiSyncOverAsyncClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/protocolapisyncoverasync/implementation/ProtocolApiSyncOverAsyncClientImpl.java
@@ -170,24 +170,21 @@ Mono> listNext(@PathParam(value = "nextLink", encoded = tru
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -208,24 +205,21 @@ public Mono> createWithResponseInternalAsync(BinaryData bod
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -243,15 +237,14 @@ public Response createWithResponseInternal(BinaryData body, RequestO
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param apiVersion The API version to use for this operation.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -259,8 +252,7 @@ public Response createWithResponseInternal(BinaryData body, RequestO
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listSinglePageAsync(String apiVersion, RequestOptions requestOptions) {
@@ -274,15 +266,14 @@ private Mono> listSinglePageAsync(String apiVersion, R
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param apiVersion The API version to use for this operation.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -304,15 +295,14 @@ public PagedFlux listInternalAsync(String apiVersion, RequestOptions
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param apiVersion The API version to use for this operation.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,15 +320,14 @@ public PagedIterable listInternal(String apiVersion, RequestOptions
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -346,8 +335,7 @@ public PagedIterable listInternal(String apiVersion, RequestOptions
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of ResourceModel items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listNextSinglePageAsync(String nextLink, RequestOptions requestOptions) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java
index 96c5cd2893d..248cffcf253 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseAsyncClient.java
@@ -51,12 +51,11 @@ public final class ResponseAsyncClient {
     /**
      * The getBinary operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Mono> getBinaryWithResponse(RequestOptions requestOp
     /**
      * The getArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -85,8 +83,8 @@ public Mono> getBinaryWithResponse(RequestOptions requestOp
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -104,9 +102,8 @@ public Mono> getArrayWithResponse(RequestOptions requestOpt
     /**
      * The getAnotherArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -115,8 +112,8 @@ public Mono> getArrayWithResponse(RequestOptions requestOpt
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,23 +131,21 @@ public Mono> getAnotherArrayWithResponse(RequestOptions req
     /**
      * The createWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,12 +186,11 @@ public Mono> deleteWithHeadersWithResponse(RequestOptions request
     /**
      * The most basic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -213,17 +207,16 @@ public Mono> existsWithResponse(RequestOptions requestOptions)
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -243,17 +236,16 @@ public PollerFlux beginLroInvalidPollResponse(BinaryData
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -272,12 +264,11 @@ public PollerFlux beginLroInvalidResult(BinaryData reque
     /**
      * The listStrings operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -295,12 +286,11 @@ public PagedFlux listStrings(RequestOptions requestOptions) {
     /**
      * The listIntegers operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -318,17 +308,16 @@ public PagedFlux listIntegers(RequestOptions requestOptions) {
     /**
      * The getJsonUtf8Response operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -346,17 +335,16 @@ public Mono> getJsonUtf8ResponseWithResponse(RequestOptions
     /**
      * The getPlusJsonResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -374,12 +362,11 @@ public Mono> getPlusJsonResponseWithResponse(RequestOptions
     /**
      * The getUnionResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -397,20 +384,18 @@ public Mono> getUnionResponseWithResponse(RequestOptions re
     /**
      * The getTextBoolean operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return boolean with `true` and `false` values along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return boolean with `true` and `false` values along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -421,12 +406,11 @@ public Mono> getTextBooleanWithResponse(RequestOptions requ
     /**
      * The getTextByte operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -444,12 +428,11 @@ public Mono> getTextByteWithResponse(RequestOptions request
     /**
      * The getTextInt32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -467,12 +450,11 @@ public Mono> getTextInt32WithResponse(RequestOptions reques
     /**
      * The getTextInt64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * long
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -490,12 +472,11 @@ public Mono> getTextInt64WithResponse(RequestOptions reques
     /**
      * The getTextFloat32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -513,12 +494,11 @@ public Mono> getTextFloat32WithResponse(RequestOptions requ
     /**
      * The getTextFloat64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -536,12 +516,11 @@ public Mono> getTextFloat64WithResponse(RequestOptions requ
     /**
      * The getTextChar operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java
index 956a41fe67b..19e75ca2eeb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/ResponseClient.java
@@ -45,12 +45,11 @@ public final class ResponseClient {
     /**
      * The getBinary operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getBinaryWithResponse(RequestOptions requestOptions)
     /**
      * The getArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -79,8 +77,8 @@ public Response getBinaryWithResponse(RequestOptions requestOptions)
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -98,9 +96,8 @@ public Response getArrayWithResponse(RequestOptions requestOptions)
     /**
      * The getAnotherArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -109,8 +106,8 @@ public Response getArrayWithResponse(RequestOptions requestOptions)
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,23 +125,21 @@ public Response getAnotherArrayWithResponse(RequestOptions requestOp
     /**
      * The createWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -185,12 +180,11 @@ public Response deleteWithHeadersWithResponse(RequestOptions requestOption
     /**
      * The most basic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -207,17 +201,16 @@ public Response existsWithResponse(RequestOptions requestOptions) {
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -237,17 +230,16 @@ public SyncPoller beginLroInvalidPollResponse(BinaryData
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -266,12 +258,11 @@ public SyncPoller beginLroInvalidResult(BinaryData reque
     /**
      * The listStrings operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -289,12 +280,11 @@ public PagedIterable listStrings(RequestOptions requestOptions) {
     /**
      * The listIntegers operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -312,17 +302,16 @@ public PagedIterable listIntegers(RequestOptions requestOptions) {
     /**
      * The getJsonUtf8Response operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -340,17 +329,16 @@ public Response getJsonUtf8ResponseWithResponse(RequestOptions reque
     /**
      * The getPlusJsonResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -368,12 +356,11 @@ public Response getPlusJsonResponseWithResponse(RequestOptions reque
     /**
      * The getUnionResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -391,12 +378,11 @@ public Response getUnionResponseWithResponse(RequestOptions requestO
     /**
      * The getTextBoolean operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -414,12 +400,11 @@ public Response getTextBooleanWithResponse(RequestOptions requestOpt
     /**
      * The getTextByte operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -437,12 +422,11 @@ public Response getTextByteWithResponse(RequestOptions requestOption
     /**
      * The getTextInt32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -460,12 +444,11 @@ public Response getTextInt32WithResponse(RequestOptions requestOptio
     /**
      * The getTextInt64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * long
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -483,12 +466,11 @@ public Response getTextInt64WithResponse(RequestOptions requestOptio
     /**
      * The getTextFloat32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -506,12 +488,11 @@ public Response getTextFloat32WithResponse(RequestOptions requestOpt
     /**
      * The getTextFloat64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -529,12 +510,11 @@ public Response getTextFloat64WithResponse(RequestOptions requestOpt
     /**
      * The getTextChar operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java
index 6658c3b11bc..7955ef14cda 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/response/implementation/ResponseClientImpl.java
@@ -550,12 +550,11 @@ Response listStringsNextSync(@PathParam(value = "nextLink", encoded
     /**
      * The getBinary operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -573,12 +572,11 @@ public Mono> getBinaryWithResponseAsync(RequestOptions requ
     /**
      * The getBinary operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -596,9 +594,8 @@ public Response getBinaryWithResponse(RequestOptions requestOptions)
     /**
      * The getArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -607,8 +604,8 @@ public Response getBinaryWithResponse(RequestOptions requestOptions)
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -626,9 +623,8 @@ public Mono> getArrayWithResponseAsync(RequestOptions reque
     /**
      * The getArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -637,8 +633,8 @@ public Mono> getArrayWithResponseAsync(RequestOptions reque
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -656,9 +652,8 @@ public Response getArrayWithResponse(RequestOptions requestOptions)
     /**
      * The getAnotherArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -667,8 +662,8 @@ public Response getArrayWithResponse(RequestOptions requestOptions)
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -687,9 +682,8 @@ public Mono> getAnotherArrayWithResponseAsync(RequestOption
     /**
      * The getAnotherArray operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         id: String (Required)
@@ -698,8 +692,8 @@ public Mono> getAnotherArrayWithResponseAsync(RequestOption
      *         type: String (Required)
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -717,23 +711,21 @@ public Response getAnotherArrayWithResponse(RequestOptions requestOp
     /**
      * The createWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -753,23 +745,21 @@ public Mono> createWithHeadersWithResponseAsync(RequestOpti
     /**
      * The createWithHeaders operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.
Response Headers
NameTypeDescription
operation-locationStringThe operation-location response header.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -830,12 +820,11 @@ public Response deleteWithHeadersWithResponse(RequestOptions requestOption
     /**
      * The most basic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -852,12 +841,11 @@ public Mono> existsWithResponseAsync(RequestOptions requestOpt
     /**
      * The most basic operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -874,17 +862,16 @@ public Response existsWithResponse(RequestOptions requestOptions) {
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -905,17 +892,16 @@ private Mono> lroInvalidPollResponseWithResponseAsync(BinaryData
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -935,17 +921,16 @@ private Response lroInvalidPollResponseWithResponse(BinaryData request, Re
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -974,17 +959,16 @@ public PollerFlux beginLroInvalidPollResponseWithMo
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1013,17 +997,16 @@ public SyncPoller beginLroInvalidPollResponseWithMo
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1052,17 +1035,16 @@ public PollerFlux beginLroInvalidPollResponseAsync(Binar
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1091,17 +1073,16 @@ public SyncPoller beginLroInvalidPollResponse(BinaryData
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1121,17 +1102,16 @@ private Mono> lroInvalidResultWithResponseAsync(BinaryData reques
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1151,17 +1131,16 @@ private Response lroInvalidResultWithResponse(BinaryData request, RequestO
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1190,17 +1169,16 @@ public PollerFlux beginLroInvalidResultWithModelAsy
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1229,17 +1207,16 @@ public SyncPoller beginLroInvalidResultWithModel(Bi
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1268,17 +1245,16 @@ public PollerFlux beginLroInvalidResultAsync(BinaryData
     /**
      * The most basic operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param request The request parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -1306,12 +1282,11 @@ public SyncPoller beginLroInvalidResult(BinaryData reque
     /**
      * The listStrings operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1331,12 +1306,11 @@ private Mono> listStringsSinglePageAsync(RequestOption
     /**
      * The listStrings operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1357,12 +1331,11 @@ public PagedFlux listStringsAsync(RequestOptions requestOptions) {
     /**
      * The listStrings operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1382,12 +1355,11 @@ private PagedResponse listStringsSinglePage(RequestOptions requestOp
     /**
      * The listStrings operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1408,12 +1380,11 @@ public PagedIterable listStrings(RequestOptions requestOptions) {
     /**
      * The listIntegers operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1434,12 +1405,11 @@ private Mono> listIntegersSinglePageAsync(RequestOptio
     /**
      * The listIntegers operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1456,12 +1426,11 @@ public PagedFlux listIntegersAsync(RequestOptions requestOptions) {
     /**
      * The listIntegers operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1481,12 +1450,11 @@ private PagedResponse listIntegersSinglePage(RequestOptions requestO
     /**
      * The listIntegers operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1503,17 +1471,16 @@ public PagedIterable listIntegers(RequestOptions requestOptions) {
     /**
      * The getJsonUtf8Response operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1532,17 +1499,16 @@ public Mono> getJsonUtf8ResponseWithResponseAsync(RequestOp
     /**
      * The getJsonUtf8Response operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1560,17 +1526,16 @@ public Response getJsonUtf8ResponseWithResponse(RequestOptions reque
     /**
      * The getPlusJsonResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1589,17 +1554,16 @@ public Mono> getPlusJsonResponseWithResponseAsync(RequestOp
     /**
      * The getPlusJsonResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1617,12 +1581,11 @@ public Response getPlusJsonResponseWithResponse(RequestOptions reque
     /**
      * The getUnionResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1641,12 +1604,11 @@ public Mono> getUnionResponseWithResponseAsync(RequestOptio
     /**
      * The getUnionResponse operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1664,20 +1626,18 @@ public Response getUnionResponseWithResponse(RequestOptions requestO
     /**
      * The getTextBoolean operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return boolean with `true` and `false` values along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return boolean with `true` and `false` values along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getTextBooleanWithResponseAsync(RequestOptions requestOptions) {
@@ -1689,12 +1649,11 @@ public Mono> getTextBooleanWithResponseAsync(RequestOptions
     /**
      * The getTextBoolean operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1712,12 +1671,11 @@ public Response getTextBooleanWithResponse(RequestOptions requestOpt
     /**
      * The getTextByte operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1736,12 +1694,11 @@ public Mono> getTextByteWithResponseAsync(RequestOptions re
     /**
      * The getTextByte operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1759,12 +1716,11 @@ public Response getTextByteWithResponse(RequestOptions requestOption
     /**
      * The getTextInt32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1783,12 +1739,11 @@ public Mono> getTextInt32WithResponseAsync(RequestOptions r
     /**
      * The getTextInt32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1806,12 +1761,11 @@ public Response getTextInt32WithResponse(RequestOptions requestOptio
     /**
      * The getTextInt64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * long
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1830,12 +1784,11 @@ public Mono> getTextInt64WithResponseAsync(RequestOptions r
     /**
      * The getTextInt64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * long
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1853,12 +1806,11 @@ public Response getTextInt64WithResponse(RequestOptions requestOptio
     /**
      * The getTextFloat32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1877,12 +1829,11 @@ public Mono> getTextFloat32WithResponseAsync(RequestOptions
     /**
      * The getTextFloat32 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1900,12 +1851,11 @@ public Response getTextFloat32WithResponse(RequestOptions requestOpt
     /**
      * The getTextFloat64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1924,12 +1874,11 @@ public Mono> getTextFloat64WithResponseAsync(RequestOptions
     /**
      * The getTextFloat64 operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * double
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1947,12 +1896,11 @@ public Response getTextFloat64WithResponse(RequestOptions requestOpt
     /**
      * The getTextChar operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1971,12 +1919,11 @@ public Mono> getTextCharWithResponseAsync(RequestOptions re
     /**
      * The getTextChar operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * int
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -1994,12 +1941,11 @@ public Response getTextCharWithResponse(RequestOptions requestOption
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -2023,12 +1969,11 @@ private Mono> listStringsNextSinglePageAsync(String ne
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceAsyncClient.java
index c951da10ef7..3aee418616d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceAsyncClient.java
@@ -40,12 +40,11 @@ public final class ServiceAsyncClient {
     /**
      * The getStatus operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClient.java
index 4cf4e0b0ecb..94648568fea 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClient.java
@@ -37,12 +37,11 @@ public final class ServiceClient {
     /**
      * The getStatus operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictAsyncClient.java
index 3d6f22fc2ce..5d57be9dbde 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictAsyncClient.java
@@ -40,12 +40,11 @@ public final class ServiceClientNameConflictAsyncClient {
     /**
      * The ping operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictClient.java
index af880e6cddb..f8828235ce5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/ServiceClientNameConflictClient.java
@@ -38,12 +38,11 @@ public final class ServiceClientNameConflictClient {
     /**
      * The ping operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServiceClientNameConflictClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServiceClientNameConflictClientImpl.java
index fa1172ab503..7f65388d87c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServiceClientNameConflictClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServiceClientNameConflictClientImpl.java
@@ -162,12 +162,11 @@ Response pingSync(@HostParam("endpoint") String endpoint, @HeaderPar
     /**
      * The ping operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -185,12 +184,11 @@ public Mono> pingWithResponseAsync(RequestOptions requestOp
     /**
      * The ping operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServicesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServicesImpl.java
index 405ab245287..2f0c6438dcf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServicesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/serviceclientnameconflict/implementation/ServicesImpl.java
@@ -78,12 +78,11 @@ Response getStatusSync(@HostParam("endpoint") String endpoint, @Head
     /**
      * The getStatus operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -102,12 +101,11 @@ public Mono> getStatusWithResponseAsync(RequestOptions requ
     /**
      * The getStatus operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsAsyncClient.java
index e79f25dca45..b8236ebf59a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsAsyncClient.java
@@ -42,19 +42,16 @@ public final class SpecialCharsAsyncClient {
     /**
      * The read operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     aggregate: String (Optional)
@@ -62,8 +59,8 @@ public final class SpecialCharsAsyncClient {
      *     requestName: String (Optional)
      *     value: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param readRequest The readRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsClient.java
index d2aa4383b92..f2413dd4a01 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/SpecialCharsClient.java
@@ -40,19 +40,16 @@ public final class SpecialCharsClient {
     /**
      * The read operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     aggregate: String (Optional)
@@ -60,8 +57,8 @@ public final class SpecialCharsClient {
      *     requestName: String (Optional)
      *     value: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param readRequest The readRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/implementation/BuiltinOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/implementation/BuiltinOpsImpl.java
index 47b41b90c7b..fd2749331fe 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/implementation/BuiltinOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialchars/implementation/BuiltinOpsImpl.java
@@ -82,19 +82,16 @@ Response readSync(@HostParam("endpoint") String endpoint,
     /**
      * The read operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     aggregate: String (Optional)
@@ -102,8 +99,8 @@ Response readSync(@HostParam("endpoint") String endpoint,
      *     requestName: String (Optional)
      *     value: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param readRequest The readRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -124,19 +121,16 @@ public Mono> readWithResponseAsync(BinaryData readRequest,
     /**
      * The read operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     aggregate: String (Optional)
@@ -144,8 +138,8 @@ public Mono> readWithResponseAsync(BinaryData readRequest,
      *     requestName: String (Optional)
      *     value: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param readRequest The readRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java
index 1206ca51c9c..394788fc5f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java
@@ -53,49 +53,41 @@ public final class EtagHeadersAsyncClient {
      * Create or replace operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -118,45 +110,39 @@ public Mono> putWithRequestHeadersWithResponse(String name,
      * Create or update operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -178,17 +164,16 @@ public Mono> patchWithMatchHeadersWithResponse(String name,
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersClient.java
index a5801eeb798..8fb19024ed9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersClient.java
@@ -47,49 +47,41 @@ public final class EtagHeadersClient {
      * Create or replace operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -112,45 +104,39 @@ public Response putWithRequestHeadersWithResponse(String name, Binar
      * Create or update operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -172,17 +158,16 @@ public Response patchWithMatchHeadersWithResponse(String name, Binar
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyAsyncClient.java
index 642aeefc0ba..0b4bf94b11a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyAsyncClient.java
@@ -46,53 +46,45 @@ public final class EtagHeadersOptionalBodyAsyncClient {
      * etag headers among other optional query/header/body parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyClient.java
index 5b481b428f2..2a1bdcbabf2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersOptionalBodyClient.java
@@ -44,53 +44,45 @@ public final class EtagHeadersOptionalBodyClient {
      * etag headers among other optional query/header/body parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersAsyncClient.java
index 8c775a2f351..bb2ea1cf6d9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersAsyncClient.java
@@ -44,17 +44,16 @@ public final class RepeatabilityHeadersAsyncClient {
     /**
      * Resource read operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -74,45 +73,39 @@ public Mono> getWithResponse(String name, RequestOptions re
      * Send a put request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -134,32 +127,28 @@ public Mono> putWithResponse(String name, BinaryData resour
      * Send a post request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -180,38 +169,34 @@ public Mono> postWithResponse(String name, RequestOptions r
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java
index 4658166e941..11df9ed1b7f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java
@@ -42,17 +42,16 @@ public final class RepeatabilityHeadersClient {
     /**
      * Resource read operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -72,45 +71,39 @@ public Response getWithResponse(String name, RequestOptions requestO
      * Send a put request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -132,32 +125,28 @@ public Response putWithResponse(String name, BinaryData resource, Re
      * Send a post request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -178,38 +167,34 @@ public Response postWithResponse(String name, RequestOptions request
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java
index 9cf0db4bbe7..6ed09b1ea6a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java
@@ -170,49 +170,41 @@ Response listWithEtagNextSync(@PathParam(value = "nextLink", encoded
      * Create or replace operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -238,49 +230,41 @@ public Mono> putWithRequestHeadersWithResponseAsync(String
      * Create or replace operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -306,45 +290,39 @@ public Response putWithRequestHeadersWithResponse(String name, Binar
      * Create or update operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -370,45 +348,39 @@ public Mono> patchWithMatchHeadersWithResponseAsync(String
      * Create or update operation template.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
Header Parameters
NameTypeRequiredDescription
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.
Response Headers
NameTypeDescription
ETagStringThe entity tag for the response.

      * 
      * @param name The name parameter.
@@ -433,25 +405,23 @@ public Response patchWithMatchHeadersWithResponse(String name, Binar
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithEtagSinglePageAsync(RequestOptions requestOptions) {
@@ -466,17 +436,16 @@ private Mono> listWithEtagSinglePageAsync(RequestOptio
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -497,17 +466,16 @@ public PagedFlux listWithEtagAsync(RequestOptions requestOptions) {
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -528,17 +496,16 @@ private PagedResponse listWithEtagSinglePage(RequestOptions requestO
     /**
      * Resource list operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -559,17 +526,16 @@ public PagedIterable listWithEtag(RequestOptions requestOptions) {
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -577,8 +543,7 @@ public PagedIterable listWithEtag(RequestOptions requestOptions) {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listWithEtagNextSinglePageAsync(String nextLink,
@@ -593,17 +558,16 @@ private Mono> listWithEtagNextSinglePageAsync(String n
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersOptionalBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersOptionalBodiesImpl.java
index 479f4d90c6b..22930907d3d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersOptionalBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersOptionalBodiesImpl.java
@@ -94,53 +94,45 @@ Response putWithOptionalBodySync(@HostParam("endpoint") String endpo
      * etag headers among other optional query/header/body parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -168,53 +160,45 @@ public Mono> putWithOptionalBodyWithResponseAsync(String fo
      * etag headers among other optional query/header/body parameters.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
-     * "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this
-     * string.
If-None-MatchStringNoThe request should only proceed if no entity matches this
-     * string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the
-     * entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity
-     * was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json".
If-MatchStringNoThe request should only proceed if an entity matches this string.
If-None-MatchStringNoThe request should only proceed if no entity matches this string.
If-Unmodified-SinceOffsetDateTimeNoThe request should only proceed if the entity was not modified after this time.
If-Modified-SinceOffsetDateTimeNoThe request should only proceed if the entity was modified after this time.
timestampOffsetDateTimeNoThe timestamp parameter

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param format The format parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/RepeatabilityHeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/RepeatabilityHeadersImpl.java
index d97f350ff6a..fc4e461816b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/RepeatabilityHeadersImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/RepeatabilityHeadersImpl.java
@@ -174,17 +174,16 @@ Response createLroSync(@HostParam("endpoint") String endpoint,
     /**
      * Resource read operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,17 +203,16 @@ public Mono> getWithResponseAsync(String name, RequestOptio
     /**
      * Resource read operation template.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -235,45 +233,39 @@ public Response getWithResponse(String name, RequestOptions requestO
      * Send a put request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -313,45 +305,39 @@ public Mono> putWithResponseAsync(String name, BinaryData r
      * Send a put request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -389,32 +375,28 @@ public Response putWithResponse(String name, BinaryData resource, Re
      * Send a post request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -450,32 +432,28 @@ public Mono> postWithResponseAsync(String name, RequestOpti
      * Send a post request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or
-     * rejected.
Response Headers
NameTypeDescription
Repeatability-ResultStringIndicates whether the repeatable request was accepted or rejected.

      * 
      * @param name The name parameter.
@@ -511,38 +489,34 @@ public Response postWithResponse(String name, RequestOptions request
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -581,38 +555,34 @@ private Mono> createLroWithResponseAsync(String name, Binar
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -650,38 +620,34 @@ private Response createLroWithResponse(String name, BinaryData resou
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -712,38 +678,34 @@ public PollerFlux beginCreateLroWithModelAsync(S
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -774,38 +736,34 @@ public SyncPoller beginCreateLroWithModel(String
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -836,38 +794,34 @@ public PollerFlux beginCreateLroAsync(String name, Binar
      * Send a LRO request with header Repeatability-Request-ID and Repeatability-First-Sent.
      * 
Header Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as
-     * HTTP-date
Header Parameters
NameTypeRequiredDescription
repeatability-request-idStringNoRepeatability request ID header
repeatability-first-sentStringNoRepeatability first sent header as HTTP-date

      * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     description: String (Optional)
      *     type: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassAsyncClient.java
index b1dde9b3e0b..8fc8ce26f49 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassAsyncClient.java
@@ -41,9 +41,8 @@ public final class SubclassAsyncClient {
     /**
      * The propertyInSubclass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -56,13 +55,11 @@ public final class SubclassAsyncClient {
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -75,8 +72,8 @@ public final class SubclassAsyncClient {
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassClient.java
index 775c7673366..109a68c505d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/SubclassClient.java
@@ -39,9 +39,8 @@ public final class SubclassClient {
     /**
      * The propertyInSubclass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -54,13 +53,11 @@ public final class SubclassClient {
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -73,8 +70,8 @@ public final class SubclassClient {
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/implementation/SubclassImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/implementation/SubclassImpl.java
index 92a552910a3..e567e816510 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/implementation/SubclassImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/subclass/implementation/SubclassImpl.java
@@ -81,9 +81,8 @@ Response propertyInSubclassSync(@HostParam("endpoint") String endpoi
     /**
      * The propertyInSubclass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -96,13 +95,11 @@ Response propertyInSubclassSync(@HostParam("endpoint") String endpoi
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -115,8 +112,8 @@ Response propertyInSubclassSync(@HostParam("endpoint") String endpoi
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -138,9 +135,8 @@ public Mono> propertyInSubclassWithResponseAsync(BinaryData
     /**
      * The propertyInSubclass operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -153,13 +149,11 @@ public Mono> propertyInSubclassWithResponseAsync(BinaryData
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     duplicateRequiredProperty (Optional): {
      *         property: String (Required)
@@ -172,8 +166,8 @@ public Mono> propertyInSubclassWithResponseAsync(BinaryData
      *         propertyChangedToConstant: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionAsyncClient.java
index 456d8a5bed5..8f8c25847fe 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionAsyncClient.java
@@ -47,17 +47,16 @@ public final class UnionAsyncClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
      *     }
      *     input: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -78,15 +77,14 @@ public Mono> sendWithResponse(String id, BinaryData sendRequest,
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -97,8 +95,8 @@ public Mono> sendWithResponse(String id, BinaryData sendRequest,
      *     dataLong: Long (Optional)
      *     data_float: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -142,9 +140,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) {
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -166,8 +163,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) {
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionClient.java
index 9b0be2464f1..a7fb3823cde 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/UnionClient.java
@@ -45,17 +45,16 @@ public final class UnionClient {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
      *     }
      *     input: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -76,15 +75,14 @@ public Response sendWithResponse(String id, BinaryData sendRequest, Reques
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -95,8 +93,8 @@ public Response sendWithResponse(String id, BinaryData sendRequest, Reques
      *     dataLong: Long (Optional)
      *     data_float: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -139,9 +137,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -163,8 +160,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/implementation/UnionFlattenOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/implementation/UnionFlattenOpsImpl.java
index 852855dd53d..f14d93e8857 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/implementation/UnionFlattenOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/union/implementation/UnionFlattenOpsImpl.java
@@ -158,17 +158,16 @@ Response generateSync(@HostParam("endpoint") String endpoint,
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
      *     }
      *     input: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -190,17 +189,16 @@ public Mono> sendWithResponseAsync(String id, BinaryData sendRequ
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
      *     }
      *     input: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendRequest The sendRequest parameter.
@@ -222,15 +220,14 @@ public Response sendWithResponse(String id, BinaryData sendRequest, Reques
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -241,8 +238,8 @@ public Response sendWithResponse(String id, BinaryData sendRequest, Reques
      *     dataLong: Long (Optional)
      *     data_float: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -265,15 +262,14 @@ public Mono> sendLongWithResponseAsync(String id, BinaryData send
      * The sendLong operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter
Query Parameters
NameTypeRequiredDescription
filterStringNoThe filter parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     user (Optional): {
      *         user: String (Required)
@@ -284,8 +280,8 @@ public Mono> sendLongWithResponseAsync(String id, BinaryData send
      *     dataLong: Long (Optional)
      *     data_float: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param id The id parameter.
      * @param sendLongRequest The sendLongRequest parameter.
@@ -350,9 +346,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -374,16 +369,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> generateWithResponseAsync(RequestOptions requestOptions) {
@@ -395,9 +389,8 @@ private Mono> generateWithResponseAsync(RequestOptions requ
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -419,8 +412,8 @@ private Mono> generateWithResponseAsync(RequestOptions requ
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -439,9 +432,8 @@ private Response generateWithResponse(RequestOptions requestOptions)
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -463,8 +455,8 @@ private Response generateWithResponse(RequestOptions requestOptions)
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -490,9 +482,8 @@ public PollerFlux beginGenerateWithModelAsync(Requ
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -514,8 +505,8 @@ public PollerFlux beginGenerateWithModelAsync(Requ
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -541,9 +532,8 @@ public SyncPoller beginGenerateWithModel(RequestOp
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -565,8 +555,8 @@ public SyncPoller beginGenerateWithModel(RequestOp
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -592,9 +582,8 @@ public PollerFlux beginGenerateAsync(RequestOptions requ
     /**
      * A long-running remote procedure call (RPC) operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -616,8 +605,8 @@ public PollerFlux beginGenerateAsync(RequestOptions requ
      *         data: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningAsyncClient.java
index eb81728b5fa..8e5aba0e994 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningAsyncClient.java
@@ -48,15 +48,14 @@ public final class VersioningAsyncClient {
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -77,8 +76,8 @@ public final class VersioningAsyncClient {
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -98,24 +97,22 @@ public PollerFlux beginExport(String name, RequestOption
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -133,28 +130,25 @@ public PagedFlux list(RequestOptions requestOptions) {
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningClient.java
index 3b630bf2fd8..ec8e7f40e45 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/VersioningClient.java
@@ -44,15 +44,14 @@ public final class VersioningClient {
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -73,8 +72,8 @@ public final class VersioningClient {
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -94,24 +93,22 @@ public SyncPoller beginExport(String name, RequestOption
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,28 +126,25 @@ public PagedIterable list(RequestOptions requestOptions) {
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/implementation/VersioningOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/implementation/VersioningOpsImpl.java
index 872525725b9..5005b10018c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/implementation/VersioningOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/versioning/implementation/VersioningOpsImpl.java
@@ -174,15 +174,14 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -203,8 +202,8 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -212,8 +211,7 @@ Response listNextSync(@PathParam(value = "nextLink", encoded = true)
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return provides status details for long running operations along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return provides status details for long running operations along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> exportWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -226,15 +224,14 @@ private Mono> exportWithResponseAsync(String name, RequestO
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -255,8 +252,8 @@ private Mono> exportWithResponseAsync(String name, RequestO
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -277,15 +274,14 @@ private Response exportWithResponse(String name, RequestOptions requ
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -306,8 +302,8 @@ private Response exportWithResponse(String name, RequestOptions requ
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -337,15 +333,14 @@ public PollerFlux beginExportWithModelAs
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -366,8 +361,8 @@ public PollerFlux beginExportWithModelAs
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -397,15 +392,14 @@ public SyncPoller beginExportWithModel(S
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -426,8 +420,8 @@ public SyncPoller beginExportWithModel(S
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -455,15 +449,14 @@ public PollerFlux beginExportAsync(String name, RequestO
      * Long-running resource action operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter
Query Parameters
NameTypeRequiredDescription
projectFileVersionStringNoThe projectFileVersion parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     status: String(NotStarted/Running/Succeeded/Failed/Canceled) (Required)
@@ -484,8 +477,8 @@ public PollerFlux beginExportAsync(String name, RequestO
      *         resourceUri: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -513,32 +506,29 @@ public SyncPoller beginExport(String name, RequestOption
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listSinglePageAsync(RequestOptions requestOptions) {
@@ -554,24 +544,22 @@ private Mono> listSinglePageAsync(RequestOptions reque
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -593,24 +581,22 @@ public PagedFlux listAsync(RequestOptions requestOptions) {
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -632,24 +618,22 @@ private PagedResponse listSinglePage(RequestOptions requestOptions)
      * Resource list operation template.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the
-     * response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter
Query Parameters
NameTypeRequiredDescription
selectList<String>NoSelect the specified fields to be included in the response. Call {@link RequestOptions#addQueryParam} to add string to array.
expandStringNoThe expand parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -670,28 +654,25 @@ public PagedIterable list(RequestOptions requestOptions) {
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -715,28 +696,25 @@ private Mono> createLongRunningWithResponseAsync(String nam
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -759,28 +737,25 @@ private Response createLongRunningWithResponse(String name, BinaryDa
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -809,28 +784,25 @@ public PollerFlux beginCreateLongRunningWithMode
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -859,28 +831,25 @@ public SyncPoller beginCreateLongRunningWithMode
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -909,28 +878,25 @@ public PollerFlux beginCreateLongRunningAsync(String nam
     /**
      * Long-running resource create or replace operation template.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param name The name parameter.
      * @param resource The resource instance.
@@ -959,16 +925,15 @@ public SyncPoller beginCreateLongRunning(String name, Bi
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -976,8 +941,7 @@ public SyncPoller beginCreateLongRunning(String name, Bi
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return paged collection of Resource items along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listNextSinglePageAsync(String nextLink, RequestOptions requestOptions) {
@@ -992,16 +956,15 @@ private Mono> listNextSinglePageAsync(String nextLink,
     /**
      * Get the next page of items.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     name: String (Required)
      *     type: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param nextLink The URL to get the next list of items.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java
index 017e122759d..f524f17549f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java
@@ -44,16 +44,15 @@ public final class VisibilityOpAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,27 +70,24 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -110,26 +106,23 @@ public Mono> createWithResponse(BinaryData dog, RequestOpti
     /**
      * The query operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -148,26 +141,23 @@ public Mono> queryWithResponse(BinaryData dog, RequestOptio
     /**
      * The roundtrip operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java
index 71e79e643aa..71b3666df6c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java
@@ -42,16 +42,15 @@ public final class VisibilityOpClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,27 +68,24 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -108,26 +104,23 @@ public Response createWithResponse(BinaryData dog, RequestOptions re
     /**
      * The query operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -146,26 +139,23 @@ public Response queryWithResponse(BinaryData dog, RequestOptions req
     /**
      * The roundtrip operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java
index 90609bbb6bf..ae220c52221 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java
@@ -41,16 +41,15 @@ public final class VisibilityReadAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadClient.java
index d6726922eed..7233752fc62 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityReadClient.java
@@ -39,16 +39,15 @@ public final class VisibilityReadClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java
index 7ec5d34a39a..60b8cf6a68b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java
@@ -42,27 +42,24 @@ public final class VisibilityWriteAsyncClient {
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteClient.java
index 395be8d0786..43a09440416 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityWriteClient.java
@@ -40,27 +40,24 @@ public final class VisibilityWriteClient {
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java
index f7bc0de85ed..8d8306e7b5f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java
@@ -142,16 +142,15 @@ Response roundtripSync(@HostParam("endpoint") String endpoint,
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -169,16 +168,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -196,27 +194,24 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -237,27 +232,24 @@ public Mono> createWithResponseAsync(BinaryData dog, Reques
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -277,26 +269,23 @@ public Response createWithResponse(BinaryData dog, RequestOptions re
     /**
      * The query operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -317,26 +306,23 @@ public Mono> queryWithResponseAsync(BinaryData dog, Request
     /**
      * The query operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -356,26 +342,23 @@ public Response queryWithResponse(BinaryData dog, RequestOptions req
     /**
      * The roundtrip operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -396,26 +379,23 @@ public Mono> roundtripWithResponseAsync(BinaryData body, Re
     /**
      * The roundtrip operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     secretName: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java
index a4aaaf6cff8..251bca312a2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java
@@ -79,16 +79,15 @@ Response getSync(@HostParam("endpoint") String endpoint, @HeaderPara
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -106,16 +105,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java
index 97a84afde80..9497b89d92a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java
@@ -82,27 +82,24 @@ Response createSync(@HostParam("endpoint") String endpoint,
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,27 +120,24 @@ public Mono> createWithResponseAsync(BinaryData dog, Reques
     /**
      * The create operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: int (Required)
      *     secretName: String (Required)
      *     name: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param dog The dog parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeAsyncClient.java
index 666d435fc72..557d948210a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeAsyncClient.java
@@ -43,26 +43,23 @@ public final class WireTypeAsyncClient {
     /**
      * The superClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -81,26 +78,23 @@ public Mono> superClassMismatchWithResponse(BinaryData body
     /**
      * The subClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,26 +113,23 @@ public Mono> subClassMismatchWithResponse(BinaryData body,
     /**
      * The bothClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeClient.java
index 35b647d8d0a..8a8cf1320c0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/WireTypeClient.java
@@ -41,26 +41,23 @@ public final class WireTypeClient {
     /**
      * The superClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -79,26 +76,23 @@ public Response superClassMismatchWithResponse(BinaryData body, Requ
     /**
      * The subClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -117,26 +111,23 @@ public Response subClassMismatchWithResponse(BinaryData body, Reques
     /**
      * The bothClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/implementation/WireTypeOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/implementation/WireTypeOpsImpl.java
index 5ed40acce71..1b61da6991a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/implementation/WireTypeOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/wiretype/implementation/WireTypeOpsImpl.java
@@ -122,26 +122,23 @@ Response bothClassMismatchSync(@HostParam("endpoint") String endpoin
     /**
      * The superClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -163,26 +160,23 @@ public Mono> superClassMismatchWithResponseAsync(BinaryData
     /**
      * The superClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     dateTime: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -203,26 +197,23 @@ public Response superClassMismatchWithResponse(BinaryData body, Requ
     /**
      * The subClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -244,26 +235,23 @@ public Mono> subClassMismatchWithResponseAsync(BinaryData b
     /**
      * The subClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTime: OffsetDateTime (Required)
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -284,26 +272,23 @@ public Response subClassMismatchWithResponse(BinaryData body, Reques
     /**
      * The bothClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -325,26 +310,23 @@ public Mono> bothClassMismatchWithResponseAsync(BinaryData
     /**
      * The bothClassMismatch operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     dateTimeRfc7231: DateTimeRfc1123 (Required)
      *     base64url: Base64Url (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyAsyncClient.java
index 0b652a8a647..12099ff69ba 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyAsyncClient.java
@@ -40,12 +40,11 @@ public final class XmlBytesVerifyAsyncClient {
     /**
      * The getWmtsCapabilities operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyClient.java
index 191bf91185c..3392ecd67a8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/XmlBytesVerifyClient.java
@@ -38,12 +38,11 @@ public final class XmlBytesVerifyClient {
     /**
      * The getWmtsCapabilities operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/implementation/XmlBytesVerifyClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/implementation/XmlBytesVerifyClientImpl.java
index 7c7708d2d05..ebfff4d4326 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/implementation/XmlBytesVerifyClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/xmlbytesverify/implementation/XmlBytesVerifyClientImpl.java
@@ -146,12 +146,11 @@ Response getWmtsCapabilitiesSync(@HostParam("endpoint") String endpo
     /**
      * The getWmtsCapabilities operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -170,12 +169,11 @@ public Mono> getWmtsCapabilitiesWithResponseAsync(RequestOp
     /**
      * The getWmtsCapabilities operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * byte[]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueAsyncClient.java
index 9bbf1671c6b..7b5c80b3572 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class BooleanValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueClient.java
index e3d731f5b6c..c2678ca3327 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/BooleanValueClient.java
@@ -40,14 +40,13 @@ public final class BooleanValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueAsyncClient.java
index cb1702e76de..2e3d0334bed 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueAsyncClient.java
@@ -43,14 +43,13 @@ public final class DatetimeValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueClient.java
index 44734afc6b7..a447a666cc1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DatetimeValueClient.java
@@ -41,14 +41,13 @@ public final class DatetimeValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueAsyncClient.java
index 8d6f9523d03..cbbafc80e65 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueAsyncClient.java
@@ -43,14 +43,13 @@ public final class DurationValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueClient.java
index b3ba03b23bc..72438aefd69 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/DurationValueClient.java
@@ -41,14 +41,13 @@ public final class DurationValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueAsyncClient.java
index a1386b1c24e..23de960be4a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class Float32ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueClient.java
index 608520729dc..4f3430e0fb3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Float32ValueClient.java
@@ -40,14 +40,13 @@ public final class Float32ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueAsyncClient.java
index 0a837dad9ef..6bd28794b1c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class Int32ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueClient.java
index 305700f8374..ce047c62d9c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int32ValueClient.java
@@ -40,14 +40,13 @@ public final class Int32ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueAsyncClient.java
index 34d07aa6663..80c40a091b2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class Int64ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueClient.java
index cfb8b0a58a7..dcc794ac1da 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/Int64ValueClient.java
@@ -40,14 +40,13 @@ public final class Int64ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueAsyncClient.java
index bc5ade7e421..9fa495e1d5e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueAsyncClient.java
@@ -43,9 +43,8 @@ public final class ModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -54,8 +53,8 @@ public final class ModelValueAsyncClient {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -84,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueClient.java
index be1be233064..ae328e1ce34 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/ModelValueClient.java
@@ -41,9 +41,8 @@ public final class ModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -52,8 +51,8 @@ public final class ModelValueClient {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -82,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueAsyncClient.java
index 888d98930fa..1f6c64c00bb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class NullableBooleanValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueClient.java
index 5e483140a5c..666c0623db3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableBooleanValueClient.java
@@ -40,14 +40,13 @@ public final class NullableBooleanValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueAsyncClient.java
index 18038c63a41..22abab85d52 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class NullableFloatValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueClient.java
index 0b51260004d..5974b3e1d0e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableFloatValueClient.java
@@ -40,14 +40,13 @@ public final class NullableFloatValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueAsyncClient.java
index fe69a1dcdc2..515f1a4fa06 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class NullableInt32ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueClient.java
index 6e035666975..75c02744d4c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableInt32ValueClient.java
@@ -40,14 +40,13 @@ public final class NullableInt32ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueAsyncClient.java
index c927f36fddc..89c7f225cff 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueAsyncClient.java
@@ -43,9 +43,8 @@ public final class NullableModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -54,8 +53,8 @@ public final class NullableModelValueAsyncClient {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -84,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueClient.java
index f591e6052b5..b073524233f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableModelValueClient.java
@@ -41,9 +41,8 @@ public final class NullableModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -52,8 +51,8 @@ public final class NullableModelValueClient {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -82,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueAsyncClient.java
index c7db9b11b31..0e5c3271c83 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class NullableStringValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueClient.java
index aadd9cb42c6..391d0269653 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/NullableStringValueClient.java
@@ -40,14 +40,13 @@ public final class NullableStringValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueAsyncClient.java
index def28fad6ed..1c38dcbdd63 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class StringValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueClient.java
index 1e84dd09242..c84c7f841fe 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/StringValueClient.java
@@ -40,14 +40,13 @@ public final class StringValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueAsyncClient.java
index 61d56f34f48..7a98c012f2b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class UnknownValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueClient.java
index d6195f34cfc..d9bb4215d9a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/UnknownValueClient.java
@@ -40,14 +40,13 @@ public final class UnknownValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/BooleanValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/BooleanValuesImpl.java
index aa3c3d9443b..703655ba252 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/BooleanValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/BooleanValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DatetimeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DatetimeValuesImpl.java
index cdd53816822..14a0215e59d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DatetimeValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DatetimeValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     OffsetDateTime (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DurationValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DurationValuesImpl.java
index 2786d40626e..b8ca7741b26 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DurationValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/DurationValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Duration (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Float32ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Float32ValuesImpl.java
index 4f8a5eb5fcc..231b90b509f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Float32ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Float32ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int32ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int32ValuesImpl.java
index f62ba702281..492446132ea 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int32ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int32ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int64ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int64ValuesImpl.java
index e2f1ba3ff11..56c993e04c2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int64ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/Int64ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     long (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/ModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/ModelValuesImpl.java
index 6b4e459536a..2393df6c355 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/ModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/ModelValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableBooleanValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableBooleanValuesImpl.java
index 29e8ceb5277..e2225a5a6df 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableBooleanValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableBooleanValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     boolean (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableFloatValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableFloatValuesImpl.java
index 476dc3facd1..e9d215a89fc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableFloatValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableFloatValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     double (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableInt32ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableInt32ValuesImpl.java
index 754ef970df4..da74bc47087 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableInt32ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableInt32ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     int (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableModelValuesImpl.java
index aab7f8fb8c0..df112b6f4dd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableModelValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *      (Required){
      *         property: String (Required)
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         ]
      *     }
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableStringValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableStringValuesImpl.java
index 7f27e414ac4..5f10a808aa2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableStringValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/NullableStringValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/StringValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/StringValuesImpl.java
index 9694d285f4a..aa0877373a4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/StringValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/StringValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     String (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/UnknownValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/UnknownValuesImpl.java
index dc82f2d5adc..906749994d2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/UnknownValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/array/implementation/UnknownValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     Object (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueAsyncClient.java
index 79e8b86247e..7694815d288 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class BooleanValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueClient.java
index 0076abfae86..80d57d34639 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/BooleanValueClient.java
@@ -40,14 +40,13 @@ public final class BooleanValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueAsyncClient.java
index ecb428b457a..bad43c65b22 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueAsyncClient.java
@@ -43,14 +43,13 @@ public final class DatetimeValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueClient.java
index 77cb986ba8c..7b5a0d29e1b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DatetimeValueClient.java
@@ -41,14 +41,13 @@ public final class DatetimeValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueAsyncClient.java
index a8d09e2c9b0..47550cf3480 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueAsyncClient.java
@@ -43,14 +43,13 @@ public final class DurationValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueClient.java
index bd1f5390b11..84e9e92b195 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/DurationValueClient.java
@@ -41,14 +41,13 @@ public final class DurationValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueAsyncClient.java
index cc7d7846de9..87e1a922b85 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class Float32ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueClient.java
index d817962bb16..0c2a64db8d9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Float32ValueClient.java
@@ -40,14 +40,13 @@ public final class Float32ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueAsyncClient.java
index 4d43ff75e68..8c5604fa91c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class Int32ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueClient.java
index 0cd6daa110a..1818384f633 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int32ValueClient.java
@@ -40,14 +40,13 @@ public final class Int32ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueAsyncClient.java
index 25587345b30..a7bfc2390d7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class Int64ValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueClient.java
index 32ce36c0f72..20a6970fd13 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/Int64ValueClient.java
@@ -40,14 +40,13 @@ public final class Int64ValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueAsyncClient.java
index 65d4328f7f5..3b6dfe0a905 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueAsyncClient.java
@@ -43,9 +43,8 @@ public final class ModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -54,8 +53,8 @@ public final class ModelValueAsyncClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -84,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueClient.java
index e7878acb97a..e2be49210d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/ModelValueClient.java
@@ -41,9 +41,8 @@ public final class ModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -52,8 +51,8 @@ public final class ModelValueClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -82,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueAsyncClient.java
index c788f835e19..25440cc9e13 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class NullableFloatValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueClient.java
index 0a1367bbd03..62cd3fd038e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/NullableFloatValueClient.java
@@ -40,14 +40,13 @@ public final class NullableFloatValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueAsyncClient.java
index 23469aaea18..1749938442d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueAsyncClient.java
@@ -43,9 +43,8 @@ public final class RecursiveModelValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -54,8 +53,8 @@ public final class RecursiveModelValueAsyncClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -84,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueClient.java
index 98c6341f213..b5279aeed2c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/RecursiveModelValueClient.java
@@ -41,9 +41,8 @@ public final class RecursiveModelValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -52,8 +51,8 @@ public final class RecursiveModelValueClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -82,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueAsyncClient.java
index e462708f0fb..f61ab87d67c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class StringValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueClient.java
index b8ffe7c9f1f..4d2931b2f88 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/StringValueClient.java
@@ -40,14 +40,13 @@ public final class StringValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueAsyncClient.java
index e60710933ed..c3c8fc1d790 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueAsyncClient.java
@@ -42,14 +42,13 @@ public final class UnknownValueAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueClient.java
index 858d8ad9938..1991bad2fac 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/UnknownValueClient.java
@@ -40,14 +40,13 @@ public final class UnknownValueClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/BooleanValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/BooleanValuesImpl.java
index c0105012c92..ba53b0cde57 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/BooleanValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/BooleanValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java
index 955d34195ca..72593bb7782 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DatetimeValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DurationValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DurationValuesImpl.java
index a5da3d93d7e..8a913f5fe0a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DurationValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/DurationValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Float32ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Float32ValuesImpl.java
index c2eb99529cc..08ffbbb4b89 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Float32ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Float32ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int32ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int32ValuesImpl.java
index 79ed16d7319..2c1271256f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int32ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int32ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int64ValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int64ValuesImpl.java
index bc068e5d4e0..283f1fe1ab1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int64ValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/Int64ValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: long (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/ModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/ModelValuesImpl.java
index 7938add53e1..708e2f2da87 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/ModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/ModelValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java
index cf4d90b2eb8..2ef1452ba6f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/NullableFloatValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java
index c139317a6fa..11d43620dec 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/RecursiveModelValuesImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String (Required): {
      *         property: String (Required)
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/StringValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/StringValuesImpl.java
index e8ba4fc5e33..1549934c91b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/StringValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/StringValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/UnknownValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/UnknownValuesImpl.java
index 23699055a5c..0ec197d014a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/UnknownValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/dictionary/implementation/UnknownValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     String: Object (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleAsyncClient.java
index 789457d82b4..a0a0fdf43ca 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleAsyncClient.java
@@ -41,12 +41,11 @@ public final class ExtensibleAsyncClient {
     /**
      * The getKnownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,12 +63,11 @@ public Mono> getKnownValueWithResponse(RequestOptions reque
     /**
      * The getUnknownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -87,12 +85,11 @@ public Mono> getUnknownValueWithResponse(RequestOptions req
     /**
      * The putKnownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -111,12 +108,11 @@ public Mono> putKnownValueWithResponse(BinaryData body, RequestOp
     /**
      * The putUnknownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleClient.java
index c8e8c9a9023..4b799090d4a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/ExtensibleClient.java
@@ -39,12 +39,11 @@ public final class ExtensibleClient {
     /**
      * The getKnownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,12 +61,11 @@ public Response getKnownValueWithResponse(RequestOptions requestOpti
     /**
      * The getUnknownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -85,12 +83,11 @@ public Response getUnknownValueWithResponse(RequestOptions requestOp
     /**
      * The putKnownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -109,12 +106,11 @@ public Response putKnownValueWithResponse(BinaryData body, RequestOptions
     /**
      * The putUnknownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/implementation/StringOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/implementation/StringOperationsImpl.java
index 661e7efc1d3..e343cb6c878 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/implementation/StringOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/extensible/implementation/StringOperationsImpl.java
@@ -139,12 +139,11 @@ Response putUnknownValueSync(@HostParam("endpoint") String endpoint,
     /**
      * The getKnownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -163,12 +162,11 @@ public Mono> getKnownValueWithResponseAsync(RequestOptions
     /**
      * The getKnownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -186,12 +184,11 @@ public Response getKnownValueWithResponse(RequestOptions requestOpti
     /**
      * The getUnknownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -210,12 +207,11 @@ public Mono> getUnknownValueWithResponseAsync(RequestOption
     /**
      * The getUnknownValue operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -233,12 +229,11 @@ public Response getUnknownValueWithResponse(RequestOptions requestOp
     /**
      * The putKnownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -258,12 +253,11 @@ public Mono> putKnownValueWithResponseAsync(BinaryData body, Requ
     /**
      * The putKnownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -282,12 +276,11 @@ public Response putKnownValueWithResponse(BinaryData body, RequestOptions
     /**
      * The putUnknownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -307,12 +300,11 @@ public Mono> putUnknownValueWithResponseAsync(BinaryData body, Re
     /**
      * The putUnknownValue operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedAsyncClient.java
index 028f968ed8e..7a2f9f804b4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedAsyncClient.java
@@ -41,12 +41,11 @@ public final class FixedAsyncClient {
     /**
      * getKnownValue.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,12 +63,11 @@ public Mono> getKnownValueWithResponse(RequestOptions reque
     /**
      * putKnownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -88,12 +86,11 @@ public Mono> putKnownValueWithResponse(BinaryData body, RequestOp
     /**
      * putUnknownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedClient.java
index ad9edda7295..d1105af80c3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/FixedClient.java
@@ -39,12 +39,11 @@ public final class FixedClient {
     /**
      * getKnownValue.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,12 +61,11 @@ public Response getKnownValueWithResponse(RequestOptions requestOpti
     /**
      * putKnownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -86,12 +84,11 @@ public Response putKnownValueWithResponse(BinaryData body, RequestOptions
     /**
      * putUnknownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/implementation/StringOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/implementation/StringOperationsImpl.java
index e1e4c02b3dc..1241a43d9b3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/implementation/StringOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/enums/fixed/implementation/StringOperationsImpl.java
@@ -121,12 +121,11 @@ Response putUnknownValueSync(@HostParam("endpoint") String endpoint,
     /**
      * getKnownValue.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -145,12 +144,11 @@ public Mono> getKnownValueWithResponseAsync(RequestOptions
     /**
      * getKnownValue.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,12 +166,11 @@ public Response getKnownValueWithResponse(RequestOptions requestOpti
     /**
      * putKnownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,12 +190,11 @@ public Mono> putKnownValueWithResponseAsync(BinaryData body, Requ
     /**
      * putKnownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -217,12 +213,11 @@ public Response putKnownValueWithResponse(BinaryData body, RequestOptions
     /**
      * putUnknownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -242,12 +237,11 @@ public Mono> putUnknownValueWithResponseAsync(BinaryData body, Re
     /**
      * putUnknownValue.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String(Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday)
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java
index c8ee554c3b6..eb6b6060376 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java
@@ -40,12 +40,11 @@ public final class FileAsyncClient {
     /**
      * The uploadFileSpecificContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -65,12 +64,11 @@ public Mono> uploadFileSpecificContentTypeWithResponse(BinaryData
     /**
      * The uploadFileJsonContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -89,12 +87,11 @@ public Mono> uploadFileJsonContentTypeWithResponse(BinaryData fil
     /**
      * The downloadFileJsonContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -112,12 +109,11 @@ public Mono> downloadFileJsonContentTypeWithResponse(Reques
     /**
      * The downloadFileSpecificContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -135,15 +131,13 @@ public Mono> downloadFileSpecificContentTypeWithResponse(Re
     /**
      * The uploadFileMultipleContentTypes operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values:
-     * "image/png", "image/jpeg".
+     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: "image/png", "image/jpeg".
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -164,18 +158,16 @@ public Mono> uploadFileMultipleContentTypesWithResponse(String co
     /**
      * The downloadFileMultipleContentTypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,12 +186,11 @@ public Mono> downloadFileMultipleContentTypesWithResponse(R
     /**
      * The uploadFileDefaultContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -219,18 +210,16 @@ public Mono> uploadFileDefaultContentTypeWithResponse(BinaryData
     /**
      * The downloadFileDefaultContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java
index 304123affc8..85b05db4564 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileClient.java
@@ -38,12 +38,11 @@ public final class FileClient {
     /**
      * The uploadFileSpecificContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -62,12 +61,11 @@ public Response uploadFileSpecificContentTypeWithResponse(BinaryData file,
     /**
      * The uploadFileJsonContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -86,12 +84,11 @@ public Response uploadFileJsonContentTypeWithResponse(BinaryData file, Req
     /**
      * The downloadFileJsonContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -109,12 +106,11 @@ public Response downloadFileJsonContentTypeWithResponse(RequestOptio
     /**
      * The downloadFileSpecificContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -132,15 +128,13 @@ public Response downloadFileSpecificContentTypeWithResponse(RequestO
     /**
      * The uploadFileMultipleContentTypes operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values:
-     * "image/png", "image/jpeg".
+     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: "image/png", "image/jpeg".
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -161,18 +155,16 @@ public Response uploadFileMultipleContentTypesWithResponse(String contentT
     /**
      * The downloadFileMultipleContentTypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,12 +183,11 @@ public Response downloadFileMultipleContentTypesWithResponse(Request
     /**
      * The uploadFileDefaultContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -215,18 +206,16 @@ public Response uploadFileDefaultContentTypeWithResponse(BinaryData file,
     /**
      * The downloadFileDefaultContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java
index 5a9b7256420..eed3b9fb8c9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/implementation/BodiesImpl.java
@@ -214,12 +214,11 @@ Response downloadFileDefaultContentTypeSync(@HostParam("endpoint") S
     /**
      * The uploadFileSpecificContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -240,12 +239,11 @@ public Mono> uploadFileSpecificContentTypeWithResponseAsync(Binar
     /**
      * The uploadFileSpecificContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -265,12 +263,11 @@ public Response uploadFileSpecificContentTypeWithResponse(BinaryData file,
     /**
      * The uploadFileJsonContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -291,12 +288,11 @@ public Mono> uploadFileJsonContentTypeWithResponseAsync(BinaryDat
     /**
      * The uploadFileJsonContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -316,12 +312,11 @@ public Response uploadFileJsonContentTypeWithResponse(BinaryData file, Req
     /**
      * The downloadFileJsonContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -340,12 +335,11 @@ public Mono> downloadFileJsonContentTypeWithResponseAsync(R
     /**
      * The downloadFileJsonContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -363,12 +357,11 @@ public Response downloadFileJsonContentTypeWithResponse(RequestOptio
     /**
      * The downloadFileSpecificContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -387,12 +380,11 @@ public Mono> downloadFileSpecificContentTypeWithResponseAsy
     /**
      * The downloadFileSpecificContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -411,15 +403,13 @@ public Response downloadFileSpecificContentTypeWithResponse(RequestO
     /**
      * The uploadFileMultipleContentTypes operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values:
-     * "image/png", "image/jpeg".
+     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: "image/png", "image/jpeg".
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -438,15 +428,13 @@ public Mono> uploadFileMultipleContentTypesWithResponseAsync(Stri
     /**
      * The uploadFileMultipleContentTypes operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
-     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values:
-     * "image/png", "image/jpeg".
+     * @param contentType Body parameter's content type. Known values are image/png,image/jpeg. Allowed values: "image/png", "image/jpeg".
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -465,18 +453,16 @@ public Response uploadFileMultipleContentTypesWithResponse(String contentT
     /**
      * The downloadFileMultipleContentTypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -496,18 +482,16 @@ public Mono> downloadFileMultipleContentTypesWithResponseAs
     /**
      * The downloadFileMultipleContentTypes operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -527,12 +511,11 @@ public Response downloadFileMultipleContentTypesWithResponse(Request
     /**
      * The uploadFileDefaultContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -553,12 +536,11 @@ public Mono> uploadFileDefaultContentTypeWithResponseAsync(Binary
     /**
      * The uploadFileDefaultContentType operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param file The file parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -578,18 +560,16 @@ public Response uploadFileDefaultContentTypeWithResponse(BinaryData file,
     /**
      * The downloadFileDefaultContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -609,18 +589,16 @@ public Mono> downloadFileDefaultContentTypeWithResponseAsyn
     /**
      * The downloadFileDefaultContentType operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Headers

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.
Response Headers
NameTypeDescription
Content-TypeStringThe allowed media (MIME) types of the file contents.

      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyAsyncClient.java
index 99e85e3c409..c649f065be5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyAsyncClient.java
@@ -43,13 +43,12 @@ public final class EmptyAsyncClient {
     /**
      * The putEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -68,21 +67,19 @@ public Mono> putEmptyWithResponse(BinaryData input, RequestOption
     /**
      * The getEmpty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return empty model used in operation return type along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return empty model used in operation return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,22 +90,19 @@ public Mono> getEmptyWithResponse(RequestOptions requestOpt
     /**
      * The postRoundTripEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -116,8 +110,7 @@ public Mono> getEmptyWithResponse(RequestOptions requestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return empty model used in both parameter and return type along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return empty model used in both parameter and return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyClient.java
index 86c278e83a9..061f0d09be8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/EmptyClient.java
@@ -41,13 +41,12 @@ public final class EmptyClient {
     /**
      * The putEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -66,13 +65,12 @@ public Response putEmptyWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getEmpty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -90,22 +88,19 @@ public Response getEmptyWithResponse(RequestOptions requestOptions)
     /**
      * The postRoundTripEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/implementation/EmptyClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/implementation/EmptyClientImpl.java
index 217ef782142..b2dea9e9a66 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/implementation/EmptyClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/empty/implementation/EmptyClientImpl.java
@@ -187,13 +187,12 @@ Response postRoundTripEmptySync(@HostParam("endpoint") String endpoi
     /**
      * The putEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -213,13 +212,12 @@ public Mono> putEmptyWithResponseAsync(BinaryData input, RequestO
     /**
      * The putEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -238,21 +236,19 @@ public Response putEmptyWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getEmpty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return empty model used in operation return type along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return empty model used in operation return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getEmptyWithResponseAsync(RequestOptions requestOptions) {
@@ -263,13 +259,12 @@ public Mono> getEmptyWithResponseAsync(RequestOptions reque
     /**
      * The getEmpty operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -287,22 +282,19 @@ public Response getEmptyWithResponse(RequestOptions requestOptions)
     /**
      * The postRoundTripEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -310,8 +302,7 @@ public Response getEmptyWithResponse(RequestOptions requestOptions)
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return empty model used in both parameter and return type along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return empty model used in both parameter and return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> postRoundTripEmptyWithResponseAsync(BinaryData body,
@@ -325,22 +316,19 @@ public Mono> postRoundTripEmptyWithResponseAsync(BinaryData
     /**
      * The postRoundTripEmpty operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorAsyncClient.java
index 8fb568f9f5c..cac6d4b0284 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorAsyncClient.java
@@ -42,23 +42,21 @@ public final class EnumDiscriminatorAsyncClient {
     /**
      * Receive model with extensible enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return test extensible enum type for discriminator along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return test extensible enum type for discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,15 +67,14 @@ public Mono> getExtensibleModelWithResponse(RequestOptions
     /**
      * Send model with extensible enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Dog to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -96,15 +93,14 @@ public Mono> putExtensibleModelWithResponse(BinaryData input, Req
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -123,23 +119,21 @@ public Mono> putExtensibleModelWithResponse(BinaryData input, Req
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a model containing discriminator value never defined along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return a model containing discriminator value never defined along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -150,23 +144,21 @@ public Mono> getExtensibleModelWrongDiscriminatorWithRespon
     /**
      * Receive model with fixed enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return test fixed enum type for discriminator along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return test fixed enum type for discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -177,15 +169,14 @@ public Mono> getFixedModelWithResponse(RequestOptions reque
     /**
      * Send model with fixed enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Snake to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,15 +195,14 @@ public Mono> putFixedModelWithResponse(BinaryData input, RequestO
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -230,23 +220,21 @@ public Mono> getFixedModelMissingDiscriminatorWithResponse(
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a model containing discriminator value never defined along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return a model containing discriminator value never defined along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java
index d22a71956e4..39a911e0ad5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/EnumDiscriminatorClient.java
@@ -40,15 +40,14 @@ public final class EnumDiscriminatorClient {
     /**
      * Receive model with extensible enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,15 +65,14 @@ public Response getExtensibleModelWithResponse(RequestOptions reques
     /**
      * Send model with extensible enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Dog to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -93,15 +91,14 @@ public Response putExtensibleModelWithResponse(BinaryData input, RequestOp
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -119,15 +116,14 @@ public Response getExtensibleModelMissingDiscriminatorWithResponse(R
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -145,15 +141,14 @@ public Response getExtensibleModelWrongDiscriminatorWithResponse(Req
     /**
      * Receive model with fixed enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -171,15 +166,14 @@ public Response getFixedModelWithResponse(RequestOptions requestOpti
     /**
      * Send model with fixed enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Snake to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -198,15 +192,14 @@ public Response putFixedModelWithResponse(BinaryData input, RequestOptions
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -224,15 +217,14 @@ public Response getFixedModelMissingDiscriminatorWithResponse(Reques
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java
index 5026de86868..2116a511bdc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/enumdiscriminator/implementation/EnumDiscriminatorClientImpl.java
@@ -279,23 +279,21 @@ Response getFixedModelWrongDiscriminatorSync(@HostParam("endpoint")
     /**
      * Receive model with extensible enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return test extensible enum type for discriminator along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return test extensible enum type for discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getExtensibleModelWithResponseAsync(RequestOptions requestOptions) {
@@ -307,15 +305,14 @@ public Mono> getExtensibleModelWithResponseAsync(RequestOpt
     /**
      * Receive model with extensible enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -333,15 +330,14 @@ public Response getExtensibleModelWithResponse(RequestOptions reques
     /**
      * Send model with extensible enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Dog to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -361,15 +357,14 @@ public Mono> putExtensibleModelWithResponseAsync(BinaryData input
     /**
      * Send model with extensible enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Dog to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -388,15 +383,14 @@ public Response putExtensibleModelWithResponse(BinaryData input, RequestOp
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -416,15 +410,14 @@ public Response putExtensibleModelWithResponse(BinaryData input, RequestOp
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -443,23 +436,21 @@ public Response getExtensibleModelMissingDiscriminatorWithResponse(R
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a model containing discriminator value never defined along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return a model containing discriminator value never defined along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono>
@@ -472,15 +463,14 @@ public Response getExtensibleModelMissingDiscriminatorWithResponse(R
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(golden) (Required)
      *     weight: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -499,23 +489,21 @@ public Response getExtensibleModelWrongDiscriminatorWithResponse(Req
     /**
      * Receive model with fixed enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return test fixed enum type for discriminator along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return test fixed enum type for discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getFixedModelWithResponseAsync(RequestOptions requestOptions) {
@@ -527,15 +515,14 @@ public Mono> getFixedModelWithResponseAsync(RequestOptions
     /**
      * Receive model with fixed enum discriminator type.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -553,15 +540,14 @@ public Response getFixedModelWithResponse(RequestOptions requestOpti
     /**
      * Send model with fixed enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Snake to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -581,15 +567,14 @@ public Mono> putFixedModelWithResponseAsync(BinaryData input, Req
     /**
      * Send model with fixed enum discriminator type.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input Snake to create.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -608,15 +593,14 @@ public Response putFixedModelWithResponse(BinaryData input, RequestOptions
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -636,15 +620,14 @@ public Response putFixedModelWithResponse(BinaryData input, RequestOptions
     /**
      * Get a model omitting the discriminator.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -662,23 +645,21 @@ public Response getFixedModelMissingDiscriminatorWithResponse(Reques
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a model containing discriminator value never defined along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return a model containing discriminator value never defined along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getFixedModelWrongDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -690,15 +671,14 @@ public Mono> getFixedModelWrongDiscriminatorWithResponseAsy
     /**
      * Get a model containing discriminator value never defined.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String(cobra) (Required)
      *     length: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorAsyncClient.java
index baf5603147e..520a6e02fe2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorAsyncClient.java
@@ -41,23 +41,21 @@ public final class NestedDiscriminatorAsyncClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -68,15 +66,14 @@ public Mono> getModelWithResponse(RequestOptions requestOpt
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -95,23 +92,21 @@ public Mono> putModelWithResponse(BinaryData input, RequestOption
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -122,15 +117,14 @@ public Mono> getRecursiveModelWithResponse(RequestOptions r
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,23 +143,21 @@ public Mono> putRecursiveModelWithResponse(BinaryData input, Requ
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -176,23 +168,21 @@ public Mono> getMissingDiscriminatorWithResponse(RequestOpt
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java
index ac552183ab1..1481be010c0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/NestedDiscriminatorClient.java
@@ -39,23 +39,21 @@ public final class NestedDiscriminatorClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -66,15 +64,14 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -93,23 +90,21 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -120,15 +115,14 @@ public Response getRecursiveModelWithResponse(RequestOptions request
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -147,23 +141,21 @@ public Response putRecursiveModelWithResponse(BinaryData input, RequestOpt
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -174,23 +166,21 @@ public Response getMissingDiscriminatorWithResponse(RequestOptions r
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java
index df2f0e65d03..78d2ce9a437 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/implementation/NestedDiscriminatorClientImpl.java
@@ -243,23 +243,21 @@ Response getWrongDiscriminatorSync(@HostParam("endpoint") String end
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getModelWithResponseAsync(RequestOptions requestOptions) {
@@ -270,23 +268,21 @@ public Mono> getModelWithResponseAsync(RequestOptions reque
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getModelWithResponse(RequestOptions requestOptions) {
@@ -297,15 +293,14 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -325,15 +320,14 @@ public Mono> putModelWithResponseAsync(BinaryData input, RequestO
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -352,23 +346,21 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getRecursiveModelWithResponseAsync(RequestOptions requestOptions) {
@@ -380,23 +372,21 @@ public Mono> getRecursiveModelWithResponseAsync(RequestOpti
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getRecursiveModelWithResponse(RequestOptions requestOptions) {
@@ -407,15 +397,14 @@ public Response getRecursiveModelWithResponse(RequestOptions request
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -435,15 +424,14 @@ public Mono> putRecursiveModelWithResponseAsync(BinaryData input,
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -462,23 +450,21 @@ public Response putRecursiveModelWithResponse(BinaryData input, RequestOpt
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getMissingDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -490,23 +476,21 @@ public Mono> getMissingDiscriminatorWithResponseAsync(Reque
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getMissingDiscriminatorWithResponse(RequestOptions requestOptions) {
@@ -517,23 +501,21 @@ public Response getMissingDiscriminatorWithResponse(RequestOptions r
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWrongDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -545,23 +527,21 @@ public Mono> getWrongDiscriminatorWithResponseAsync(Request
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     age: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic multiple levels inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWrongDiscriminatorWithResponse(RequestOptions requestOptions) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedAsyncClient.java
index 93fdecacc05..d136aa15736 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedAsyncClient.java
@@ -41,16 +41,15 @@ public final class NotDiscriminatedAsyncClient {
     /**
      * The postValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,24 +68,22 @@ public Mono> postValidWithResponse(BinaryData input, RequestOptio
     /**
      * The getValid operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -97,28 +94,25 @@ public Mono> getValidWithResponse(RequestOptions requestOpt
     /**
      * The putValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -126,8 +120,7 @@ public Mono> getValidWithResponse(RequestOptions requestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java
index c80e072a3ad..8a1222a0759 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/NotDiscriminatedClient.java
@@ -39,16 +39,15 @@ public final class NotDiscriminatedClient {
     /**
      * The postValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,16 +66,15 @@ public Response postValidWithResponse(BinaryData input, RequestOptions req
     /**
      * The getValid operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -94,28 +92,25 @@ public Response getValidWithResponse(RequestOptions requestOptions)
     /**
      * The putValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java
index 59f0edb04be..afebb88a28f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/notdiscriminated/implementation/NotDiscriminatedClientImpl.java
@@ -189,16 +189,15 @@ Response putValidSync(@HostParam("endpoint") String endpoint,
     /**
      * The postValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -218,16 +217,15 @@ public Mono> postValidWithResponseAsync(BinaryData input, Request
     /**
      * The postValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -246,24 +244,22 @@ public Response postValidWithResponse(BinaryData input, RequestOptions req
     /**
      * The getValid operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getValidWithResponseAsync(RequestOptions requestOptions) {
@@ -274,16 +270,15 @@ public Mono> getValidWithResponseAsync(RequestOptions reque
     /**
      * The getValid operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -301,28 +296,25 @@ public Response getValidWithResponse(RequestOptions requestOptions)
     /**
      * The putValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,8 +322,7 @@ public Response getValidWithResponse(RequestOptions requestOptions)
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return the third level model in the normal multiple levels inheritance along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putValidWithResponseAsync(BinaryData input, RequestOptions requestOptions) {
@@ -344,28 +335,25 @@ public Mono> putValidWithResponseAsync(BinaryData input, Re
     /**
      * The putValid operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *     age: int (Required)
      *     smart: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveAsyncClient.java
index 68a4f37d05a..dd0267872e1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveAsyncClient.java
@@ -41,17 +41,16 @@ public final class RecursiveAsyncClient {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -70,17 +69,16 @@ public Mono> putWithResponse(BinaryData input, RequestOptions req
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveClient.java
index 23991ba91bd..bcbac430aa5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/RecursiveClient.java
@@ -39,17 +39,16 @@ public final class RecursiveClient {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -68,17 +67,16 @@ public Response putWithResponse(BinaryData input, RequestOptions requestOp
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java
index 67b24ed388c..bfad9918101 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/recursive/implementation/RecursiveClientImpl.java
@@ -166,17 +166,16 @@ Response getSync(@HostParam("endpoint") String endpoint, @HeaderPara
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -196,17 +195,16 @@ public Mono> putWithResponseAsync(BinaryData input, RequestOption
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -225,17 +223,16 @@ public Response putWithResponse(BinaryData input, RequestOptions requestOp
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -253,17 +250,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     extension (Optional): [
      *         (recursive schema, see above)
      *     ]
      *     level: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorAsyncClient.java
index d5b74270f0f..d48c39af7c3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorAsyncClient.java
@@ -43,23 +43,21 @@ public final class SingleDiscriminatorAsyncClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -70,15 +68,14 @@ public Mono> getModelWithResponse(RequestOptions requestOpt
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -97,23 +94,21 @@ public Mono> putModelWithResponse(BinaryData input, RequestOption
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -124,15 +119,14 @@ public Mono> getRecursiveModelWithResponse(RequestOptions r
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -151,23 +145,21 @@ public Mono> putRecursiveModelWithResponse(BinaryData input, Requ
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -178,23 +170,21 @@ public Mono> getMissingDiscriminatorWithResponse(RequestOpt
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -205,23 +195,21 @@ public Mono> getWrongDiscriminatorWithResponse(RequestOptio
     /**
      * The getLegacyModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return define a base class in the legacy way along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return define a base class in the legacy way along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -232,23 +220,21 @@ public Mono> getLegacyModelWithResponse(RequestOptions requ
     /**
      * The getNoSubtypesModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a discriminated model with no defined subtypes along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return a discriminated model with no defined subtypes along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -259,15 +245,14 @@ public Mono> getNoSubtypesModelWithResponse(RequestOptions
     /**
      * The putNoSubtypesModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java
index ec98358efa0..4eb4509f9d3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/SingleDiscriminatorClient.java
@@ -41,23 +41,21 @@ public final class SingleDiscriminatorClient {
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -68,15 +66,14 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -95,23 +92,21 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -122,15 +117,14 @@ public Response getRecursiveModelWithResponse(RequestOptions request
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -149,23 +143,21 @@ public Response putRecursiveModelWithResponse(BinaryData input, RequestOpt
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -176,23 +168,21 @@ public Response getMissingDiscriminatorWithResponse(RequestOptions r
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -203,15 +193,14 @@ public Response getWrongDiscriminatorWithResponse(RequestOptions req
     /**
      * The getLegacyModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -229,15 +218,14 @@ public Response getLegacyModelWithResponse(RequestOptions requestOpt
     /**
      * The getNoSubtypesModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -255,15 +243,14 @@ public Response getNoSubtypesModelWithResponse(RequestOptions reques
     /**
      * The putNoSubtypesModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java
index eb42cfeb8c5..1a68830470b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/singlediscriminator/implementation/SingleDiscriminatorClientImpl.java
@@ -299,23 +299,21 @@ Response putNoSubtypesModelSync(@HostParam("endpoint") String endpoint,
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getModelWithResponseAsync(RequestOptions requestOptions) {
@@ -326,23 +324,21 @@ public Mono> getModelWithResponseAsync(RequestOptions reque
     /**
      * The getModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getModelWithResponse(RequestOptions requestOptions) {
@@ -353,15 +349,14 @@ public Response getModelWithResponse(RequestOptions requestOptions)
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -381,15 +376,14 @@ public Mono> putModelWithResponseAsync(BinaryData input, RequestO
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -408,23 +402,21 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getRecursiveModelWithResponseAsync(RequestOptions requestOptions) {
@@ -436,23 +428,21 @@ public Mono> getRecursiveModelWithResponseAsync(RequestOpti
     /**
      * The getRecursiveModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getRecursiveModelWithResponse(RequestOptions requestOptions) {
@@ -463,15 +453,14 @@ public Response getRecursiveModelWithResponse(RequestOptions request
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -491,15 +480,14 @@ public Mono> putRecursiveModelWithResponseAsync(BinaryData input,
     /**
      * The putRecursiveModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -518,23 +506,21 @@ public Response putRecursiveModelWithResponse(BinaryData input, RequestOpt
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getMissingDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -546,23 +532,21 @@ public Mono> getMissingDiscriminatorWithResponseAsync(Reque
     /**
      * The getMissingDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getMissingDiscriminatorWithResponse(RequestOptions requestOptions) {
@@ -573,23 +557,21 @@ public Response getMissingDiscriminatorWithResponse(RequestOptions r
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response} on successful completion of {@link Mono}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getWrongDiscriminatorWithResponseAsync(RequestOptions requestOptions) {
@@ -601,23 +583,21 @@ public Mono> getWrongDiscriminatorWithResponseAsync(Request
     /**
      * The getWrongDiscriminator operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     wingspan: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return this is base model for polymorphic single level inheritance with a discriminator along with
-     * {@link Response}.
+     * @return this is base model for polymorphic single level inheritance with a discriminator along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getWrongDiscriminatorWithResponse(RequestOptions requestOptions) {
@@ -628,23 +608,21 @@ public Response getWrongDiscriminatorWithResponse(RequestOptions req
     /**
      * The getLegacyModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return define a base class in the legacy way along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return define a base class in the legacy way along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getLegacyModelWithResponseAsync(RequestOptions requestOptions) {
@@ -656,15 +634,14 @@ public Mono> getLegacyModelWithResponseAsync(RequestOptions
     /**
      * The getLegacyModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -682,23 +659,21 @@ public Response getLegacyModelWithResponse(RequestOptions requestOpt
     /**
      * The getNoSubtypesModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a discriminated model with no defined subtypes along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return a discriminated model with no defined subtypes along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNoSubtypesModelWithResponseAsync(RequestOptions requestOptions) {
@@ -710,15 +685,14 @@ public Mono> getNoSubtypesModelWithResponseAsync(RequestOpt
     /**
      * The getNoSubtypesModel operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -736,15 +710,14 @@ public Response getNoSubtypesModelWithResponse(RequestOptions reques
     /**
      * The putNoSubtypesModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -764,15 +737,14 @@ public Mono> putNoSubtypesModelWithResponseAsync(BinaryData input
     /**
      * The putNoSubtypesModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     size: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageAsyncClient.java
index dd91dadd2c9..46eb5c867e7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageAsyncClient.java
@@ -43,14 +43,13 @@ public final class UsageAsyncClient {
     /**
      * The input operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -69,22 +68,20 @@ public Mono> inputWithResponse(BinaryData input, RequestOptions r
     /**
      * The output operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return record used in operation return type along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return record used in operation return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -95,24 +92,21 @@ public Mono> outputWithResponse(RequestOptions requestOptio
     /**
      * The inputAndOutput operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -120,8 +114,7 @@ public Mono> outputWithResponse(RequestOptions requestOptio
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return record used both as operation parameter and return type along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return record used both as operation parameter and return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageClient.java
index 16abc9a3be4..295197d8619 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/UsageClient.java
@@ -41,14 +41,13 @@ public final class UsageClient {
     /**
      * The input operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -67,14 +66,13 @@ public Response inputWithResponse(BinaryData input, RequestOptions request
     /**
      * The output operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -92,24 +90,21 @@ public Response outputWithResponse(RequestOptions requestOptions) {
     /**
      * The inputAndOutput operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/implementation/UsageClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/implementation/UsageClientImpl.java
index c2439718c1e..11dad6a0c79 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/implementation/UsageClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/usage/implementation/UsageClientImpl.java
@@ -186,14 +186,13 @@ Response inputAndOutputSync(@HostParam("endpoint") String endpoint,
     /**
      * The input operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -213,14 +212,13 @@ public Mono> inputWithResponseAsync(BinaryData input, RequestOpti
     /**
      * The input operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -239,22 +237,20 @@ public Response inputWithResponse(BinaryData input, RequestOptions request
     /**
      * The output operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return record used in operation return type along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return record used in operation return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> outputWithResponseAsync(RequestOptions requestOptions) {
@@ -265,14 +261,13 @@ public Mono> outputWithResponseAsync(RequestOptions request
     /**
      * The output operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -290,24 +285,21 @@ public Response outputWithResponse(RequestOptions requestOptions) {
     /**
      * The inputAndOutput operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -315,8 +307,7 @@ public Response outputWithResponse(RequestOptions requestOptions) {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return record used both as operation parameter and return type along with {@link Response} on successful
-     * completion of {@link Mono}.
+     * @return record used both as operation parameter and return type along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> inputAndOutputWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
@@ -329,24 +320,21 @@ public Mono> inputAndOutputWithResponseAsync(BinaryData bod
     /**
      * The inputAndOutput operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityAsyncClient.java
index be2e7a77e3f..bbba1aab098 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityAsyncClient.java
@@ -42,9 +42,8 @@ public final class VisibilityAsyncClient {
     /**
      * The getModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -55,13 +54,11 @@ public final class VisibilityAsyncClient {
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -72,8 +69,8 @@ public final class VisibilityAsyncClient {
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -82,8 +79,7 @@ public final class VisibilityAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return output model with visibility properties along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return output model with visibility properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -95,9 +91,8 @@ public Mono> getModelWithResponse(int queryProp, BinaryData
     /**
      * The headModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -108,8 +103,8 @@ public Mono> getModelWithResponse(int queryProp, BinaryData
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -129,9 +124,8 @@ public Mono> headModelWithResponse(int queryProp, BinaryData inpu
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -142,8 +136,8 @@ public Mono> headModelWithResponse(int queryProp, BinaryData inpu
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -162,9 +156,8 @@ public Mono> putModelWithResponse(BinaryData input, RequestOption
     /**
      * The patchModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -175,8 +168,8 @@ public Mono> putModelWithResponse(BinaryData input, RequestOption
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -195,9 +188,8 @@ public Mono> patchModelWithResponse(BinaryData input, RequestOpti
     /**
      * The postModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -208,8 +200,8 @@ public Mono> patchModelWithResponse(BinaryData input, RequestOpti
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -228,9 +220,8 @@ public Mono> postModelWithResponse(BinaryData input, RequestOptio
     /**
      * The deleteModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -241,8 +232,8 @@ public Mono> postModelWithResponse(BinaryData input, RequestOptio
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -261,9 +252,8 @@ public Mono> deleteModelWithResponse(BinaryData input, RequestOpt
     /**
      * The putReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -272,13 +262,11 @@ public Mono> deleteModelWithResponse(BinaryData input, RequestOpt
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -287,8 +275,8 @@ public Mono> deleteModelWithResponse(BinaryData input, RequestOpt
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,8 +284,7 @@ public Mono> deleteModelWithResponse(BinaryData input, RequestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return roundTrip model with readonly optional properties along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return roundTrip model with readonly optional properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityClient.java
index b2790fb3990..5ddd7463150 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/VisibilityClient.java
@@ -40,9 +40,8 @@ public final class VisibilityClient {
     /**
      * The getModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -53,13 +52,11 @@ public final class VisibilityClient {
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -70,8 +67,8 @@ public final class VisibilityClient {
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -91,9 +88,8 @@ public Response getModelWithResponse(int queryProp, BinaryData input
     /**
      * The headModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -104,8 +100,8 @@ public Response getModelWithResponse(int queryProp, BinaryData input
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -125,9 +121,8 @@ public Response headModelWithResponse(int queryProp, BinaryData input, Req
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -138,8 +133,8 @@ public Response headModelWithResponse(int queryProp, BinaryData input, Req
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -158,9 +153,8 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The patchModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -171,8 +165,8 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,9 +185,8 @@ public Response patchModelWithResponse(BinaryData input, RequestOptions re
     /**
      * The postModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -204,8 +197,8 @@ public Response patchModelWithResponse(BinaryData input, RequestOptions re
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -224,9 +217,8 @@ public Response postModelWithResponse(BinaryData input, RequestOptions req
     /**
      * The deleteModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -237,8 +229,8 @@ public Response postModelWithResponse(BinaryData input, RequestOptions req
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -257,9 +249,8 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
     /**
      * The putReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -268,13 +259,11 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -283,8 +272,8 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java
index b5443c7d726..34ef301d638 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/visibility/implementation/VisibilityClientImpl.java
@@ -276,9 +276,8 @@ Response putReadOnlyModelSync(@HostParam("endpoint") String endpoint
     /**
      * The getModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -289,13 +288,11 @@ Response putReadOnlyModelSync(@HostParam("endpoint") String endpoint
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -306,8 +303,8 @@ Response putReadOnlyModelSync(@HostParam("endpoint") String endpoint
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -316,8 +313,7 @@ Response putReadOnlyModelSync(@HostParam("endpoint") String endpoint
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return output model with visibility properties along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return output model with visibility properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getModelWithResponseAsync(int queryProp, BinaryData input,
@@ -331,9 +327,8 @@ public Mono> getModelWithResponseAsync(int queryProp, Binar
     /**
      * The getModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -344,13 +339,11 @@ public Mono> getModelWithResponseAsync(int queryProp, Binar
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -361,8 +354,8 @@ public Mono> getModelWithResponseAsync(int queryProp, Binar
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -384,9 +377,8 @@ public Response getModelWithResponse(int queryProp, BinaryData input
     /**
      * The headModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -397,8 +389,8 @@ public Response getModelWithResponse(int queryProp, BinaryData input
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -420,9 +412,8 @@ public Mono> headModelWithResponseAsync(int queryProp, BinaryData
     /**
      * The headModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -433,8 +424,8 @@ public Mono> headModelWithResponseAsync(int queryProp, BinaryData
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param queryProp Required int32, illustrating a query property.
      * @param input The input parameter.
@@ -454,9 +445,8 @@ public Response headModelWithResponse(int queryProp, BinaryData input, Req
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -467,8 +457,8 @@ public Response headModelWithResponse(int queryProp, BinaryData input, Req
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -488,9 +478,8 @@ public Mono> putModelWithResponseAsync(BinaryData input, RequestO
     /**
      * The putModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -501,8 +490,8 @@ public Mono> putModelWithResponseAsync(BinaryData input, RequestO
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -521,9 +510,8 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
     /**
      * The patchModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -534,8 +522,8 @@ public Response putModelWithResponse(BinaryData input, RequestOptions requ
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -555,9 +543,8 @@ public Mono> patchModelWithResponseAsync(BinaryData input, Reques
     /**
      * The patchModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -568,8 +555,8 @@ public Mono> patchModelWithResponseAsync(BinaryData input, Reques
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -588,9 +575,8 @@ public Response patchModelWithResponse(BinaryData input, RequestOptions re
     /**
      * The postModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -601,8 +587,8 @@ public Response patchModelWithResponse(BinaryData input, RequestOptions re
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -622,9 +608,8 @@ public Mono> postModelWithResponseAsync(BinaryData input, Request
     /**
      * The postModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -635,8 +620,8 @@ public Mono> postModelWithResponseAsync(BinaryData input, Request
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -655,9 +640,8 @@ public Response postModelWithResponse(BinaryData input, RequestOptions req
     /**
      * The deleteModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -668,8 +652,8 @@ public Response postModelWithResponse(BinaryData input, RequestOptions req
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -689,9 +673,8 @@ public Mono> deleteModelWithResponseAsync(BinaryData input, Reque
     /**
      * The deleteModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     readProp: String (Required)
      *     createProp (Required): [
@@ -702,8 +685,8 @@ public Mono> deleteModelWithResponseAsync(BinaryData input, Reque
      *     ]
      *     deleteProp: Boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -722,9 +705,8 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
     /**
      * The putReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -733,13 +715,11 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -748,8 +728,8 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -757,8 +737,7 @@ public Response deleteModelWithResponse(BinaryData input, RequestOptions r
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return roundTrip model with readonly optional properties along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return roundTrip model with readonly optional properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> putReadOnlyModelWithResponseAsync(BinaryData input,
@@ -772,9 +751,8 @@ public Mono> putReadOnlyModelWithResponseAsync(BinaryData i
     /**
      * The putReadOnlyModel operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -783,13 +761,11 @@ public Mono> putReadOnlyModelWithResponseAsync(BinaryData i
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalNullableIntList (Optional): [
      *         int (Optional)
@@ -798,8 +774,8 @@ public Mono> putReadOnlyModelWithResponseAsync(BinaryData i
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatAsyncClient.java
index 13053e41d2b..0c99c6290e8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsDifferentSpreadFloatAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -51,8 +50,8 @@ public final class ExtendsDifferentSpreadFloatAsyncClient {
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -80,8 +78,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java
index 73b7055ef81..e991c6c564a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadFloatClient.java
@@ -39,9 +39,8 @@ public final class ExtendsDifferentSpreadFloatClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -49,8 +48,8 @@ public final class ExtendsDifferentSpreadFloatClient {
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -78,8 +76,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayAsyncClient.java
index 9b4d3e47239..1f128c8f7f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsDifferentSpreadModelArrayAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -57,8 +56,8 @@ public final class ExtendsDifferentSpreadModelArrayAsyncClient {
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -76,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -92,8 +90,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java
index a41988bc647..4eaed6b2917 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelArrayClient.java
@@ -39,9 +39,8 @@ public final class ExtendsDifferentSpreadModelArrayClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -55,8 +54,8 @@ public final class ExtendsDifferentSpreadModelArrayClient {
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -90,8 +88,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelAsyncClient.java
index 9be82a4bfbd..bd5eb5d9e24 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsDifferentSpreadModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -53,8 +52,8 @@ public final class ExtendsDifferentSpreadModelAsyncClient {
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,9 +71,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -84,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java
index 1965b07213b..a86a5184ef0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadModelClient.java
@@ -39,9 +39,8 @@ public final class ExtendsDifferentSpreadModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -51,8 +50,8 @@ public final class ExtendsDifferentSpreadModelClient {
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -82,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringAsyncClient.java
index 18f05dfa34c..4d3de04a960 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsDifferentSpreadStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -51,8 +50,8 @@ public final class ExtendsDifferentSpreadStringAsyncClient {
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -80,8 +78,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java
index b714975614b..eabf7bda816 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsDifferentSpreadStringClient.java
@@ -39,9 +39,8 @@ public final class ExtendsDifferentSpreadStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -49,8 +48,8 @@ public final class ExtendsDifferentSpreadStringClient {
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -78,8 +76,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatAsyncClient.java
index 026d0dc39fd..f543f952b89 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatAsyncClient.java
@@ -41,17 +41,16 @@ public final class ExtendsFloatAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatClient.java
index 4ba052bdf7c..7dd643ab51a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsFloatClient.java
@@ -39,17 +39,16 @@ public final class ExtendsFloatClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayAsyncClient.java
index 3196804de3a..49fec85d5f9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsModelArrayAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -56,8 +55,8 @@ public final class ExtendsModelArrayAsyncClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -75,9 +74,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -90,8 +88,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java
index 77f0c39bfd4..0ca2e90a35b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelArrayClient.java
@@ -39,9 +39,8 @@ public final class ExtendsModelArrayClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -54,8 +53,8 @@ public final class ExtendsModelArrayClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -88,8 +86,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelAsyncClient.java
index 92b48fb641d..f74c7577657 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -52,8 +51,8 @@ public final class ExtendsModelAsyncClient {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -82,8 +80,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelClient.java
index 90f58c58ed3..f58725d5c0a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsModelClient.java
@@ -39,9 +39,8 @@ public final class ExtendsModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -50,8 +49,8 @@ public final class ExtendsModelClient {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,9 +68,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -80,8 +78,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringAsyncClient.java
index 3d1813be333..08cab4f7e46 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringAsyncClient.java
@@ -41,17 +41,16 @@ public final class ExtendsStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringClient.java
index cc4c841de6f..72aeac4798f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsStringClient.java
@@ -39,17 +39,16 @@ public final class ExtendsStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownAsyncClient.java
index a83a34c2c73..7898358cf2a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownAsyncClient.java
@@ -41,17 +41,16 @@ public final class ExtendsUnknownAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java
index 35cf068c973..bfaaa72b5e3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownClient.java
@@ -39,17 +39,16 @@ public final class ExtendsUnknownClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedAsyncClient.java
index 83873741213..d1d9b3f29e7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsUnknownDerivedAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -52,8 +51,8 @@ public final class ExtendsUnknownDerivedAsyncClient {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -82,8 +80,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java
index ff314b91165..bcc932b4047 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDerivedClient.java
@@ -39,9 +39,8 @@ public final class ExtendsUnknownDerivedClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -50,8 +49,8 @@ public final class ExtendsUnknownDerivedClient {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,9 +68,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -80,8 +78,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedAsyncClient.java
index 78defd46b24..51cf2459cda 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedAsyncClient.java
@@ -41,9 +41,8 @@ public final class ExtendsUnknownDiscriminatedAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -51,8 +50,8 @@ public final class ExtendsUnknownDiscriminatedAsyncClient {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -80,8 +78,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java
index 321ddff0590..6644e81d836 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/ExtendsUnknownDiscriminatedClient.java
@@ -39,9 +39,8 @@ public final class ExtendsUnknownDiscriminatedClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -49,8 +48,8 @@ public final class ExtendsUnknownDiscriminatedClient {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -78,8 +76,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatAsyncClient.java
index bbfd446289d..bfba06e86d4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatAsyncClient.java
@@ -41,17 +41,16 @@ public final class IsFloatAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatClient.java
index 15496ad1301..58485f07d1e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsFloatClient.java
@@ -39,17 +39,16 @@ public final class IsFloatClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayAsyncClient.java
index 4936465e71b..ea3af7308cc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayAsyncClient.java
@@ -41,9 +41,8 @@ public final class IsModelArrayAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -56,8 +55,8 @@ public final class IsModelArrayAsyncClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -75,9 +74,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -90,8 +88,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayClient.java
index 9eb66c02163..5c7cb0f9078 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelArrayClient.java
@@ -39,9 +39,8 @@ public final class IsModelArrayClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -54,8 +53,8 @@ public final class IsModelArrayClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -88,8 +86,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelAsyncClient.java
index 7dd55a95f2a..3ad4857993c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class IsModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -52,8 +51,8 @@ public final class IsModelAsyncClient {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -82,8 +80,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelClient.java
index 0f2bcd58956..812b9d9ec6b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsModelClient.java
@@ -39,9 +39,8 @@ public final class IsModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -50,8 +49,8 @@ public final class IsModelClient {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,9 +68,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -80,8 +78,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringAsyncClient.java
index 62382f7f0fb..c0c6522e267 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringAsyncClient.java
@@ -41,17 +41,16 @@ public final class IsStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringClient.java
index fcc567c50b9..d334ab6de5f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsStringClient.java
@@ -39,17 +39,16 @@ public final class IsStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownAsyncClient.java
index 46796a43ff9..1336a32173f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownAsyncClient.java
@@ -41,17 +41,16 @@ public final class IsUnknownAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownClient.java
index c495ef407b0..5e88c669fca 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownClient.java
@@ -39,17 +39,16 @@ public final class IsUnknownClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedAsyncClient.java
index 7ab6f04400b..04574e4d6e4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedAsyncClient.java
@@ -41,9 +41,8 @@ public final class IsUnknownDerivedAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -52,8 +51,8 @@ public final class IsUnknownDerivedAsyncClient {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -82,8 +80,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java
index 5be516f05fa..58da85bd180 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDerivedClient.java
@@ -39,9 +39,8 @@ public final class IsUnknownDerivedClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -50,8 +49,8 @@ public final class IsUnknownDerivedClient {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,9 +68,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -80,8 +78,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedAsyncClient.java
index fc983f168fb..3cedbfe358f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedAsyncClient.java
@@ -41,9 +41,8 @@ public final class IsUnknownDiscriminatedAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -51,8 +50,8 @@ public final class IsUnknownDiscriminatedAsyncClient {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -80,8 +78,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java
index 62e6beaf161..6745bbe7010 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/IsUnknownDiscriminatedClient.java
@@ -39,9 +39,8 @@ public final class IsUnknownDiscriminatedClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -49,8 +48,8 @@ public final class IsUnknownDiscriminatedClient {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -78,8 +76,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadAsyncClient.java
index 8493e5adf43..65e120baf88 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadAsyncClient.java
@@ -41,17 +41,16 @@ public final class MultipleSpreadAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadClient.java
index e4ebaaeee5b..3d05f594b42 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/MultipleSpreadClient.java
@@ -39,17 +39,16 @@ public final class MultipleSpreadClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatAsyncClient.java
index a1f19a0bdac..bdf250c9e43 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatAsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadDifferentFloatAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java
index 1575f057cdf..8983dc0706c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentFloatClient.java
@@ -39,17 +39,16 @@ public final class SpreadDifferentFloatClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayAsyncClient.java
index a5f7683a6c3..8c39be490f8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayAsyncClient.java
@@ -41,9 +41,8 @@ public final class SpreadDifferentModelArrayAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -54,8 +53,8 @@ public final class SpreadDifferentModelArrayAsyncClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -86,8 +84,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java
index 1f728a83a87..bc48f10da48 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelArrayClient.java
@@ -39,9 +39,8 @@ public final class SpreadDifferentModelArrayClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -52,8 +51,8 @@ public final class SpreadDifferentModelArrayClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -84,8 +82,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelAsyncClient.java
index a581dea6ebc..9db2598c86d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class SpreadDifferentModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -52,8 +51,8 @@ public final class SpreadDifferentModelAsyncClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -82,8 +80,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java
index 884c9c47c14..3f5404a8db3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentModelClient.java
@@ -39,9 +39,8 @@ public final class SpreadDifferentModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -50,8 +49,8 @@ public final class SpreadDifferentModelClient {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,9 +68,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -80,8 +78,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringAsyncClient.java
index f77f71b350b..07966e96f95 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringAsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadDifferentStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java
index c0e9155b535..b14f44d3a3a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadDifferentStringClient.java
@@ -39,17 +39,16 @@ public final class SpreadDifferentStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatAsyncClient.java
index b8cc70c03f8..86ab53e7b29 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatAsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadFloatAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatClient.java
index 4a3b45ba4e0..a8cc858b3b5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadFloatClient.java
@@ -39,17 +39,16 @@ public final class SpreadFloatClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayAsyncClient.java
index 0e8a7bd9a5f..08e8b8f5c58 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayAsyncClient.java
@@ -41,9 +41,8 @@ public final class SpreadModelArrayAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -56,8 +55,8 @@ public final class SpreadModelArrayAsyncClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -75,9 +74,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -90,8 +88,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java
index 3b17690d0bb..0a6d84d6c76 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelArrayClient.java
@@ -39,9 +39,8 @@ public final class SpreadModelArrayClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -54,8 +53,8 @@ public final class SpreadModelArrayClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -88,8 +86,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelAsyncClient.java
index c529744ee9d..9922d209234 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class SpreadModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -52,8 +51,8 @@ public final class SpreadModelAsyncClient {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -82,8 +80,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelClient.java
index 015ca294a19..b62597354f6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadModelClient.java
@@ -39,9 +39,8 @@ public final class SpreadModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -50,8 +49,8 @@ public final class SpreadModelClient {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,9 +68,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -80,8 +78,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2AsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2AsyncClient.java
index b478e1c6a0f..d35526415a8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2AsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2AsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadRecordNonDiscriminatedUnion2AsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java
index 7be6f856bc9..51f588053ee 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion2Client.java
@@ -39,17 +39,16 @@ public final class SpreadRecordNonDiscriminatedUnion2Client {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3AsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3AsyncClient.java
index 555caaa910b..66f81fa234f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3AsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3AsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadRecordNonDiscriminatedUnion3AsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java
index ca1dc2ada9b..b2c413656ae 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnion3Client.java
@@ -39,17 +39,16 @@ public final class SpreadRecordNonDiscriminatedUnion3Client {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionAsyncClient.java
index a041cdf3173..0a9350e986a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionAsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadRecordNonDiscriminatedUnionAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java
index a283725fc7d..9bb3f5d9462 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordNonDiscriminatedUnionClient.java
@@ -39,17 +39,16 @@ public final class SpreadRecordNonDiscriminatedUnionClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionAsyncClient.java
index 8b4780502e3..322fbfdde6b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionAsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadRecordUnionAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java
index afa33897247..c81f00a94e2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadRecordUnionClient.java
@@ -39,17 +39,16 @@ public final class SpreadRecordUnionClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringAsyncClient.java
index e19da973725..fdb2f16d215 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringAsyncClient.java
@@ -41,17 +41,16 @@ public final class SpreadStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringClient.java
index 533db341f90..190bd451218 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/SpreadStringClient.java
@@ -39,17 +39,16 @@ public final class SpreadStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,17 +66,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java
index 1024ee8e1c4..c7a2fad4e1c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadFloatsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -110,8 +109,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -139,8 +137,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -158,9 +156,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -168,8 +165,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -189,9 +186,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -199,8 +195,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *     }
      *     derivedProp: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java
index 0114848d3c2..a3eee620c32 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelArraysImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -116,8 +115,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -135,9 +134,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -151,8 +149,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -170,9 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -186,8 +183,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -207,9 +204,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -223,8 +219,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         (recursive schema, see above)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java
index 4789cfa39c6..e50fe7ffa77 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadModelsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -112,8 +111,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -131,9 +130,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -143,8 +141,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -162,9 +160,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -174,8 +171,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -195,9 +192,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -207,8 +203,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *     }
      *     derivedProp (Required): (recursive schema, see derivedProp above)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java
index 0ec1959ce55..4e083bdda8d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsDifferentSpreadStringsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -110,8 +109,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -139,8 +137,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -158,9 +156,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -168,8 +165,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -189,9 +186,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
@@ -199,8 +195,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *     }
      *     derivedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java
index c5a7983168f..53ab724bd91 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsFloatsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java
index 411548a28a7..e953e91bdac 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelArraysImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -115,8 +114,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,9 +133,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -149,8 +147,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,9 +166,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -183,8 +180,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,9 +201,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -219,8 +215,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java
index e1ee4666c67..799b10e15df 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsModelsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java
index fd660642c33..1181ee3d46b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsStringsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java
index d4216469d0d..45c7ee2248b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDerivedsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java
index e3aa5ddeb70..f23fec47baa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownDiscriminatedsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -110,8 +109,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -139,8 +137,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -158,9 +156,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -168,8 +165,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -189,9 +186,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -199,8 +195,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java
index 9ee415d04e4..f5540b5d8fa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/ExtendsUnknownsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java
index 0871bc5dfa0..3aabfdead57 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsFloatsImpl.java
@@ -99,17 +99,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,17 +126,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -155,17 +153,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -185,17 +182,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java
index 66061612f1f..3a1ba700146 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelArraysImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -115,8 +114,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,9 +133,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -149,8 +147,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,9 +166,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -183,8 +180,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,9 +201,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -219,8 +215,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java
index 28fa32a18b8..ba30ba542e9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsModelsImpl.java
@@ -99,9 +99,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -110,8 +109,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -140,8 +138,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -159,9 +157,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -170,8 +167,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -191,9 +188,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -202,8 +198,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java
index 94a84b25b90..5dfcdbffa67 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsStringsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java
index 718d5c55c9e..29ba8614932 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDerivedsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *     index: int (Required)
      *     age: Double (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java
index 2d6fcdd3ab4..0764cb8cac7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownDiscriminatedsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -110,8 +109,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -139,8 +137,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -158,9 +156,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -168,8 +165,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -189,9 +186,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     kind: String (Required)
      *     name: String (Required)
@@ -199,8 +195,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java
index 777b6f85b4f..b14960ffbf3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/IsUnknownsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java
index 2b3b38386ab..14477b38a93 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/MultipleSpreadsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java
index 6e9577eb7a4..5ac9e6018e4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentFloatsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java
index 3c7e9f60d7b..3302869a614 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelArraysImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -113,8 +112,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -132,9 +131,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -145,8 +143,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -164,9 +162,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -177,8 +174,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -198,9 +195,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -211,8 +207,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java
index ceb56449722..f3dc07ab9d3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentModelsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp: String (Required)
      *      (Optional): {
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         }
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java
index b7251b0ec51..aa867b95af5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadDifferentStringsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java
index c52678eddef..5574387f225 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadFloatsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: double (Required)
      *      (Optional): {
      *         String: double (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java
index db75da471d2..61f105335cd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelArraysImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -115,8 +114,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,9 +133,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -149,8 +147,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,9 +166,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -183,8 +180,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,9 +201,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): [
      *          (Required){
@@ -219,8 +215,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java
index fa05c3377ff..65cc6690feb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadModelsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -111,8 +110,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     knownProp (Required): {
      *         state: String (Required)
@@ -203,8 +199,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         String (Required): (recursive schema, see String above)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java
index fa590c42d18..a87822d5352 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion2sImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java
index 362739a651c..333b301508b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnion3sImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java
index 9676bf8054f..5c77130ad07 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordNonDiscriminatedUnionsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java
index fd7e9fe7bae..ebb2b1705dd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadRecordUnionsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     flag: boolean (Required)
      *      (Optional): {
      *         String: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java
index 93fe526ff58..1f33830c1eb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/additionalproperties/implementation/SpreadStringsImpl.java
@@ -100,17 +100,16 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     name: String (Required)
      *      (Optional): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesAsyncClient.java
index 043ec1b639a..bda407e2246 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesAsyncClient.java
@@ -42,23 +42,21 @@ public final class BytesAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,23 +67,21 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -96,15 +92,14 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,15 +118,14 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesClient.java
index 540f8ac0356..2e5d72a42d2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/BytesClient.java
@@ -40,15 +40,14 @@ public final class BytesClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,15 +65,14 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -92,15 +90,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,15 +116,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteAsyncClient.java
index 9f6393f35c0..bee2cf97f45 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteAsyncClient.java
@@ -42,25 +42,23 @@ public final class CollectionsByteAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -71,25 +69,23 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -100,17 +96,16 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -129,17 +124,16 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteClient.java
index 392d1df30e0..42ada5bdfc1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsByteClient.java
@@ -40,17 +40,16 @@ public final class CollectionsByteClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,17 +67,16 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -96,17 +94,16 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -125,17 +122,16 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelAsyncClient.java
index 0e6bceae132..39b6187f8c8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelAsyncClient.java
@@ -42,9 +42,8 @@ public final class CollectionsModelAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -53,16 +52,15 @@ public final class CollectionsModelAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -73,9 +71,8 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -84,16 +81,15 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -104,9 +100,8 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -115,8 +110,8 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -135,9 +130,8 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -146,8 +140,8 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelClient.java
index 808a736e11d..baafbc85a19 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsModelClient.java
@@ -40,9 +40,8 @@ public final class CollectionsModelClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -51,8 +50,8 @@ public final class CollectionsModelClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -81,8 +79,8 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -100,9 +98,8 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -111,8 +108,8 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -131,9 +128,8 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -142,8 +138,8 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringAsyncClient.java
index af95bdb4a90..841642529ed 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringAsyncClient.java
@@ -42,25 +42,23 @@ public final class CollectionsStringAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -71,25 +69,23 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -100,17 +96,16 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -129,17 +124,16 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringClient.java
index daab00ae71e..7b2b7572f00 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/CollectionsStringClient.java
@@ -40,17 +40,16 @@ public final class CollectionsStringClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,17 +67,16 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -96,17 +94,16 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -125,17 +122,16 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationAsyncClient.java
index 26df3988dc1..ba65ebe504b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationAsyncClient.java
@@ -42,23 +42,21 @@ public final class DatetimeOperationAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,23 +67,21 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -96,15 +92,14 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,15 +118,14 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationClient.java
index f064e5a6503..022e40d5971 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DatetimeOperationClient.java
@@ -40,15 +40,14 @@ public final class DatetimeOperationClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,15 +65,14 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -92,15 +90,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,15 +116,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationAsyncClient.java
index 19f327eb226..e30fb8fe532 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationAsyncClient.java
@@ -42,23 +42,21 @@ public final class DurationOperationAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,23 +67,21 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -96,15 +92,14 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,15 +118,14 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationClient.java
index 088771de0c5..2bcbbf61d51 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/DurationOperationClient.java
@@ -40,15 +40,14 @@ public final class DurationOperationClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,15 +65,14 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -92,15 +90,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,15 +116,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationAsyncClient.java
index e9c45612e0f..721c515a402 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationAsyncClient.java
@@ -42,23 +42,21 @@ public final class StringOperationAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,23 +67,21 @@ public Mono> getNonNullWithResponse(RequestOptions requestO
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -96,15 +92,14 @@ public Mono> getNullWithResponse(RequestOptions requestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -123,15 +118,14 @@ public Mono> patchNonNullWithResponse(BinaryData body, RequestOpt
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationClient.java
index 8b688c77cc9..8a69e8a6113 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/StringOperationClient.java
@@ -40,15 +40,14 @@ public final class StringOperationClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,15 +65,14 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -92,15 +90,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,15 +116,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/BytesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/BytesImpl.java
index dbf83f2c3e8..06b7bb9d856 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/BytesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/BytesImpl.java
@@ -138,23 +138,21 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -166,15 +164,14 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -192,23 +189,21 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -220,15 +215,14 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -246,15 +240,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -274,15 +267,14 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -301,15 +293,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -329,15 +320,14 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: byte[] (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java
index 37e8866f321..5bd7fe8079d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsBytesImpl.java
@@ -139,25 +139,23 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -169,17 +167,16 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -197,25 +194,23 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -227,17 +222,16 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -255,17 +249,16 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -285,17 +278,16 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -314,17 +306,16 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -344,17 +335,16 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         byte[] (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java
index bcd126f3816..eceb57d8288 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsModelsImpl.java
@@ -139,9 +139,8 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -150,16 +149,15 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -171,9 +169,8 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -182,8 +179,8 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -201,9 +198,8 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -212,16 +208,15 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -233,9 +228,8 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -244,8 +238,8 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -263,9 +257,8 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -274,8 +267,8 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -295,9 +288,8 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -306,8 +298,8 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -326,9 +318,8 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -337,8 +328,8 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -358,9 +349,8 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
@@ -369,8 +359,8 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java
index be0345333cb..cbfbf3e21f0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/CollectionsStringsImpl.java
@@ -139,25 +139,23 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -169,17 +167,16 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -197,25 +194,23 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -227,17 +222,16 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -255,17 +249,16 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -285,17 +278,16 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -314,17 +306,16 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -344,17 +335,16 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty (Optional, Required on create): [
      *         String (Optional, Required on create)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java
index e678bf2a7ce..25f8e11a397 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DatetimeOperationsImpl.java
@@ -139,23 +139,21 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -167,15 +165,14 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -193,23 +190,21 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -221,15 +216,14 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -247,15 +241,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -275,15 +268,14 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -302,15 +294,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,15 +321,14 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: OffsetDateTime (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java
index 7333f65647c..7956c094707 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/DurationOperationsImpl.java
@@ -139,23 +139,21 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -167,15 +165,14 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -193,23 +190,21 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -221,15 +216,14 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -247,15 +241,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -275,15 +268,14 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -302,15 +294,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,15 +321,14 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: Duration (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/StringOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/StringOperationsImpl.java
index fa572e99032..3b96a01cd2e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/StringOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/nullable/implementation/StringOperationsImpl.java
@@ -139,23 +139,21 @@ Response patchNullSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNonNullWithResponseAsync(RequestOptions requestOptions) {
@@ -167,15 +165,14 @@ public Mono> getNonNullWithResponseAsync(RequestOptions req
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -193,23 +190,21 @@ public Response getNonNullWithResponse(RequestOptions requestOptions
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNullWithResponseAsync(RequestOptions requestOptions) {
@@ -221,15 +216,14 @@ public Mono> getNullWithResponseAsync(RequestOptions reques
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -247,15 +241,14 @@ public Response getNullWithResponse(RequestOptions requestOptions) {
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -275,15 +268,14 @@ public Mono> patchNonNullWithResponseAsync(BinaryData body, Reque
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -302,15 +294,14 @@ public Response patchNonNullWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,15 +321,14 @@ public Mono> patchNullWithResponseAsync(BinaryData body, RequestO
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     requiredProperty: String (Optional, Required on create)
      *     nullableProperty: String (Optional, Required on create)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralAsyncClient.java
index 1e8d3825404..2a642aa2103 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class BooleanLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralClient.java
index 70ec7fc3d8a..c8343530272 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BooleanLiteralClient.java
@@ -39,14 +39,13 @@ public final class BooleanLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesAsyncClient.java
index 2a2381e8793..c7e2ae4eb8e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesAsyncClient.java
@@ -41,22 +41,20 @@ public final class BytesAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesClient.java
index 24300b1b4fe..2cc6d01a2c2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/BytesClient.java
@@ -39,14 +39,13 @@ public final class BytesClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteAsyncClient.java
index 16f3060cd9e..db0ac221076 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteAsyncClient.java
@@ -41,24 +41,22 @@ public final class CollectionsByteAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -69,24 +67,22 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -97,16 +93,15 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -125,16 +120,15 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteClient.java
index 87d5c1aee64..c7436f07e32 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsByteClient.java
@@ -39,16 +39,15 @@ public final class CollectionsByteClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,16 +65,15 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -93,16 +91,15 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -121,16 +118,15 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelAsyncClient.java
index 5e187936905..acca6f925a4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class CollectionsModelAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -51,16 +50,15 @@ public final class CollectionsModelAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -71,9 +69,8 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -81,16 +78,15 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -101,9 +97,8 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -111,8 +106,8 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -131,9 +126,8 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -141,8 +135,8 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelClient.java
index d08ca801914..54e22eb4159 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/CollectionsModelClient.java
@@ -39,9 +39,8 @@ public final class CollectionsModelClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -49,8 +48,8 @@ public final class CollectionsModelClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -78,8 +76,8 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -97,9 +95,8 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -107,8 +104,8 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -127,9 +124,8 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -137,8 +133,8 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationAsyncClient.java
index c72d2239d91..5ff3aa9e3f1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationAsyncClient.java
@@ -41,22 +41,20 @@ public final class DatetimeOperationAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationClient.java
index 2b544e8e99f..bd9ca1c4247 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DatetimeOperationClient.java
@@ -39,14 +39,13 @@ public final class DatetimeOperationClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationAsyncClient.java
index 55d013f8c25..560575b8ff9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationAsyncClient.java
@@ -41,22 +41,20 @@ public final class DurationOperationAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationClient.java
index 5ee4babd7cd..33c28800bf7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/DurationOperationClient.java
@@ -39,14 +39,13 @@ public final class DurationOperationClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralAsyncClient.java
index c0b8e52347d..af5e8c24959 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class FloatLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralClient.java
index 1d02d55a114..af43f5f7e8d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/FloatLiteralClient.java
@@ -39,14 +39,13 @@ public final class FloatLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralAsyncClient.java
index 45801eba251..a1e913c225f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class IntLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralClient.java
index e66e3279165..915e2eec759 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/IntLiteralClient.java
@@ -39,14 +39,13 @@ public final class IntLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateAsyncClient.java
index 629dc5073cf..2756bad8e9b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateAsyncClient.java
@@ -41,22 +41,20 @@ public final class PlainDateAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateClient.java
index 21c61dd509b..fda9e4498bb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainDateClient.java
@@ -39,14 +39,13 @@ public final class PlainDateClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeAsyncClient.java
index b60d7519821..bf0f94fce51 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeAsyncClient.java
@@ -41,22 +41,20 @@ public final class PlainTimeAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeClient.java
index e4bad0562c7..4af41020fe5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/PlainTimeClient.java
@@ -39,14 +39,13 @@ public final class PlainTimeClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalAsyncClient.java
index d8588abb66e..a365f5fcd76 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalAsyncClient.java
@@ -41,23 +41,21 @@ public final class RequiredAndOptionalAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -68,23 +66,21 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return only the required properties.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return only the required properties along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return only the required properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -95,15 +91,14 @@ public Mono> getRequiredOnlyWithResponse(RequestOptions req
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -122,15 +117,14 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with only required properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalClient.java
index 7bc786f1278..78182d8024a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/RequiredAndOptionalClient.java
@@ -39,15 +39,14 @@ public final class RequiredAndOptionalClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,15 +64,14 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return only the required properties.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -91,15 +89,14 @@ public Response getRequiredOnlyWithResponse(RequestOptions requestOp
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -118,15 +115,14 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with only required properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralAsyncClient.java
index 760503f7185..dca4ab8b982 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class StringLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralClient.java
index 8b1d61dbdd7..67722644ac1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringLiteralClient.java
@@ -39,14 +39,13 @@ public final class StringLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationAsyncClient.java
index 2c585627e91..3942b97aaa7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationAsyncClient.java
@@ -41,22 +41,20 @@ public final class StringOperationAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationClient.java
index fe5ba11b2a7..c04c15efddb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/StringOperationClient.java
@@ -39,14 +39,13 @@ public final class StringOperationClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralAsyncClient.java
index e5f5d21cdab..81ff5c3b288 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class UnionFloatLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralClient.java
index cf6f37ad30b..76e9b165a93 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionFloatLiteralClient.java
@@ -39,14 +39,13 @@ public final class UnionFloatLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralAsyncClient.java
index e454bcd3bd3..f391fdcd984 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class UnionIntLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralClient.java
index b1766d8854a..613e0b260e9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionIntLiteralClient.java
@@ -39,14 +39,13 @@ public final class UnionIntLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralAsyncClient.java
index b503358b1d9..6dd265a4327 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralAsyncClient.java
@@ -41,22 +41,20 @@ public final class UnionStringLiteralAsyncClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -67,22 +65,20 @@ public Mono> getAllWithResponse(RequestOptions requestOptio
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -93,14 +89,13 @@ public Mono> getDefaultWithResponse(RequestOptions requestO
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -119,14 +114,13 @@ public Mono> putAllWithResponse(BinaryData body, RequestOptions r
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralClient.java
index 3d9be4a21a2..27676b4428e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/UnionStringLiteralClient.java
@@ -39,14 +39,13 @@ public final class UnionStringLiteralClient {
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -89,14 +87,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,14 +112,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java
index 143fdda9060..9a1ec7c8432 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BooleanLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(true) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BytesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BytesImpl.java
index 3251214372d..787a89db558 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BytesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/BytesImpl.java
@@ -138,22 +138,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -165,14 +163,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -190,22 +187,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -217,14 +212,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -242,14 +236,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -269,14 +262,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -295,14 +287,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -322,14 +313,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java
index a74b413e7f5..7e1f0079fd9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsBytesImpl.java
@@ -139,24 +139,22 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -168,16 +166,15 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -195,24 +192,22 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -224,16 +219,15 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -251,16 +245,15 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -280,16 +273,15 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -308,16 +300,15 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -337,16 +328,15 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *         byte[] (Optional)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java
index 72e45db4dd9..e015ec607b6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/CollectionsModelsImpl.java
@@ -139,9 +139,8 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -149,16 +148,15 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -170,9 +168,8 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -180,8 +177,8 @@ public Mono> getAllWithResponseAsync(RequestOptions request
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -199,9 +196,8 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -209,16 +205,15 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -230,9 +225,8 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -240,8 +234,8 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -259,9 +253,8 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -269,8 +262,8 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -290,9 +283,8 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -300,8 +292,8 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -320,9 +312,8 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -330,8 +321,8 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -351,9 +342,8 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Optional): [
      *          (Optional){
@@ -361,8 +351,8 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java
index 3d28876cb7a..41a21a7da38 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DatetimeOperationsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DurationOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DurationOperationsImpl.java
index 65b1e975592..ec85e6eacba 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DurationOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/DurationOperationsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java
index 2b4da625bf5..88180313255 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/FloatLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/IntLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/IntLiteralsImpl.java
index d1221cb8298..511239f97a4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/IntLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/IntLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainDatesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainDatesImpl.java
index 81677c3cd2b..4a3d69d7540 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainDatesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainDatesImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: LocalDate (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainTimesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainTimesImpl.java
index 7aa7284829f..1eec3ee60d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainTimesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/PlainTimesImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java
index 1295973a803..30ce8b85a74 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/RequiredAndOptionalsImpl.java
@@ -139,23 +139,21 @@ Response putRequiredOnlySync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -167,15 +165,14 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -193,23 +190,21 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return only the required properties.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return only the required properties along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return only the required properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getRequiredOnlyWithResponseAsync(RequestOptions requestOptions) {
@@ -221,15 +216,14 @@ public Mono> getRequiredOnlyWithResponseAsync(RequestOption
     /**
      * Get models that will return only the required properties.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -247,15 +241,14 @@ public Response getRequiredOnlyWithResponse(RequestOptions requestOp
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -275,15 +268,14 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -302,15 +294,14 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with only required properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -330,15 +321,14 @@ public Mono> putRequiredOnlyWithResponseAsync(BinaryData body, Re
     /**
      * Put a body with only required properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     optionalProperty: String (Optional)
      *     requiredProperty: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringLiteralsImpl.java
index b24c53f9c0a..4e713583f7c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringOperationsImpl.java
index a8c3edf48fa..1473b8e67a0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/StringOperationsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java
index 4e36b16d121..db225676281 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionFloatLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1.25/2.375) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java
index 1818f04350f..3e1c786d443 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionIntLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(1/2) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java
index eabb37ea23d..7febcfc5b69 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/optional/implementation/UnionStringLiteralsImpl.java
@@ -139,22 +139,20 @@ Response putDefaultSync(@HostParam("endpoint") String endpoint,
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return all properties in the model along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return models that will return all properties in the model along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAllWithResponseAsync(RequestOptions requestOptions) {
@@ -166,14 +164,13 @@ public Mono> getAllWithResponseAsync(RequestOptions request
     /**
      * Get models that will return all properties in the model.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -191,22 +188,20 @@ public Response getAllWithResponse(RequestOptions requestOptions) {
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return models that will return the default object along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return models that will return the default object along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getDefaultWithResponseAsync(RequestOptions requestOptions) {
@@ -218,14 +213,13 @@ public Mono> getDefaultWithResponseAsync(RequestOptions req
     /**
      * Get models that will return the default object.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -243,14 +237,13 @@ public Response getDefaultWithResponse(RequestOptions requestOptions
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -270,14 +263,13 @@ public Mono> putAllWithResponseAsync(BinaryData body, RequestOpti
     /**
      * Put a body with all properties present.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -296,14 +288,13 @@ public Response putAllWithResponse(BinaryData body, RequestOptions request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -323,14 +314,13 @@ public Mono> putDefaultWithResponseAsync(BinaryData body, Request
     /**
      * Put a body with default properties.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralAsyncClient.java
index 257fd6e1b31..bf0a0c2eac7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class BooleanLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralClient.java
index e73faa591b9..6a598a07200 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanLiteralClient.java
@@ -39,14 +39,13 @@ public final class BooleanLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationAsyncClient.java
index acec6a32e22..f288bde3561 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationAsyncClient.java
@@ -41,14 +41,13 @@ public final class BooleanOperationAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationClient.java
index fe86e922450..8c0134dd506 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BooleanOperationClient.java
@@ -39,14 +39,13 @@ public final class BooleanOperationClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesAsyncClient.java
index d504e2423a0..e12d8415b02 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesAsyncClient.java
@@ -41,14 +41,13 @@ public final class BytesAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesClient.java
index 7a4d99fa1e8..d4cfd22fdf4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/BytesClient.java
@@ -39,14 +39,13 @@ public final class BytesClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntAsyncClient.java
index 0910790dad3..d39c02101c9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntAsyncClient.java
@@ -41,16 +41,15 @@ public final class CollectionsIntAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,16 +67,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntClient.java
index 9c128f7e3c9..157fa7d0d3c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsIntClient.java
@@ -39,16 +39,15 @@ public final class CollectionsIntClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,16 +65,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelAsyncClient.java
index 2dc7043cb00..28da9fa4769 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelAsyncClient.java
@@ -41,9 +41,8 @@ public final class CollectionsModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -51,8 +50,8 @@ public final class CollectionsModelAsyncClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,9 +69,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -80,8 +78,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelClient.java
index 15c3d9f5d95..3c0c7c319ed 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsModelClient.java
@@ -39,9 +39,8 @@ public final class CollectionsModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -49,8 +48,8 @@ public final class CollectionsModelClient {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,9 +67,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -78,8 +76,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringAsyncClient.java
index b6e472a64cc..1cb7cbda5e8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringAsyncClient.java
@@ -41,16 +41,15 @@ public final class CollectionsStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,16 +67,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringClient.java
index 74093195e00..a5d3f349db4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/CollectionsStringClient.java
@@ -39,16 +39,15 @@ public final class CollectionsStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,16 +65,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationAsyncClient.java
index 464801eee86..9253f97fa97 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationAsyncClient.java
@@ -41,14 +41,13 @@ public final class DatetimeOperationAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationClient.java
index 0e28cd46928..0485388910f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DatetimeOperationClient.java
@@ -39,14 +39,13 @@ public final class DatetimeOperationClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128AsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128AsyncClient.java
index 937c62070a1..b4b04bf00a1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128AsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128AsyncClient.java
@@ -41,14 +41,13 @@ public final class Decimal128AsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128Client.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128Client.java
index db977c18f52..ed3b47676e2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128Client.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/Decimal128Client.java
@@ -39,14 +39,13 @@ public final class Decimal128Client {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalAsyncClient.java
index c0a245e6fd3..ff2c2404297 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalAsyncClient.java
@@ -41,14 +41,13 @@ public final class DecimalAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalClient.java
index 0a0d4bb7572..113972e1b33 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DecimalClient.java
@@ -39,14 +39,13 @@ public final class DecimalClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringAsyncClient.java
index 67e677f9ec7..761800df30a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringAsyncClient.java
@@ -41,16 +41,15 @@ public final class DictionaryStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,16 +67,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringClient.java
index 7a1795cc309..3ca1ae6969e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DictionaryStringClient.java
@@ -39,16 +39,15 @@ public final class DictionaryStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,16 +65,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationAsyncClient.java
index df025c1be88..2bf31b49335 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationAsyncClient.java
@@ -41,14 +41,13 @@ public final class DurationOperationAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationClient.java
index d8669e6dcae..754483e8520 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/DurationOperationClient.java
@@ -39,14 +39,13 @@ public final class DurationOperationClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumAsyncClient.java
index e9decfe2742..fb5ac3f06d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumAsyncClient.java
@@ -41,14 +41,13 @@ public final class EnumAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumClient.java
index 7fb0a385291..16f226a9fa9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/EnumClient.java
@@ -39,14 +39,13 @@ public final class EnumClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumAsyncClient.java
index 60ad21da1e5..13341b39669 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumAsyncClient.java
@@ -41,14 +41,13 @@ public final class ExtensibleEnumAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumClient.java
index 7e8fd209b76..a518d3d1dea 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ExtensibleEnumClient.java
@@ -39,14 +39,13 @@ public final class ExtensibleEnumClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralAsyncClient.java
index 6fd89ca345b..21312ce4cd9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class FloatLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralClient.java
index c5353dfca5d..7209fc80d50 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatLiteralClient.java
@@ -39,14 +39,13 @@ public final class FloatLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationAsyncClient.java
index 8a88c6424d4..998cf8c59f4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationAsyncClient.java
@@ -41,14 +41,13 @@ public final class FloatOperationAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationClient.java
index adf2ce0adf6..9512081ae04 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/FloatOperationClient.java
@@ -39,14 +39,13 @@ public final class FloatOperationClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntAsyncClient.java
index cc01bc396dc..3fe3374a322 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntAsyncClient.java
@@ -41,14 +41,13 @@ public final class IntAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntClient.java
index 443421301a6..89df36a6810 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntClient.java
@@ -39,14 +39,13 @@ public final class IntClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralAsyncClient.java
index 81992421f96..c96c4508e1f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class IntLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralClient.java
index 24682c28370..dafe43909d9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/IntLiteralClient.java
@@ -39,14 +39,13 @@ public final class IntLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelAsyncClient.java
index 5c06dde3802..95acd269721 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelAsyncClient.java
@@ -41,16 +41,15 @@ public final class ModelAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,16 +67,15 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelClient.java
index 3b59f65f480..f458793f8b6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/ModelClient.java
@@ -39,16 +39,15 @@ public final class ModelClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,16 +65,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverAsyncClient.java
index 9ee16bba40b..026c110c26e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverAsyncClient.java
@@ -41,13 +41,12 @@ public final class NeverAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,13 +64,12 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverClient.java
index 4f8fc2b6082..6634fb07cb8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/NeverClient.java
@@ -39,13 +39,12 @@ public final class NeverClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -63,13 +62,12 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralAsyncClient.java
index 5ef3cd57db0..0917d74fab7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class StringLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralClient.java
index 1392a584ca8..b215415b68d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringLiteralClient.java
@@ -39,14 +39,13 @@ public final class StringLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationAsyncClient.java
index b53bac74036..b9f58054747 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationAsyncClient.java
@@ -41,14 +41,13 @@ public final class StringOperationAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationClient.java
index 3344a312fba..273ac7afd11 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/StringOperationClient.java
@@ -39,14 +39,13 @@ public final class StringOperationClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueAsyncClient.java
index 5090dabadab..cb7c8d761bc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnionEnumValueAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueClient.java
index 3509d918976..28f80388718 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionEnumValueClient.java
@@ -39,14 +39,13 @@ public final class UnionEnumValueClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralAsyncClient.java
index cdecf563fd1..35128cf27f4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnionFloatLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java
index 46d85a2a14b..eab83d748d9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionFloatLiteralClient.java
@@ -39,14 +39,13 @@ public final class UnionFloatLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralAsyncClient.java
index 247f2d7bf90..f6c11cdcffa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnionIntLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralClient.java
index 93b868a78a8..20821ae3ab4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionIntLiteralClient.java
@@ -39,14 +39,13 @@ public final class UnionIntLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralAsyncClient.java
index 3316d68e567..ab21b7b4947 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnionStringLiteralAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralClient.java
index 62c49e85731..21770ff59c9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnionStringLiteralClient.java
@@ -39,14 +39,13 @@ public final class UnionStringLiteralClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayAsyncClient.java
index 370a3785822..942c47abba8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnknownArrayAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayClient.java
index c9b24de63b0..62156c4fe3d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownArrayClient.java
@@ -39,14 +39,13 @@ public final class UnknownArrayClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictAsyncClient.java
index 51876b76ba7..feedafb9877 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnknownDictAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictClient.java
index ea45edc46b8..8fbc88d704c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownDictClient.java
@@ -39,14 +39,13 @@ public final class UnknownDictClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntAsyncClient.java
index 9a999c47093..34b1c98d5d4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnknownIntAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntClient.java
index b0001613606..75035fd3fa1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownIntClient.java
@@ -39,14 +39,13 @@ public final class UnknownIntClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringAsyncClient.java
index 21c6fd67676..bcf61a6da35 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringAsyncClient.java
@@ -41,14 +41,13 @@ public final class UnknownStringAsyncClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringClient.java
index c8cebe3b243..a558f667ef5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/UnknownStringClient.java
@@ -39,14 +39,13 @@ public final class UnknownStringClient {
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,14 +63,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java
index 2f10aabc507..aebc321ba40 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java
index feb16123ee8..0e4e1d21207 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BooleanOperationsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: boolean (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BytesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BytesImpl.java
index a4438dfd871..746f6ecf817 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BytesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/BytesImpl.java
@@ -99,14 +99,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -124,14 +123,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -149,14 +147,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -176,14 +173,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: byte[] (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java
index ea7185bb581..d8924a4b122 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsIntsImpl.java
@@ -100,16 +100,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -154,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -183,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         int (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java
index 6ec4d7806d1..02237f656b3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsModelsImpl.java
@@ -100,9 +100,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -110,8 +109,8 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -129,9 +128,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -139,8 +137,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -158,9 +156,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -168,8 +165,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -189,9 +186,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *          (Required){
@@ -199,8 +195,8 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
      *         }
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java
index 6a3f8caf66c..23b08329a0e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/CollectionsStringsImpl.java
@@ -100,16 +100,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -154,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -183,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): [
      *         String (Required)
      *     ]
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java
index d6a9daa95bf..1dbe8a8ab26 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DatetimeOperationsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: OffsetDateTime (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java
index 5a6efdc231b..503a5d18bdf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/Decimal128sImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java
index a6fe2c704ff..d25c0216c17 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DecimalsImpl.java
@@ -99,14 +99,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -124,14 +123,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -149,14 +147,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -176,14 +173,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BigDecimal (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java
index 99379dae975..47eedb3969f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DictionaryStringsImpl.java
@@ -100,16 +100,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,16 +126,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -154,16 +152,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -183,16 +180,15 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         String: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java
index 7d266fb303d..8fac3bb562f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/DurationOperationsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: Duration (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/EnumsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/EnumsImpl.java
index 710e7945c2f..af6e205b299 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/EnumsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/EnumsImpl.java
@@ -99,14 +99,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -124,14 +123,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -149,14 +147,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -176,14 +173,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java
index 9bb9da4c85d..a30d4778abf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ExtensibleEnumsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(ValueOne/ValueTwo) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java
index c3e9adb82b0..cd3cc5ff817 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java
index eee81b8e6ca..fa2f1e27a9e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/FloatOperationsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: double (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java
index 780d6aa8971..bfa32fb784e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntsImpl.java
index 191b2ff690c..767d87810df 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/IntsImpl.java
@@ -99,14 +99,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -124,14 +123,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -149,14 +147,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -176,14 +173,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: int (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ModelsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ModelsImpl.java
index 0b51fe6dba4..e5b5e2664ca 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ModelsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/ModelsImpl.java
@@ -99,16 +99,15 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -126,16 +125,15 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -153,16 +151,15 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -182,16 +179,15 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property (Required): {
      *         property: String (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/NeversImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/NeversImpl.java
index f4f2ffbb86d..bc5f104bf25 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/NeversImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/NeversImpl.java
@@ -99,13 +99,12 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -123,13 +122,12 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -147,13 +145,12 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -173,13 +170,12 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java
index 090022f5c9c..a8ddea7a98e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java
index 8f55bc90ad3..fa4ddb2fa8c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/StringOperationsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java
index 83f634d472a..0e81010f576 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionEnumValuesImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(value2) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java
index 2615c351363..63d49ac87a4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionFloatLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(43.125/46.875) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java
index 3dccc0e7500..e86efd73750 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionIntLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(42/43) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java
index 3e7b94df0c9..80d13df321b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnionStringLiteralsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: String(hello/world) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java
index 44999029889..58f15367754 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownArraysImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java
index 9d3678c1db9..86094c33fb2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownDictsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java
index f623cbed5a8..d8a508affc6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownIntsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java
index 940ae7a573f..ae455db8a48 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/property/valuetypes/implementation/UnknownStringsImpl.java
@@ -100,14 +100,13 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("Con
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * Get call.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * Put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     property: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body body.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationAsyncClient.java
index 7546b6de7b4..36d640ca873 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationAsyncClient.java
@@ -40,12 +40,11 @@ public final class BooleanOperationAsyncClient {
     /**
      * get boolean value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -63,12 +62,11 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * put boolean value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationClient.java
index c9555540278..235f695ef2a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/BooleanOperationClient.java
@@ -38,12 +38,11 @@ public final class BooleanOperationClient {
     /**
      * get boolean value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -61,12 +60,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put boolean value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeAsyncClient.java
index 40e784d5185..9330c847088 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeAsyncClient.java
@@ -41,12 +41,11 @@ public final class Decimal128TypeAsyncClient {
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -64,12 +63,11 @@ public Mono> responseBodyWithResponse(RequestOptions reques
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeClient.java
index 21e355a875b..100ca56f140 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128TypeClient.java
@@ -39,12 +39,11 @@ public final class Decimal128TypeClient {
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,12 +61,11 @@ public Response responseBodyWithResponse(RequestOptions requestOptio
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyAsyncClient.java
index db2d9d7d300..ade66abd40c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyAsyncClient.java
@@ -43,14 +43,13 @@ public final class Decimal128VerifyAsyncClient {
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,12 +67,11 @@ public Mono> prepareVerifyWithResponse(RequestOptions reque
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyClient.java
index 3ed157063ad..846b2449493 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/Decimal128VerifyClient.java
@@ -41,14 +41,13 @@ public final class Decimal128VerifyClient {
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,12 +65,11 @@ public Response prepareVerifyWithResponse(RequestOptions requestOpti
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeAsyncClient.java
index 9f607bd3f29..4ab017921f9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeAsyncClient.java
@@ -41,20 +41,18 @@ public final class DecimalTypeAsyncClient {
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a decimal number with any length and precision along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return a decimal number with any length and precision along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -65,12 +63,11 @@ public Mono> responseBodyWithResponse(RequestOptions reques
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeClient.java
index 8d348699360..35389a90a03 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalTypeClient.java
@@ -39,12 +39,11 @@ public final class DecimalTypeClient {
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -62,12 +61,11 @@ public Response responseBodyWithResponse(RequestOptions requestOptio
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyAsyncClient.java
index 680599b58b9..01c7f7adce6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyAsyncClient.java
@@ -43,14 +43,13 @@ public final class DecimalVerifyAsyncClient {
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,12 +67,11 @@ public Mono> prepareVerifyWithResponse(RequestOptions reque
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyClient.java
index 4626dbf214e..1ab8a24d1d5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/DecimalVerifyClient.java
@@ -41,14 +41,13 @@ public final class DecimalVerifyClient {
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,12 +65,11 @@ public Response prepareVerifyWithResponse(RequestOptions requestOpti
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationAsyncClient.java
index 74d3f15b231..8a54ba87c36 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationAsyncClient.java
@@ -40,12 +40,11 @@ public final class StringOperationAsyncClient {
     /**
      * get string value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -63,12 +62,11 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * put string value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationClient.java
index 51fd1fe4a6e..ace23d538d7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/StringOperationClient.java
@@ -38,12 +38,11 @@ public final class StringOperationClient {
     /**
      * get string value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -61,12 +60,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put string value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownAsyncClient.java
index 6e4b478f45b..b50d72655c6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownAsyncClient.java
@@ -40,12 +40,11 @@ public final class UnknownAsyncClient {
     /**
      * get unknown value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -63,12 +62,11 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * put unknown value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownClient.java
index d4346bfe0b5..9cc261a71d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/UnknownClient.java
@@ -38,12 +38,11 @@ public final class UnknownClient {
     /**
      * get unknown value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -61,12 +60,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put unknown value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/BooleanOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/BooleanOperationsImpl.java
index e7caf161fb6..14246593764 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/BooleanOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/BooleanOperationsImpl.java
@@ -100,12 +100,11 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * get boolean value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -123,12 +122,11 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * get boolean value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -146,12 +144,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put boolean value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -171,12 +168,11 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * put boolean value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * boolean
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128TypesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128TypesImpl.java
index 989b7c7a9eb..10678345cd1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128TypesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128TypesImpl.java
@@ -121,12 +121,11 @@ Response requestParameterSync(@HostParam("endpoint") String endpoint,
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -145,12 +144,11 @@ public Mono> responseBodyWithResponseAsync(RequestOptions r
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -168,12 +166,11 @@ public Response responseBodyWithResponse(RequestOptions requestOptio
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -193,12 +190,11 @@ public Mono> requestBodyWithResponseAsync(BinaryData body, Reques
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java
index da20cdb59e6..bde35511e2a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/Decimal128VerifiesImpl.java
@@ -101,14 +101,13 @@ Response verifySync(@HostParam("endpoint") String endpoint,
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,14 +126,13 @@ public Mono> prepareVerifyWithResponseAsync(RequestOptions
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -152,12 +150,11 @@ public Response prepareVerifyWithResponse(RequestOptions requestOpti
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,12 +174,11 @@ public Mono> verifyWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalTypesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalTypesImpl.java
index 19bd429ff62..99aceac15c3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalTypesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalTypesImpl.java
@@ -121,20 +121,18 @@ Response requestParameterSync(@HostParam("endpoint") String endpoint,
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a decimal number with any length and precision along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return a decimal number with any length and precision along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> responseBodyWithResponseAsync(RequestOptions requestOptions) {
@@ -146,12 +144,11 @@ public Mono> responseBodyWithResponseAsync(RequestOptions r
     /**
      * The responseBody operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -169,12 +166,11 @@ public Response responseBodyWithResponse(RequestOptions requestOptio
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -194,12 +190,11 @@ public Mono> requestBodyWithResponseAsync(BinaryData body, Reques
     /**
      * The requestBody operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java
index 71389141343..757de7640ea 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/DecimalVerifiesImpl.java
@@ -101,14 +101,13 @@ Response verifySync(@HostParam("endpoint") String endpoint,
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -127,14 +126,13 @@ public Mono> prepareVerifyWithResponseAsync(RequestOptions
     /**
      * The prepareVerify operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * [
      *     BigDecimal (Required)
      * ]
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -152,12 +150,11 @@ public Response prepareVerifyWithResponse(RequestOptions requestOpti
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,12 +174,11 @@ public Mono> verifyWithResponseAsync(BinaryData body, RequestOpti
     /**
      * The verify operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BigDecimal
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/StringOperationsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/StringOperationsImpl.java
index 4ea1e8f4946..aa4497ea0be 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/StringOperationsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/StringOperationsImpl.java
@@ -100,12 +100,11 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * get string value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -123,12 +122,11 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * get string value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -146,12 +144,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put string value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -171,12 +168,11 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * put string value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/UnknownsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/UnknownsImpl.java
index 22a87883706..5d37f7f1336 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/UnknownsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/scalar/implementation/UnknownsImpl.java
@@ -99,12 +99,11 @@ Response putSync(@HostParam("endpoint") String endpoint, @HeaderParam("con
     /**
      * get unknown value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -122,12 +121,11 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * get unknown value.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -145,12 +143,11 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * put unknown value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -170,12 +167,11 @@ public Mono> putWithResponseAsync(BinaryData body, RequestOptions
     /**
      * put unknown value.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body _.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyAsyncClient.java
index d225b1f6427..56a14109e7f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyAsyncClient.java
@@ -43,17 +43,16 @@ public final class EnumsOnlyAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,17 +70,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest6 The sendRequest6 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyClient.java
index e620c35453d..1364f12879c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/EnumsOnlyClient.java
@@ -41,17 +41,16 @@ public final class EnumsOnlyClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest6 The sendRequest6 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyAsyncClient.java
index aa9e58f0d88..e83f6ad0cb7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyAsyncClient.java
@@ -43,14 +43,13 @@ public final class FloatsOnlyAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest4 The sendRequest4 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyClient.java
index 97cf78ffb2c..6b5589d38b8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/FloatsOnlyClient.java
@@ -41,14 +41,13 @@ public final class FloatsOnlyClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest4 The sendRequest4 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyAsyncClient.java
index 5e4af5b1241..140e68e4702 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyAsyncClient.java
@@ -43,14 +43,13 @@ public final class IntsOnlyAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest3 The sendRequest3 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyClient.java
index cbe8fec8eb9..c301ca976b7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/IntsOnlyClient.java
@@ -41,14 +41,13 @@ public final class IntsOnlyClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest3 The sendRequest3 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsAsyncClient.java
index a60a7bcbbdf..d368971a118 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsAsyncClient.java
@@ -43,9 +43,8 @@ public final class MixedLiteralsAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -54,8 +53,8 @@ public final class MixedLiteralsAsyncClient {
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -73,9 +72,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -84,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest8 The sendRequest8 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsClient.java
index a62ee7e90cd..2655b8e9e49 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedLiteralsClient.java
@@ -41,9 +41,8 @@ public final class MixedLiteralsClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -52,8 +51,8 @@ public final class MixedLiteralsClient {
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,9 +70,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -82,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest8 The sendRequest8 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesAsyncClient.java
index c13c976836e..7800581bf04 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesAsyncClient.java
@@ -43,9 +43,8 @@ public final class MixedTypesAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -57,8 +56,8 @@ public final class MixedTypesAsyncClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -76,9 +75,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -90,8 +88,8 @@ public Mono> getWithResponse(RequestOptions requestOptions)
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest9 The sendRequest9 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesClient.java
index eb19100770c..e45d8eb7180 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/MixedTypesClient.java
@@ -41,9 +41,8 @@ public final class MixedTypesClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -55,8 +54,8 @@ public final class MixedTypesClient {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -74,9 +73,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -88,8 +86,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest9 The sendRequest9 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyAsyncClient.java
index e4398ccff94..6bb4e9297f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyAsyncClient.java
@@ -42,14 +42,13 @@ public final class ModelsOnlyAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -67,14 +66,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest5 The sendRequest5 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyClient.java
index a9b173d6784..d6fd3f95175 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/ModelsOnlyClient.java
@@ -40,14 +40,13 @@ public final class ModelsOnlyClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -65,14 +64,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest5 The sendRequest5 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayAsyncClient.java
index 56f4fb3b777..42745cc70c6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayAsyncClient.java
@@ -43,17 +43,16 @@ public final class StringAndArrayAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -71,17 +70,16 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest7 The sendRequest7 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayClient.java
index cdf00c9eaa3..be4454247fd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringAndArrayClient.java
@@ -41,17 +41,16 @@ public final class StringAndArrayClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -69,17 +68,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest7 The sendRequest7 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleAsyncClient.java
index 8d020845d73..b0aa7e77983 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleAsyncClient.java
@@ -43,14 +43,13 @@ public final class StringExtensibleAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest1 The sendRequest1 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleClient.java
index 3149cdd1520..bfd2e2ac55e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleClient.java
@@ -41,14 +41,13 @@ public final class StringExtensibleClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest1 The sendRequest1 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedAsyncClient.java
index 301fd440c80..f8c87a678d3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedAsyncClient.java
@@ -43,14 +43,13 @@ public final class StringExtensibleNamedAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest2 The sendRequest2 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedClient.java
index 117fd1dd10d..f2b6d92b7b2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringExtensibleNamedClient.java
@@ -41,14 +41,13 @@ public final class StringExtensibleNamedClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest2 The sendRequest2 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyAsyncClient.java
index 20b34eb175c..3f3c01acd30 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyAsyncClient.java
@@ -43,14 +43,13 @@ public final class StringsOnlyAsyncClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -68,14 +67,13 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest The sendRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyClient.java
index 2bc76714898..c0595cf273a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/StringsOnlyClient.java
@@ -41,14 +41,13 @@ public final class StringsOnlyClient {
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -66,14 +65,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest The sendRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesAsyncClient.java
index 3370506269c..5bdc3d65799 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesAsyncClient.java
@@ -41,18 +41,17 @@ public final class EnvelopeObjectCustomPropertiesAsyncClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,20 +71,17 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java
index 52889b34ac7..1fa7e55f592 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectCustomPropertiesClient.java
@@ -39,18 +39,17 @@ public final class EnvelopeObjectCustomPropertiesClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,20 +69,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultAsyncClient.java
index ad437fbc0b4..31a70396cbd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultAsyncClient.java
@@ -41,18 +41,17 @@ public final class EnvelopeObjectDefaultAsyncClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,20 +71,17 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java
index 5d4c5073765..721ce720462 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/EnvelopeObjectDefaultClient.java
@@ -39,18 +39,17 @@ public final class EnvelopeObjectDefaultClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,20 +69,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorAsyncClient.java
index 759e359c721..ea82d4f829a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorAsyncClient.java
@@ -41,18 +41,17 @@ public final class NoEnvelopeCustomDiscriminatorAsyncClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,20 +71,17 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java
index 916d32c18ae..22e8c75c890 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeCustomDiscriminatorClient.java
@@ -39,18 +39,17 @@ public final class NoEnvelopeCustomDiscriminatorClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,20 +69,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultAsyncClient.java
index 5ca3d2bf82c..cd828c6cb9d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultAsyncClient.java
@@ -41,18 +41,17 @@ public final class NoEnvelopeDefaultAsyncClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -72,20 +71,17 @@ public Mono> getWithResponse(RequestOptions requestOptions)
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java
index a1c255b645f..41d8a62fb52 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/NoEnvelopeDefaultClient.java
@@ -39,18 +39,17 @@ public final class NoEnvelopeDefaultClient {
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -70,20 +69,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java
index 445e19e84c7..a790495b79b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectCustomPropertiesImpl.java
@@ -102,18 +102,17 @@ Response putSync(@HostParam("endpoint") String endpoint,
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,18 +133,17 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter
Query Parameters
NameTypeRequiredDescription
petTypeStringNoThe petType parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -165,20 +163,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -201,20 +196,17 @@ public Mono> putWithResponseAsync(BinaryData input, Request
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java
index 5714bdcb19d..e866343acfa 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/EnvelopeObjectDefaultsImpl.java
@@ -102,18 +102,17 @@ Response putSync(@HostParam("endpoint") String endpoint,
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,18 +133,17 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -165,20 +163,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -201,20 +196,17 @@ public Mono> putWithResponseAsync(BinaryData input, Request
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java
index 9eb018e59d5..43f86bb1337 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeCustomDiscriminatorsImpl.java
@@ -102,18 +102,17 @@ Response putSync(@HostParam("endpoint") String endpoint,
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,18 +133,17 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter
Query Parameters
NameTypeRequiredDescription
typeStringNoThe type parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -165,20 +163,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -201,20 +196,17 @@ public Mono> putWithResponseAsync(BinaryData input, Request
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java
index b9b5016e201..b9a7a9e21e6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/discriminated/implementation/NoEnvelopeDefaultsImpl.java
@@ -102,18 +102,17 @@ Response putSync(@HostParam("endpoint") String endpoint,
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -134,18 +133,17 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      * The get operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter
Query Parameters
NameTypeRequiredDescription
kindStringNoThe kind parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -165,20 +163,17 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -201,20 +196,17 @@ public Mono> putWithResponseAsync(BinaryData input, Request
     /**
      * The put operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * BinaryData
-     * }
-     * 

+     * }

+     * 
      * 
      * @param input The input parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/EnumsOnliesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/EnumsOnliesImpl.java
index 608a4c002a2..5490a2cd694 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/EnumsOnliesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/EnumsOnliesImpl.java
@@ -100,17 +100,16 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest6 The sendRequest6 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest6, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         lr: String(left/right/up/down) (Required)
      *         ud: String(up/down) (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest6 The sendRequest6 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/FloatsOnliesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/FloatsOnliesImpl.java
index ef68f5571ad..41d1e71b200 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/FloatsOnliesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/FloatsOnliesImpl.java
@@ -100,14 +100,13 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest4 The sendRequest4 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest4, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1.1/2.2/3.3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest4 The sendRequest4 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/IntsOnliesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/IntsOnliesImpl.java
index a2a3eca8b13..c9107635373 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/IntsOnliesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/IntsOnliesImpl.java
@@ -100,14 +100,13 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest3 The sendRequest3 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest3, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(1/2/3) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest3 The sendRequest3 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedLiteralsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedLiteralsImpl.java
index f2d48e7f5a0..0de0042b82c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedLiteralsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedLiteralsImpl.java
@@ -100,9 +100,8 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -111,8 +110,8 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -130,9 +129,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -141,8 +139,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -160,9 +158,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -171,8 +168,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest8 The sendRequest8 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -192,9 +189,8 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest8, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         stringLiteral: BinaryData (Required)
@@ -203,8 +199,8 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest8, Reque
      *         booleanLiteral: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest8 The sendRequest8 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedTypesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedTypesImpl.java
index 5b3bb182b15..6f822e2aecd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedTypesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/MixedTypesImpl.java
@@ -100,9 +100,8 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -114,8 +113,8 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -133,9 +132,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -147,8 +145,8 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -166,9 +164,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -180,8 +177,8 @@ public Response getWithResponse(RequestOptions requestOptions) {
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest9 The sendRequest9 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -201,9 +198,8 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest9, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         model: BinaryData (Required)
@@ -215,8 +211,8 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest9, Reque
      *         ]
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest9 The sendRequest9 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/ModelsOnliesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/ModelsOnliesImpl.java
index 7a8e9a1e0a3..90148de0864 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/ModelsOnliesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/ModelsOnliesImpl.java
@@ -100,14 +100,13 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest5 The sendRequest5 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest5, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest5 The sendRequest5 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringAndArraysImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringAndArraysImpl.java
index 78c6b3c35ff..f76b0824e34 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringAndArraysImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringAndArraysImpl.java
@@ -100,17 +100,16 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -128,17 +127,16 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -156,17 +154,16 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest7 The sendRequest7 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -186,17 +183,16 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest7, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop (Required): {
      *         string: BinaryData (Required)
      *         array: BinaryData (Required)
      *     }
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest7 The sendRequest7 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java
index 0c8c9298bb1..30d5e14732f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensibleNamedsImpl.java
@@ -100,14 +100,13 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest2 The sendRequest2 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest2, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest2 The sendRequest2 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensiblesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensiblesImpl.java
index a2e13ed210c..533ba67e3a6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensiblesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringExtensiblesImpl.java
@@ -100,14 +100,13 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest1 The sendRequest1 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest1, Reque
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest1 The sendRequest1 parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringsOnliesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringsOnliesImpl.java
index dcd4a865e38..0bddd7a15b5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringsOnliesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/union/implementation/StringsOnliesImpl.java
@@ -100,14 +100,13 @@ Response sendSync(@HostParam("endpoint") String endpoint, @HeaderParam("Co
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -125,14 +124,13 @@ public Mono> getWithResponseAsync(RequestOptions requestOpt
     /**
      * The get operation.
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -150,14 +148,13 @@ public Response getWithResponse(RequestOptions requestOptions) {
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest The sendRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -177,14 +174,13 @@ public Mono> sendWithResponseAsync(BinaryData sendRequest, Reques
     /**
      * The send operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String(a/b/c) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param sendRequest The sendRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedAsyncClient.java
index 62abf59b033..57edc7f0144 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedAsyncClient.java
@@ -43,28 +43,25 @@ public final class AddedAsyncClient {
     /**
      * The v1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param headerV2 The headerV2 parameter.
      * @param body The body parameter.
@@ -84,28 +81,25 @@ Mono> v1WithResponseInternal(String headerV2, BinaryData bo
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClient.java
index 3d7af113e8e..3ace99b7ecf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClient.java
@@ -41,28 +41,25 @@ public final class AddedClient {
     /**
      * The v1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param headerV2 The headerV2 parameter.
      * @param body The body parameter.
@@ -82,28 +79,25 @@ Response v1WithResponseInternal(String headerV2, BinaryData body, Re
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2AsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2AsyncClient.java
index 6d7156bcdec..86e30cda0a6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2AsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2AsyncClient.java
@@ -42,28 +42,25 @@ public final class InterfaceV2AsyncClient {
     /**
      * The v2InInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2Client.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2Client.java
index 81c36b5f053..95f42f4379b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2Client.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/InterfaceV2Client.java
@@ -40,28 +40,25 @@ public final class InterfaceV2Client {
     /**
      * The v2InInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java
index eff77f6a477..00e128fd6cc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java
@@ -204,28 +204,25 @@ Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("
     /**
      * The v1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param headerV2 The headerV2 parameter.
      * @param body The body parameter.
@@ -248,28 +245,25 @@ public Mono> v1WithResponseInternalAsync(String headerV2, B
     /**
      * The v1 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param headerV2 The headerV2 parameter.
      * @param body The body parameter.
@@ -292,28 +286,25 @@ public Response v1WithResponseInternal(String headerV2, BinaryData b
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -334,28 +325,25 @@ public Mono> v2WithResponseInternalAsync(BinaryData body, R
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java
index cae63e89121..43abf9190c0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java
@@ -94,28 +94,25 @@ Response v2InInterfaceSync(@HostParam("endpoint") String endpoint,
     /**
      * The v2InInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -137,28 +134,25 @@ public Mono> v2InInterfaceWithResponseInternalAsync(BinaryD
     /**
      * The v2InInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalAsyncClient.java
index 96d61d6a017..d5bdf2eb338 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalAsyncClient.java
@@ -42,32 +42,29 @@ public final class MadeOptionalAsyncClient {
      * The test operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClient.java
index ef8c7ccc333..2b5b1de91f5 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClient.java
@@ -40,32 +40,29 @@ public final class MadeOptionalClient {
      * The test operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java
index 3a3bfba439c..d8ce29e455d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java
@@ -171,32 +171,29 @@ Response testSync(@HostParam("endpoint") String endpoint, @HostParam
      * The test operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -218,32 +215,29 @@ public Mono> testWithResponseAsync(BinaryData body, Request
      * The test operation.
      * 
Query Parameters

      * 
-     * 
-     * 
-     * 
+     *     
+     *     
+     *     
      * 
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter
Query Parameters
NameTypeRequiredDescription
paramStringNoThe param parameter

      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Optional)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedAsyncClient.java
index 96e804cb0f2..04f4451318e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedAsyncClient.java
@@ -42,28 +42,25 @@ public final class RemovedAsyncClient {
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -82,26 +79,23 @@ public Mono> v2WithResponse(BinaryData body, RequestOptions
     /**
      * This operation will pass different paths and different request bodies based on different versions.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClient.java
index 1c973172360..f8eb6b48503 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClient.java
@@ -40,28 +40,25 @@ public final class RemovedClient {
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -80,26 +77,23 @@ public Response v2WithResponse(BinaryData body, RequestOptions reque
     /**
      * This operation will pass different paths and different request bodies based on different versions.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java
index 1ed0e073f48..d8dc6cb8134 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java
@@ -187,28 +187,25 @@ Response modelV3Sync(@HostParam("endpoint") String endpoint, @HostPa
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -229,28 +226,25 @@ public Mono> v2WithResponseAsync(BinaryData body, RequestOp
     /**
      * The v2 operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     enumProp: String(enumMemberV2) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -271,26 +265,23 @@ public Response v2WithResponse(BinaryData body, RequestOptions reque
     /**
      * This operation will pass different paths and different request bodies based on different versions.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -311,26 +302,23 @@ public Mono> modelV3WithResponseAsync(BinaryData body, Requ
     /**
      * This operation will pass different paths and different request bodies based on different versions.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     id: String (Required)
      *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceAsyncClient.java
index 05559102f22..f3949652f06 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceAsyncClient.java
@@ -41,28 +41,25 @@ public final class NewInterfaceAsyncClient {
     /**
      * The newOpInNewInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceClient.java
index e5c384153a5..5dcb288bf41 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/NewInterfaceClient.java
@@ -39,28 +39,25 @@ public final class NewInterfaceClient {
     /**
      * The newOpInNewInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromAsyncClient.java
index 488df96fc82..5a25591989a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromAsyncClient.java
@@ -41,28 +41,25 @@ public final class RenamedFromAsyncClient {
     /**
      * The newOp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param newQuery The newQuery parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClient.java
index 2f292a1ba34..f6367b2ab01 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClient.java
@@ -39,28 +39,25 @@ public final class RenamedFromClient {
     /**
      * The newOp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param newQuery The newQuery parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java
index 1f53d9600b3..6d7ca3f6fc8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java
@@ -94,28 +94,25 @@ Response newOpInNewInterfaceSync(@HostParam("endpoint") String endpo
     /**
      * The newOpInNewInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -137,28 +134,25 @@ public Mono> newOpInNewInterfaceWithResponseAsync(BinaryDat
     /**
      * The newOpInNewInterface operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java
index c2c0fcac86a..ad4ba6cf477 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java
@@ -186,28 +186,25 @@ Response newOpSync(@HostParam("endpoint") String endpoint, @HostPara
     /**
      * The newOp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param newQuery The newQuery parameter.
      * @param body The body parameter.
@@ -230,28 +227,25 @@ public Mono> newOpWithResponseAsync(String newQuery, Binary
     /**
      * The newOp operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     newProp: String (Required)
      *     enumProp: String(newEnumMember) (Required)
      *     unionProp: BinaryData (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param newQuery The newQuery parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromAsyncClient.java
index 730393bf272..4e8b267abaf 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromAsyncClient.java
@@ -40,20 +40,17 @@ public final class ReturnTypeChangedFromAsyncClient {
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java
index 4bb0ffa8918..7d6f2e2831e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClient.java
@@ -38,20 +38,17 @@ public final class ReturnTypeChangedFromClient {
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java
index 54858014fdd..3717df5c0e6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java
@@ -170,20 +170,17 @@ Response testSync(@HostParam("endpoint") String endpoint, @HostParam
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -204,20 +201,17 @@ public Mono> testWithResponseAsync(BinaryData body, Request
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * String
-     * }
-     * 

+     * }

+     * 
      * 
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromAsyncClient.java
index d1863fca3cc..c0802142cf8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromAsyncClient.java
@@ -41,26 +41,23 @@ public final class TypeChangedFromAsyncClient {
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param param The param parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java
index e1ee88b4841..3e889a55f14 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClient.java
@@ -39,26 +39,23 @@ public final class TypeChangedFromClient {
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param param The param parameter.
      * @param body The body parameter.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java
index c91db882420..92107647645 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java
@@ -173,26 +173,23 @@ Response testSync(@HostParam("endpoint") String endpoint, @HostParam
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param param The param parameter.
      * @param body The body parameter.
@@ -215,26 +212,23 @@ public Mono> testWithResponseAsync(String param, BinaryData
     /**
      * The test operation.
      * 
Request Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

-     * 
+     * }

+     * 
      * 
Response Body Schema

-     * 
-     * 
-     * {@code
+     * 
+     * 
{@code
      * {
      *     prop: String (Required)
      *     changedProp: String (Required)
      * }
-     * }
-     * 

+     * }

+     * 
      * 
      * @param param The param parameter.
      * @param body The body parameter.

From 34162e98c193ae1c1b26f87b3055e6b5b09ae452 Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Thu, 10 Sep 2026 15:16:37 -0400
Subject: [PATCH 4/5] Fix CSpell

---
 cspell.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cspell.yaml b/cspell.yaml
index 9c26d9f1de2..23e4ae6370e 100644
--- a/cspell.yaml
+++ b/cspell.yaml
@@ -345,6 +345,7 @@ words:
   - WINDOWSVMIMAGE
   - workerid
   - xdist
+  - Xdoclint
   - xiangyan
   - xiaofei
   - xlarge

From f990e2b6a74cbb96fa5b500bb6fa193bbfd2f071 Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Thu, 10 Sep 2026 15:31:51 -0400
Subject: [PATCH 5/5] Fix linting

---
 .../multipart/FormDataAsyncClient.java        | 24 ++++---
 .../payload/multipart/FormDataClient.java     | 24 ++++---
 .../multipart/FormDataFileAsyncClient.java    | 28 +++-----
 .../payload/multipart/FormDataFileClient.java | 28 +++-----
 ...rmDataHttpPartsContentTypeAsyncClient.java | 72 +++++++++++--------
 .../FormDataHttpPartsContentTypeClient.java   | 72 +++++++++++--------
 .../ExtensibleStringsAsyncClient.java         |  2 +-
 .../enumservice/EnumServiceAsyncClient.java   |  4 +-
 .../tsptest/flatten/FlattenAsyncClient.java   | 12 ++--
 .../java/tsptest/flatten/FlattenClient.java   | 12 ++--
 .../tsptest/optional/OptionalAsyncClient.java |  4 +-
 11 files changed, 145 insertions(+), 137 deletions(-)

diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java
index b82a181fb0f..18289d7262f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataAsyncClient.java
@@ -687,11 +687,13 @@ public Mono checkFileNameAndContentType(MultiPartRequest body) {
     public Mono> anonymousModelWithResponse(AnonymousModelRequest body, RequestOptions requestOptions) {
         // Generated convenience method for anonymousModelWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return anonymousModelWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -711,10 +713,12 @@ public Mono> anonymousModelWithResponse(AnonymousModelRequest bod
     public Mono anonymousModel(AnonymousModelRequest body) {
         // Generated convenience method for anonymousModelWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
+        return anonymousModelWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).flatMap(FluxUtil::toMono);
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java
index 10f8e6b00b2..6eac4cc2b57 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataClient.java
@@ -670,11 +670,13 @@ public void checkFileNameAndContentType(MultiPartRequest body) {
     public Response anonymousModelWithResponse(AnonymousModelRequest body, RequestOptions requestOptions) {
         // Generated convenience method for anonymousModelWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return anonymousModelWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -693,10 +695,12 @@ public Response anonymousModelWithResponse(AnonymousModelRequest body, Req
     public void anonymousModel(AnonymousModelRequest body) {
         // Generated convenience method for anonymousModelWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        anonymousModelWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).getValue();
+        anonymousModelWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).getValue();
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java
index 2febe24ad3d..dca7b5d274b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileAsyncClient.java
@@ -122,11 +122,8 @@ public Mono> uploadFileSpecificContentTypeWithResponse(UploadFile
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions);
     }
 
@@ -148,11 +145,8 @@ public Mono uploadFileSpecificContentType(UploadFileSpecificContentTypeReq
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         return uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions).flatMap(FluxUtil::toMono);
     }
 
@@ -176,11 +170,8 @@ public Mono> uploadFileRequiredFilenameWithResponse(UploadFileReq
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions);
     }
 
@@ -202,11 +193,8 @@ public Mono uploadFileRequiredFilename(UploadFileRequiredFilenameRequest b
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         return uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions).flatMap(FluxUtil::toMono);
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java
index af10e8f0082..aeb7757e1a6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataFileClient.java
@@ -118,11 +118,8 @@ public Response uploadFileSpecificContentTypeWithResponse(UploadFileSpecif
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions);
     }
 
@@ -143,11 +140,8 @@ public void uploadFileSpecificContentType(UploadFileSpecificContentTypeRequest b
         // Generated convenience method for uploadFileSpecificContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         uploadFileSpecificContentTypeWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions).getValue();
     }
 
@@ -171,11 +165,8 @@ public Response uploadFileRequiredFilenameWithResponse(UploadFileRequiredF
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
         return uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions);
     }
 
@@ -196,11 +187,8 @@ public void uploadFileRequiredFilename(UploadFileRequiredFilenameRequest body) {
         // Generated convenience method for uploadFileRequiredFilenameWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
         uploadFileRequiredFilenameWithResponseInternal(
-            new MultipartFormDataHelper(requestOptions)
-                .serializeFileField("file", body.getFile().getContent(), body.getFile().getContentType(),
-                    body.getFile().getFilename())
-                .end()
-                .getRequestBody(),
+            new MultipartFormDataHelper(requestOptions).serializeFileField("file", body.getFile().getContent(),
+                body.getFile().getContentType(), body.getFile().getFilename()).end().getRequestBody(),
             requestOptions).getValue();
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java
index a0165e6bd67..01d9c144196 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeAsyncClient.java
@@ -117,11 +117,13 @@ public Mono> imageJpegContentTypeWithResponse(FileWithHttpPartSpe
         RequestOptions requestOptions) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return imageJpegContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -141,11 +143,13 @@ public Mono> imageJpegContentTypeWithResponse(FileWithHttpPartSpe
     public Mono imageJpegContentType(FileWithHttpPartSpecificContentTypeRequest body) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
+        return imageJpegContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).flatMap(FluxUtil::toMono);
     }
 
     /**
@@ -167,11 +171,13 @@ public Mono> requiredContentTypeWithResponse(FileWithHttpPartRequ
         RequestOptions requestOptions) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return requiredContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -191,11 +197,13 @@ public Mono> requiredContentTypeWithResponse(FileWithHttpPartRequ
     public Mono requiredContentType(FileWithHttpPartRequiredContentTypeRequest body) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
+        return requiredContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).flatMap(FluxUtil::toMono);
     }
 
     /**
@@ -217,11 +225,13 @@ public Mono> optionalContentTypeWithResponse(FileWithHttpPartOpti
         RequestOptions requestOptions) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return optionalContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -241,10 +251,12 @@ public Mono> optionalContentTypeWithResponse(FileWithHttpPartOpti
     public Mono optionalContentType(FileWithHttpPartOptionalContentTypeRequest body) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        return optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).flatMap(FluxUtil::toMono);
+        return optionalContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).flatMap(FluxUtil::toMono);
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java
index f8e98bbfdfb..a1cf05bee3c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/multipart/FormDataHttpPartsContentTypeClient.java
@@ -115,11 +115,13 @@ public Response imageJpegContentTypeWithResponse(FileWithHttpPartSpecificC
         RequestOptions requestOptions) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return imageJpegContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -138,11 +140,13 @@ public Response imageJpegContentTypeWithResponse(FileWithHttpPartSpecificC
     public void imageJpegContentType(FileWithHttpPartSpecificContentTypeRequest body) {
         // Generated convenience method for imageJpegContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        imageJpegContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).getValue();
+        imageJpegContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).getValue();
     }
 
     /**
@@ -164,11 +168,13 @@ public Response requiredContentTypeWithResponse(FileWithHttpPartRequiredCo
         RequestOptions requestOptions) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return requiredContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -187,11 +193,13 @@ public Response requiredContentTypeWithResponse(FileWithHttpPartRequiredCo
     public void requiredContentType(FileWithHttpPartRequiredContentTypeRequest body) {
         // Generated convenience method for requiredContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        requiredContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).getValue();
+        requiredContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).getValue();
     }
 
     /**
@@ -213,11 +221,13 @@ public Response optionalContentTypeWithResponse(FileWithHttpPartOptionalCo
         RequestOptions requestOptions) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         requestOptions = requestOptions == null ? new RequestOptions() : requestOptions;
-        return optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions);
+        return optionalContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions);
     }
 
     /**
@@ -236,10 +246,12 @@ public Response optionalContentTypeWithResponse(FileWithHttpPartOptionalCo
     public void optionalContentType(FileWithHttpPartOptionalContentTypeRequest body) {
         // Generated convenience method for optionalContentTypeWithResponseInternal
         RequestOptions requestOptions = new RequestOptions();
-        optionalContentTypeWithResponseInternal(new MultipartFormDataHelper(requestOptions)
-            .serializeFileField("profileImage", body.getProfileImage().getContent(),
-                body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
-            .end()
-            .getRequestBody(), requestOptions).getValue();
+        optionalContentTypeWithResponseInternal(
+            new MultipartFormDataHelper(requestOptions)
+                .serializeFileField("profileImage", body.getProfileImage().getContent(),
+                    body.getProfileImage().getContentType(), body.getProfileImage().getFilename())
+                .end()
+                .getRequestBody(),
+            requestOptions).getValue();
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java
index 8cd1b0416b1..9e83d9af980 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialwords/ExtensibleStringsAsyncClient.java
@@ -88,6 +88,6 @@ public Mono putExtensibleStringValue(ExtensibleString body) {
         RequestOptions requestOptions = new RequestOptions();
         return putExtensibleStringValueWithResponse(BinaryData.fromObject(body == null ? null : body.toString()),
             requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class)));
+                .map(protocolMethodData -> ExtensibleString.fromString(protocolMethodData.toObject(String.class)));
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java
index b5edf6020ba..7225c05a857 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumservice/EnumServiceAsyncClient.java
@@ -647,7 +647,7 @@ public Mono setStringEnumArray(List colorArray, List Objects.toString(paramItemValue, ""))
             .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toString());
+                .map(protocolMethodData -> protocolMethodData.toString());
     }
 
     /**
@@ -670,7 +670,7 @@ public Mono setStringEnumArray(List colorArray) {
         return setStringEnumArrayWithResponse(colorArray.stream()
             .map(paramItemValue -> Objects.toString(paramItemValue, ""))
             .collect(Collectors.toList()), requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toString());
+                .map(protocolMethodData -> protocolMethodData.toString());
     }
 
     /**
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java
index 7e8197d9102..17e033d70e9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenAsyncClient.java
@@ -331,12 +331,12 @@ public Mono sendLong(SendLongOptions options) {
         String filter = options.getFilter();
         SendLongRequest sendLongRequestObj = new SendLongRequest(options.getInput(), options.getDataInt(),
             options.getRequiredUser(), options.getTitle(), options.getStatus()).setUser(options.getUser())
-            .setDataIntOptional(options.getDataIntOptional())
-            .setDataLong(options.getDataLong())
-            .setDataFloat(options.getDataFloat())
-            .setLongProperty(options.getLongParameter())
-            .setDescription(options.getDescription())
-            .setDummy(options.getDummy());
+                .setDataIntOptional(options.getDataIntOptional())
+                .setDataLong(options.getDataLong())
+                .setDataFloat(options.getDataFloat())
+                .setLongProperty(options.getLongParameter())
+                .setDescription(options.getDescription())
+                .setDummy(options.getDummy());
         BinaryData sendLongRequest = BinaryData.fromObject(sendLongRequestObj);
         if (filter != null) {
             requestOptions.addQueryParam("filter", filter, false);
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java
index cdece140688..73dc334c4f3 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/flatten/FlattenClient.java
@@ -323,12 +323,12 @@ public void sendLong(SendLongOptions options) {
         String filter = options.getFilter();
         SendLongRequest sendLongRequestObj = new SendLongRequest(options.getInput(), options.getDataInt(),
             options.getRequiredUser(), options.getTitle(), options.getStatus()).setUser(options.getUser())
-            .setDataIntOptional(options.getDataIntOptional())
-            .setDataLong(options.getDataLong())
-            .setDataFloat(options.getDataFloat())
-            .setLongProperty(options.getLongParameter())
-            .setDescription(options.getDescription())
-            .setDummy(options.getDummy());
+                .setDataIntOptional(options.getDataIntOptional())
+                .setDataLong(options.getDataLong())
+                .setDataFloat(options.getDataFloat())
+                .setLongProperty(options.getLongParameter())
+                .setDescription(options.getDescription())
+                .setDummy(options.getDummy());
         BinaryData sendLongRequest = BinaryData.fromObject(sendLongRequestObj);
         if (filter != null) {
             requestOptions.addQueryParam("filter", filter, false);
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java
index 8fc12518fe4..5d9b75e9ed6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/optional/OptionalAsyncClient.java
@@ -198,7 +198,7 @@ public Mono put(String requestHeaderRequired, boolean boo
         }
         return putWithResponse(requestHeaderRequired, booleanRequired, booleanRequiredNullable, stringRequired,
             stringRequiredNullable, requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
+                .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
     }
 
     /**
@@ -225,6 +225,6 @@ public Mono put(String requestHeaderRequired, boolean boo
         RequestOptions requestOptions = new RequestOptions();
         return putWithResponse(requestHeaderRequired, booleanRequired, booleanRequiredNullable, stringRequired,
             stringRequiredNullable, requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
+                .map(protocolMethodData -> protocolMethodData.toObject(AllPropertiesOptional.class));
     }
 }