diff --git a/.chronus/changes/http-client-java-response-header-javadocs-2026-08-10.md b/.chronus/changes/http-client-java-response-header-javadocs-2026-08-10.md
new file mode 100644
index 00000000000..e12363eaa32
--- /dev/null
+++ b/.chronus/changes/http-client-java-response-header-javadocs-2026-08-10.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@typespec/http-client-java"
+---
+
+Document response headers in protocol API Javadocs.
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientParameterMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientParameterMapper.java
index 2a51edd4f2f..cd041568571 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientParameterMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientParameterMapper.java
@@ -70,7 +70,7 @@ public ClientMethodParameter map(Parameter parameter, boolean isProtocolMethod)
         builder.rawType(wireType);
 
         if (isProtocolMethod) {
-            wireType = SchemaUtil.removeModelFromParameter(parameter.getProtocol().getHttp().getIn(), wireType);
+            wireType = SchemaUtil.removeModelFromClientType(parameter.getProtocol().getHttp().getIn(), wireType);
         }
 
         builder.wireType(wireType).annotations(new ArrayList<>());
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CustomClientParameterMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CustomClientParameterMapper.java
index f52ebca0956..f8222d43ac2 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CustomClientParameterMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/CustomClientParameterMapper.java
@@ -47,7 +47,7 @@ public ClientMethodParameter map(Parameter parameter, boolean isProtocolMethod)
             wireType = Mappers.getSchemaMapper().map(parameter.getSchema());
         }
         if (isProtocolMethod) {
-            wireType = SchemaUtil.removeModelFromParameter(parameter.getProtocol().getHttp().getIn(), wireType);
+            wireType = SchemaUtil.removeModelFromClientType(parameter.getProtocol().getHttp().getIn(), wireType);
         }
         if (parameter.isNullable() || !parameter.isRequired()) {
             builder.wireType(wireType.asNullable());
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java
index 4fe7a8f7351..a1685ba1433 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyMethodMapper.java
@@ -4,8 +4,10 @@
 package com.microsoft.typespec.http.client.generator.core.mapper;
 
 import com.microsoft.typespec.http.client.generator.core.Javagen;
+import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Header;
 import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Operation;
 import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Request;
+import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.RequestParameterLocation;
 import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Response;
 import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings;
 import com.microsoft.typespec.http.client.generator.core.extension.plugin.PluginLogger;
@@ -16,6 +18,7 @@
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethod;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodExample;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodParameter;
+import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodResponseHeader;
 import com.microsoft.typespec.http.client.generator.core.util.MethodUtil;
 import com.microsoft.typespec.http.client.generator.core.util.SchemaUtil;
 import com.microsoft.typespec.http.client.generator.core.util.XmsExampleWrapper;
@@ -25,6 +28,7 @@
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -68,6 +72,7 @@ public Map<Request, List<ProxyMethod>> map(Operation operation) {
 
         final List<Integer> expectedStatusCodes = getExpectedResponseStatusCodes(operation);
         builder.responseExpectedStatusCodes(expectedStatusCodes);
+        builder.responseHeaders(getResponseHeaders(operation, settings));
         buildExpectedResponseFields(operation, settings, builder);
         buildUnexpectedResponseExceptionFields(builder, operation, expectedStatusCodes, settings);
         builder.responseContentTypes(getResponseContentTypes(operation));
@@ -130,6 +135,45 @@ private static List<Integer> getExpectedResponseStatusCodes(Operation operation)
             .collect(Collectors.toList());
     }
 
+    protected static List<ProxyMethodResponseHeader> getResponseHeaders(Operation operation, JavaSettings settings) {
+        if (!SchemaUtil.responseContainsHeaderSchemas(operation, settings)) {
+            return List.of();
+        }
+
+        Map<String, ProxyMethodResponseHeader> responseHeaders = new LinkedHashMap<>();
+        operation.getResponses()
+            .stream()
+            .filter(response -> response.getProtocol() != null
+                && response.getProtocol().getHttp() != null
+                && response.getProtocol().getHttp().getHeaders() != null)
+            .flatMap(response -> response.getProtocol().getHttp().getHeaders().stream())
+            .filter(header -> header.getSchema() != null)
+            .forEach(header -> responseHeaders.putIfAbsent(header.getHeader().toLowerCase(Locale.ROOT),
+                mapResponseHeader(header)));
+        return new ArrayList<>(responseHeaders.values());
+    }
+
+    private static ProxyMethodResponseHeader mapResponseHeader(Header header) {
+        IType clientType = Mappers.getSchemaMapper().map(header.getSchema()).getClientType();
+        if (Mappers.getProxyParameterMapper().isRemoveModelFromClientType(clientType)) {
+            clientType = SchemaUtil.removeModelFromClientType(RequestParameterLocation.HEADER, clientType);
+        }
+        String description = null;
+        if (header.getLanguage() != null && header.getLanguage().getDefault() != null) {
+            description = header.getLanguage().getDefault().getDescription();
+        }
+        if (CoreUtils.isNullOrEmpty(description)) {
+            description = header.getSchema().getDescription();
+        }
+        if (CoreUtils.isNullOrEmpty(description)) {
+            description = String.format("The %s response header.", header.getHeader());
+        }
+        return new ProxyMethodResponseHeader.Builder().serializedName(header.getHeader())
+            .clientType(clientType)
+            .description(description)
+            .build();
+    }
+
     /**
      * Resolve and update the builder with the expected response (successful response) body type, wire type and the
      * return
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java
index bd345bff299..cc6e7efa90d 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java
@@ -67,8 +67,8 @@ public ProxyMethodParameter map(Parameter parameter) {
 
         IType clientType = wireType.getClientType();
 
-        if (isRemoveModelFromParameter(parameter, clientType)) {
-            clientType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, clientType);
+        if (isRemoveModelFromClientType(parameter, clientType)) {
+            clientType = SchemaUtil.removeModelFromClientType(parameterRequestLocation, clientType);
         }
 
         builder.clientType(clientType);
@@ -90,8 +90,8 @@ public ProxyMethodParameter map(Parameter parameter) {
             if (parameterRequestLocation
                 != RequestParameterLocation.BODY /* && parameterRequestLocation != RequestParameterLocation.FormData */) {
                 wireType = ClassType.STRING;
-            } else if (isRemoveModelFromParameter(parameter, wireType)) {
-                wireType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, wireType);
+            } else if (isRemoveModelFromClientType(parameter, wireType)) {
+                wireType = SchemaUtil.removeModelFromClientType(parameterRequestLocation, wireType);
             }
         } else if (wireType instanceof IterableType
             && parameter.getProtocol().getHttp().getIn()
@@ -104,8 +104,8 @@ public ProxyMethodParameter map(Parameter parameter) {
             } else {
                 wireType = ClassType.STRING;
             }
-        } else if (isRemoveModelFromParameter(parameter, wireType)) {
-            wireType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, wireType);
+        } else if (isRemoveModelFromClientType(parameter, wireType)) {
+            wireType = SchemaUtil.removeModelFromClientType(parameterRequestLocation, wireType);
         }
         builder.wireType(wireType);
 
@@ -184,7 +184,11 @@ public ProxyMethodParameter map(Parameter parameter) {
         return builder.build();
     }
 
-    protected boolean isRemoveModelFromParameter(Parameter parameter, IType clientType) {
+    protected boolean isRemoveModelFromClientType(Parameter parameter, IType clientType) {
+        return isRemoveModelFromClientType(clientType);
+    }
+
+    protected boolean isRemoveModelFromClientType(IType clientType) {
         return JavaSettings.getInstance().isDataPlaneClient();
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java
index f201560cfa1..664e3530bbe 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java
@@ -200,9 +200,9 @@ protected List<ServiceClientProperty> processClientProperties(Client client, Str
             String serviceClientPropertyName = CodeNamer.getPropertyName(p.getLanguage().getJava().getName());
 
             IType serviceClientPropertyClientType = Mappers.getSchemaMapper().map(p.getSchema());
-            if (isRemoveModelFromParameter(p, serviceClientPropertyClientType)) {
+            if (isRemoveModelFromClientType(p, serviceClientPropertyClientType)) {
                 // mostly for Enum to String
-                serviceClientPropertyClientType = SchemaUtil.removeModelFromParameter(RequestParameterLocation.URI,
+                serviceClientPropertyClientType = SchemaUtil.removeModelFromClientType(RequestParameterLocation.URI,
                     serviceClientPropertyClientType);
             }
             if (p.isNullable() && serviceClientPropertyClientType != null) {
@@ -250,7 +250,7 @@ protected List<ServiceClientProperty> processClientProperties(Client client, Str
         return serviceClientProperties;
     }
 
-    protected boolean isRemoveModelFromParameter(Parameter parameter, IType type) {
+    protected boolean isRemoveModelFromClientType(Parameter parameter, IType type) {
         return JavaSettings.getInstance().isDataPlaneClient();
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java
index 121e59d7e8a..c725a09830d 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyMethodMapper.java
@@ -97,6 +97,7 @@ public Map<Request, List<ProxyMethod>> map(Operation operation) {
             .sorted()
             .collect(Collectors.toList());
         builder.responseExpectedStatusCodes(expectedStatusCodes);
+        builder.responseHeaders(getResponseHeaders(operation, settings));
 
         IType responseBodyType = MapperUtils.getExpectedResponseBodyType(operation, settings);
         builder.responseBodyType(responseBodyType);
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyParameterMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyParameterMapper.java
index b307d6a68e4..6c653546425 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyParameterMapper.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/clientcore/ClientCoreProxyParameterMapper.java
@@ -3,7 +3,6 @@
 
 package com.microsoft.typespec.http.client.generator.core.mapper.clientcore;
 
-import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Parameter;
 import com.microsoft.typespec.http.client.generator.core.mapper.ProxyParameterMapper;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType;
 
@@ -18,7 +17,7 @@ public static ClientCoreProxyParameterMapper getInstance() {
     }
 
     @Override
-    protected boolean isRemoveModelFromParameter(Parameter parameter, IType clientType) {
+    protected boolean isRemoveModelFromClientType(IType clientType) {
         return false;
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethod.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethod.java
index d8b66e707c8..317df1b3be1 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethod.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethod.java
@@ -94,6 +94,8 @@ public class ProxyMethod {
      */
     private final Set<String> responseContentTypes;
 
+    private final List<ProxyMethodResponseHeader> responseHeaders;
+
     private final Map<String, ProxyMethodExample> examples;
 
     private final List<String> specialHeaders;
@@ -123,6 +125,7 @@ public ProxyMethod.Builder newBuilder() {
             .rawResponseBodyType(rawResponseBodyType)
             .isResumable(isResumable)
             .responseContentTypes(responseContentTypes)
+            .responseHeaders(responseHeaders)
             .examples(examples)
             .specialHeaders(specialHeaders)
             .operationId(operationId)
@@ -159,9 +162,9 @@ private ProxyMethod(String requestContentType, IType returnType, HttpMethod http
         Map<ClassType, List<Integer>> unexpectedResponseExceptionTypes, String name,
         List<ProxyMethodParameter> parameters, List<ProxyMethodParameter> allParameters, String description,
         IType returnValueWireType, IType responseBodyType, IType rawResponseBodyType, boolean isResumable,
-        Set<String> responseContentTypes, String operationId, Map<String, ProxyMethodExample> examples,
-        List<String> specialHeaders, boolean isSync, String baseName, boolean customHeaderIgnored,
-        String implementation) {
+        Set<String> responseContentTypes, List<ProxyMethodResponseHeader> responseHeaders, String operationId,
+        Map<String, ProxyMethodExample> examples, List<String> specialHeaders, boolean isSync, String baseName,
+        boolean customHeaderIgnored, String implementation) {
         this.requestContentType = requestContentType;
         this.returnType = returnType;
         this.httpMethod = httpMethod;
@@ -179,6 +182,7 @@ private ProxyMethod(String requestContentType, IType returnType, HttpMethod http
         this.rawResponseBodyType = rawResponseBodyType;
         this.isResumable = isResumable;
         this.responseContentTypes = responseContentTypes;
+        this.responseHeaders = responseHeaders;
         this.operationId = operationId;
         this.examples = examples;
         this.specialHeaders = specialHeaders;
@@ -284,6 +288,10 @@ public final Set<String> getResponseContentTypes() {
         return responseContentTypes;
     }
 
+    public List<ProxyMethodResponseHeader> getResponseHeaders() {
+        return responseHeaders;
+    }
+
     public String getOperationId() {
         return operationId;
     }
@@ -359,6 +367,7 @@ public ProxyMethod toSync() {
             .unexpectedResponseExceptionTypes(this.getUnexpectedResponseExceptionTypes())
             .allParameters(allSyncParams)
             .responseContentTypes(this.getResponseContentTypes())
+            .responseHeaders(this.getResponseHeaders())
             .responseExpectedStatusCodes(this.getResponseExpectedStatusCodes())
             .isSync(true)
             .customHeaderIgnored(this.customHeaderIgnored)
@@ -523,6 +532,7 @@ public static class Builder {
         protected IType rawResponseBodyType;
         protected boolean isResumable;
         protected Set<String> responseContentTypes;
+        protected List<ProxyMethodResponseHeader> responseHeaders;
         protected Map<String, ProxyMethodExample> examples;
         protected String operationId;
         protected List<String> specialHeaders;
@@ -733,6 +743,17 @@ public Builder responseContentTypes(Set<String> responseContentTypes) {
             return this;
         }
 
+        /**
+         * Sets the response headers.
+         *
+         * @param responseHeaders the response headers.
+         * @return the Builder itself
+         */
+        public Builder responseHeaders(List<ProxyMethodResponseHeader> responseHeaders) {
+            this.responseHeaders = responseHeaders;
+            return this;
+        }
+
         /**
          * Sets the examples for the method.
          *
@@ -790,8 +811,9 @@ public ProxyMethod build() {
                 CollectionUtil.toImmutableMapOfList(unexpectedResponseExceptionTypes), name,
                 CollectionUtil.toImmutableList(parameters), CollectionUtil.toImmutableList(allParameters), description,
                 returnValueWireType, responseBodyType, rawResponseBodyType, isResumable,
-                CollectionUtil.toImmutableSet(responseContentTypes), operationId, examples,
-                CollectionUtil.toImmutableList(specialHeaders), isSync, baseName, customHeaderIgnored, implementation);
+                CollectionUtil.toImmutableSet(responseContentTypes), CollectionUtil.toImmutableList(responseHeaders),
+                operationId, examples, CollectionUtil.toImmutableList(specialHeaders), isSync, baseName,
+                customHeaderIgnored, implementation);
         }
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethodResponseHeader.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethodResponseHeader.java
new file mode 100644
index 00000000000..2e756022a74
--- /dev/null
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ProxyMethodResponseHeader.java
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.typespec.http.client.generator.core.model.clientmodel;
+
+/**
+ * A response header returned by a {@link ProxyMethod}.
+ */
+public final class ProxyMethodResponseHeader {
+    private final String serializedName;
+
+    // Javadoc only needs the public client type. Add raw and wire types if response generation needs them in future.
+    private final IType clientType;
+
+    private final String description;
+
+    private ProxyMethodResponseHeader(String serializedName, IType clientType, String description) {
+        this.serializedName = serializedName;
+        this.clientType = clientType;
+        this.description = description;
+    }
+
+    /**
+     * Gets the serialized header name.
+     *
+     * @return the serialized header name.
+     */
+    public String getSerializedName() {
+        return serializedName;
+    }
+
+    /**
+     * Gets the client type of the header value.
+     *
+     * @return the client type of the header value.
+     */
+    public IType getClientType() {
+        return clientType;
+    }
+
+    /**
+     * Gets the header description.
+     *
+     * @return the header description.
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Builder for {@link ProxyMethodResponseHeader}.
+     */
+    public static final class Builder {
+        private String serializedName;
+        private IType clientType;
+        private String description;
+
+        /**
+         * Sets the serialized header name.
+         *
+         * @param serializedName the serialized header name.
+         * @return the Builder itself.
+         */
+        public Builder serializedName(String serializedName) {
+            this.serializedName = serializedName;
+            return this;
+        }
+
+        /**
+         * Sets the client type of the header value.
+         *
+         * @param clientType the client type of the header value.
+         * @return the Builder itself.
+         */
+        public Builder clientType(IType clientType) {
+            this.clientType = clientType;
+            return this;
+        }
+
+        /**
+         * Sets the header description.
+         *
+         * @param description the header description.
+         * @return the Builder itself.
+         */
+        public Builder description(String description) {
+            this.description = description;
+            return this;
+        }
+
+        /**
+         * Builds the response header.
+         *
+         * @return the response header.
+         */
+        public ProxyMethodResponseHeader build() {
+            return new ProxyMethodResponseHeader(serializedName, clientType, description);
+        }
+    }
+}
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 03fe16bf80d..d57b26376a6 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
@@ -19,6 +19,7 @@
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PrimitiveType;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethod;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodParameter;
+import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ProxyMethodResponseHeader;
 import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaJavadocComment;
 import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaType;
 import com.microsoft.typespec.http.client.generator.core.util.ClientModelUtil;
@@ -114,6 +115,13 @@ protected static void generateProtocolMethodJavadoc(ClientMethod clientMethod, J
             if (responseBodyType != null && !responseBodyType.equals(PrimitiveType.VOID)) {
                 responseBodySchemaJavadoc(responseBodyType, commentBlock, typesInJavadoc);
             }
+
+            if (clientMethod.getParameters()
+                .stream()
+                .anyMatch(parameter -> ClassType.REQUEST_OPTIONS.equals(parameter.getClientType()))
+                && !CoreUtils.isNullOrEmpty(clientMethod.getProxyMethod().getResponseHeaders())) {
+                responseHeadersJavadoc(clientMethod.getProxyMethod().getResponseHeaders(), commentBlock);
+            }
         }
 
         clientMethod.getParameters()
@@ -160,20 +168,38 @@ protected static void generateJavadocExceptions(ClientMethod clientMethod, JavaJ
     }
 
     private static void optionalParametersJavadoc(String title, List<ProxyMethodParameter> parameters,
+        JavaJavadocComment commentBlock) {
+        List<List<String>> rows = parameters.stream().filter(parameter -> {
+            boolean parameterIsConstantOrFromClient = parameter.isConstant() || parameter.isFromClient();
+            return !parameter.isRequired() && !parameterIsConstantOrFromClient;
+        })
+            .map(parameter -> List.of(parameter.getRequestParameterName(),
+                CodeNamer.escapeXmlComment(parameter.getClientType().toString()), "No",
+                parameterDescriptionOrDefault(parameter)))
+            .collect(Collectors.toList());
+        javadocTable(title, List.of("Name", "Type", "Required", "Description"), rows, commentBlock);
+    }
+
+    private static void responseHeadersJavadoc(List<ProxyMethodResponseHeader> responseHeaders,
+        JavaJavadocComment commentBlock) {
+        List<List<String>> rows = responseHeaders.stream()
+            .map(header -> List.of(CodeNamer.escapeXmlComment(header.getSerializedName()),
+                CodeNamer.escapeXmlComment(header.getClientType().toString()),
+                CodeNamer.escapeXmlComment(header.getDescription())))
+            .collect(Collectors.toList());
+        javadocTable("Response Headers", List.of("Name", "Type", "Description"), rows, commentBlock);
+    }
+
+    private static void javadocTable(String title, List<String> columns, List<List<String>> rows,
         JavaJavadocComment commentBlock) {
         commentBlock.line(String.format("<p><strong>%s</strong></p>", title));
         commentBlock.line("<table border=\"1\">");
         commentBlock.line(String.format("    <caption>%s</caption>", title));
-        commentBlock.line("    <tr><th>Name</th><th>Type</th><th>Required</th><th>Description</th></tr>");
-        for (ProxyMethodParameter parameter : parameters) {
-            boolean parameterIsConstantOrFromClient = parameter.isConstant() || parameter.isFromClient();
-            if (!parameter.isRequired() && !parameterIsConstantOrFromClient) {
-                commentBlock.line(String.format("    <tr><td>%s</td><td>%s</td><td>No</td><td>%s</td></tr>",
-                    parameter.getRequestParameterName(),
-                    CodeNamer.escapeXmlComment(parameter.getClientType().toString()),
-                    parameterDescriptionOrDefault(parameter)));
-            }
-
+        commentBlock.line("    <tr>"
+            + columns.stream().map(column -> "<th>" + column + "</th>").collect(Collectors.joining()) + "</tr>");
+        for (List<String> row : rows) {
+            commentBlock.line("    <tr>"
+                + row.stream().map(value -> "<td>" + value + "</td>").collect(Collectors.joining()) + "</tr>");
         }
         commentBlock.line("</table>");
     }
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java
index 532902ec99d..26a748aa96d 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java
@@ -211,7 +211,7 @@ public static String mergeSummaryWithDescription(String summary, String descript
         }
     }
 
-    public static IType removeModelFromParameter(RequestParameterLocation parameterRequestLocation, IType type) {
+    public static IType removeModelFromClientType(RequestParameterLocation parameterRequestLocation, IType type) {
         if (parameterRequestLocation == RequestParameterLocation.BODY) {
             return ClassType.BINARY_DATA;
         }
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 6e664b20672..919d76bc449 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
@@ -71,6 +71,16 @@ public final class TraitsAsyncClient {
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>bar</td><td>String</td><td>The bar response header.</td></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * <tr><td>x-ms-client-request-id</td><td>String</td><td>An opaque, globally-unique, client-generated string
+     * identifier for the request.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param foo header in request.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -118,6 +128,14 @@ public Mono<Response<BinaryData>> smokeTestWithResponse(int id, String foo, Requ
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param body The body parameter.
      * @param requestOptions The options to 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/TraitsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/TraitsClient.java
index 13ca40d7ea1..df0c730eec8 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
@@ -69,6 +69,16 @@ public final class TraitsClient {
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>bar</td><td>String</td><td>The bar response header.</td></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * <tr><td>x-ms-client-request-id</td><td>String</td><td>An opaque, globally-unique, client-generated string
+     * identifier for the request.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param foo header in request.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -115,6 +125,14 @@ public Response<BinaryData> smokeTestWithResponse(int id, String foo, RequestOpt
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param body The body parameter.
      * @param requestOptions The options to 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/implementation/TraitsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/core/traits/implementation/TraitsClientImpl.java
index 9c63246859b..d9bf2fe243c 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
@@ -220,6 +220,16 @@ Response<BinaryData> repeatableActionSync(@HostParam("endpoint") String endpoint
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>bar</td><td>String</td><td>The bar response header.</td></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * <tr><td>x-ms-client-request-id</td><td>String</td><td>An opaque, globally-unique, client-generated string
+     * identifier for the request.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param foo header in request.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -264,6 +274,16 @@ public Mono<Response<BinaryData>> smokeTestWithResponseAsync(int id, String foo,
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>bar</td><td>String</td><td>The bar response header.</td></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * <tr><td>x-ms-client-request-id</td><td>String</td><td>An opaque, globally-unique, client-generated string
+     * identifier for the request.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param foo header in request.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -311,6 +331,14 @@ public Response<BinaryData> smokeTestWithResponse(int id, String foo, RequestOpt
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param body The body parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -374,6 +402,14 @@ public Mono<Response<BinaryData>> repeatableActionWithResponseAsync(int id, Bina
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param id The user's id.
      * @param body The body parameter.
      * @param requestOptions The options to 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/HeaderAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderAsyncClient.java
index 21b19c60259..81c35bdc27b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderAsyncClient.java
@@ -55,6 +55,12 @@ public Mono<Response<Void>> requestWithResponse(String clientName, RequestOption
 
     /**
      * The response operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>default-name</td><td>String</td><td>The default-name response header.</td></tr>
+     * </table>
      * 
      * @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/HeaderClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderClient.java
index 41ac9ed13ce..843ba158795 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/HeaderClient.java
@@ -53,6 +53,12 @@ public Response<Void> requestWithResponse(String clientName, RequestOptions requ
 
     /**
      * The response operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>default-name</td><td>String</td><td>The default-name response header.</td></tr>
+     * </table>
      * 
      * @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/implementation/HeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/HeadersImpl.java
index a74651005cf..76b34cebcde 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/HeadersImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/naming/implementation/HeadersImpl.java
@@ -128,6 +128,12 @@ public Response<Void> requestWithResponse(String clientName, RequestOptions requ
 
     /**
      * The response operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>default-name</td><td>String</td><td>The default-name response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -143,6 +149,12 @@ public Mono<Response<Void>> responseWithResponseAsync(RequestOptions requestOpti
 
     /**
      * The response operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>default-name</td><td>String</td><td>The default-name response header.</td></tr>
+     * </table>
      * 
      * @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/ResponseHeaderAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/ResponseHeaderAsyncClient.java
index dd2355693bb..fb444ae2305 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/ResponseHeaderAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/ResponseHeaderAsyncClient.java
@@ -38,6 +38,12 @@ public final class ResponseHeaderAsyncClient {
 
     /**
      * The defaultMethod operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -54,6 +60,12 @@ public Mono<Response<Void>> defaultMethodWithResponse(RequestOptions requestOpti
 
     /**
      * The rfc3339 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +82,12 @@ public Mono<Response<Void>> rfc3339WithResponse(RequestOptions requestOptions) {
 
     /**
      * The rfc7231 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +104,12 @@ public Mono<Response<Void>> rfc7231WithResponse(RequestOptions requestOptions) {
 
     /**
      * The unixTimestamp operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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/ResponseHeaderClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/ResponseHeaderClient.java
index 94dbd27ce13..cbeb6353486 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/ResponseHeaderClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/ResponseHeaderClient.java
@@ -36,6 +36,12 @@ public final class ResponseHeaderClient {
 
     /**
      * The defaultMethod operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -52,6 +58,12 @@ public Response<Void> defaultMethodWithResponse(RequestOptions requestOptions) {
 
     /**
      * The rfc3339 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +80,12 @@ public Response<Void> rfc3339WithResponse(RequestOptions requestOptions) {
 
     /**
      * The rfc7231 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -84,6 +102,12 @@ public Response<Void> rfc7231WithResponse(RequestOptions requestOptions) {
 
     /**
      * The unixTimestamp operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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/implementation/ResponseHeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java
index 900cbca4eb5..afb78f3e06a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/encode/datetime/implementation/ResponseHeadersImpl.java
@@ -130,6 +130,12 @@ Response<Void> unixTimestampSync(@HostParam("endpoint") String endpoint, Request
 
     /**
      * The defaultMethod operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +152,12 @@ public Mono<Response<Void>> defaultMethodWithResponseAsync(RequestOptions reques
 
     /**
      * The defaultMethod operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +173,12 @@ public Response<Void> defaultMethodWithResponse(RequestOptions requestOptions) {
 
     /**
      * The rfc3339 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -176,6 +194,12 @@ public Mono<Response<Void>> rfc3339WithResponseAsync(RequestOptions requestOptio
 
     /**
      * The rfc3339 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +215,12 @@ public Response<Void> rfc3339WithResponse(RequestOptions requestOptions) {
 
     /**
      * The rfc7231 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -206,6 +236,12 @@ public Mono<Response<Void>> rfc7231WithResponseAsync(RequestOptions requestOptio
 
     /**
      * The rfc7231 operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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,6 +257,12 @@ public Response<Void> rfc7231WithResponse(RequestOptions requestOptions) {
 
     /**
      * The unixTimestamp operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -237,6 +279,12 @@ public Mono<Response<Void>> unixTimestampWithResponseAsync(RequestOptions reques
 
     /**
      * The unixTimestamp operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>value</td><td>OffsetDateTime</td><td>The value response header.</td></tr>
+     * </table>
      * 
      * @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/head/HeadAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/HeadAsyncClient.java
index bf069cfb2b9..c43936e6f8b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/HeadAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/HeadAsyncClient.java
@@ -38,6 +38,13 @@ public final class HeadAsyncClient {
 
     /**
      * The contentTypeHeaderInResponse operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>Content-type.</td></tr>
+     * <tr><td>x-ms-meta</td><td>String</td><td>The metadata headers.</td></tr>
+     * </table>
      * 
      * @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/head/HeadClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/HeadClient.java
index c9cd5184353..05465e8586c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/HeadClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/HeadClient.java
@@ -36,6 +36,13 @@ public final class HeadClient {
 
     /**
      * The contentTypeHeaderInResponse operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>Content-type.</td></tr>
+     * <tr><td>x-ms-meta</td><td>String</td><td>The metadata headers.</td></tr>
+     * </table>
      * 
      * @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/head/implementation/HeadClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/implementation/HeadClientImpl.java
index b964c1fa199..15a4cc3f296 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/implementation/HeadClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/payload/head/implementation/HeadClientImpl.java
@@ -141,6 +141,13 @@ Response<Void> contentTypeHeaderInResponseSync(@HostParam("endpoint") String end
 
     /**
      * The contentTypeHeaderInResponse operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>Content-type.</td></tr>
+     * <tr><td>x-ms-meta</td><td>String</td><td>The metadata headers.</td></tr>
+     * </table>
      * 
      * @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,6 +164,13 @@ public Mono<Response<Void>> contentTypeHeaderInResponseWithResponseAsync(Request
 
     /**
      * The contentTypeHeaderInResponse operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>Content-type.</td></tr>
+     * <tr><td>x-ms-meta</td><td>String</td><td>The metadata headers.</td></tr>
+     * </table>
      * 
      * @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/specialheaders/repeatability/RepeatabilityAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/RepeatabilityAsyncClient.java
index dfb531b787b..4163009e77e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/RepeatabilityAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/RepeatabilityAsyncClient.java
@@ -47,6 +47,13 @@ public final class RepeatabilityAsyncClient {
      * HTTP-date</td></tr>
      * </table>
      * You can add these to a request with {@link RequestOptions#addHeader}
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
      * 
      * @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/specialheaders/repeatability/RepeatabilityClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/RepeatabilityClient.java
index 4840de1b303..be5da1c824c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/RepeatabilityClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/RepeatabilityClient.java
@@ -45,6 +45,13 @@ public final class RepeatabilityClient {
      * HTTP-date</td></tr>
      * </table>
      * You can add these to a request with {@link RequestOptions#addHeader}
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
      * 
      * @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/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java
index 085186d6e79..c1bc1eb144f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/specialheaders/repeatability/implementation/RepeatabilityClientImpl.java
@@ -156,6 +156,13 @@ Response<Void> immediateSuccessSync(@HostParam("endpoint") String endpoint, Requ
      * HTTP-date</td></tr>
      * </table>
      * You can add these to a request with {@link RequestOptions#addHeader}
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
      * 
      * @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,6 +202,13 @@ public Mono<Response<Void>> immediateSuccessWithResponseAsync(RequestOptions req
      * HTTP-date</td></tr>
      * </table>
      * You can add these to a request with {@link RequestOptions#addHeader}
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
      * 
      * @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/longrunning/LongRunningAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/longrunning/LongRunningAsyncClient.java
index 83b4583935e..d9657320b70 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
@@ -89,6 +89,14 @@ public PollerFlux<BinaryData, BinaryData> beginLongRunning(RequestOptions reques
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Retry-After</td><td>int</td><td>The Retry-After header can indicate how long the client should wait
+     * before polling the operation status.</td></tr>
+     * </table>
+     * 
      * @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.
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 f7c32401a8c..6943afdf042 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
@@ -87,6 +87,14 @@ public SyncPoller<BinaryData, BinaryData> beginLongRunning(RequestOptions reques
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Retry-After</td><td>int</td><td>The Retry-After header can indicate how long the client should wait
+     * before polling the operation status.</td></tr>
+     * </table>
+     * 
      * @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.
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 735f725ed6a..867fe722bbf 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
@@ -367,6 +367,14 @@ public SyncPoller<BinaryData, BinaryData> beginLongRunning(RequestOptions reques
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Retry-After</td><td>int</td><td>The Retry-After header can indicate how long the client should wait
+     * before polling the operation status.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -413,6 +421,14 @@ public Mono<Response<BinaryData>> getJobWithResponseAsync(String id, RequestOpti
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Retry-After</td><td>int</td><td>The Retry-After header can indicate how long the client should wait
+     * before polling the operation status.</td></tr>
+     * </table>
+     * 
      * @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.
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 c5b9d71904a..390292f1b51 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
@@ -128,6 +128,14 @@ public final class OptionalAsyncClient {
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>header-required</td><td>String</td><td>The header-required response header.</td></tr>
+     * <tr><td>header-optional</td><td>String</td><td>The header-optional response header.</td></tr>
+     * </table>
+     * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
      * @param booleanRequired The booleanRequired parameter.
      * @param booleanRequiredNullable The booleanRequiredNullable parameter.
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 9b0669c9684..d89138485b2 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
@@ -126,6 +126,14 @@ public final class OptionalClient {
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>header-required</td><td>String</td><td>The header-required response header.</td></tr>
+     * <tr><td>header-optional</td><td>String</td><td>The header-optional response header.</td></tr>
+     * </table>
+     * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
      * @param booleanRequired The booleanRequired parameter.
      * @param booleanRequiredNullable The booleanRequiredNullable 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 58db75c0831..76a0c73cd10 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
@@ -176,6 +176,14 @@ Response<BinaryData> putSync(@HostParam("endpoint") String endpoint,
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>header-required</td><td>String</td><td>The header-required response header.</td></tr>
+     * <tr><td>header-optional</td><td>String</td><td>The header-optional response header.</td></tr>
+     * </table>
+     * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
      * @param booleanRequired The booleanRequired parameter.
      * @param booleanRequiredNullable The booleanRequiredNullable parameter.
@@ -292,6 +300,14 @@ public Mono<Response<BinaryData>> putWithResponseAsync(String requestHeaderRequi
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>header-required</td><td>String</td><td>The header-required response header.</td></tr>
+     * <tr><td>header-optional</td><td>String</td><td>The header-optional response header.</td></tr>
+     * </table>
+     * 
      * @param requestHeaderRequired The requestHeaderRequired parameter.
      * @param booleanRequired The booleanRequired parameter.
      * @param booleanRequiredNullable The booleanRequiredNullable parameter.
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 44c2023f388..96c5cd2893d 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
@@ -146,6 +146,13 @@ public Mono<Response<BinaryData>> getAnotherArrayWithResponse(RequestOptions req
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -161,6 +168,12 @@ public Mono<Response<BinaryData>> createWithHeadersWithResponse(RequestOptions r
 
     /**
      * The deleteWithHeaders operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
      * 
      * @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 c12691f6940..956a41fe67b 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
@@ -140,6 +140,13 @@ public Response<BinaryData> getAnotherArrayWithResponse(RequestOptions requestOp
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -155,6 +162,12 @@ public Response<BinaryData> createWithHeadersWithResponse(RequestOptions request
 
     /**
      * The deleteWithHeaders operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
      * 
      * @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 59671de7556..6658c3b11bc 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
@@ -729,6 +729,13 @@ public Response<BinaryData> getAnotherArrayWithResponse(RequestOptions requestOp
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -758,6 +765,13 @@ public Mono<Response<BinaryData>> createWithHeadersWithResponseAsync(RequestOpti
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -773,6 +787,12 @@ public Response<BinaryData> createWithHeadersWithResponse(RequestOptions request
 
     /**
      * The deleteWithHeaders operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
@@ -788,6 +808,12 @@ public Mono<Response<Void>> deleteWithHeadersWithResponseAsync(RequestOptions re
 
     /**
      * The deleteWithHeaders operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>operation-location</td><td>String</td><td>The operation-location response header.</td></tr>
+     * </table>
      * 
      * @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/responseheaders/ResponseHeadersAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/ResponseHeadersAsyncClient.java
index 081c35e6365..0bb677d2db7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/ResponseHeadersAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/ResponseHeadersAsyncClient.java
@@ -38,6 +38,14 @@ public final class ResponseHeadersAsyncClient {
 
     /**
      * The getResourceMetadata operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The ETag response header.</td></tr>
+     * <tr><td>x-resource-count</td><td>int</td><td>The x-resource-count response header.</td></tr>
+     * <tr><td>Last-Modified</td><td>OffsetDateTime</td><td>The Last-Modified response header.</td></tr>
+     * </table>
      * 
      * @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/responseheaders/ResponseHeadersClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/ResponseHeadersClient.java
index da8bf5fe598..eac1be31774 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/ResponseHeadersClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/ResponseHeadersClient.java
@@ -37,6 +37,14 @@ public final class ResponseHeadersClient {
 
     /**
      * The getResourceMetadata operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The ETag response header.</td></tr>
+     * <tr><td>x-resource-count</td><td>int</td><td>The x-resource-count response header.</td></tr>
+     * <tr><td>Last-Modified</td><td>OffsetDateTime</td><td>The Last-Modified response header.</td></tr>
+     * </table>
      * 
      * @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/responseheaders/implementation/ResponseHeaderOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/implementation/ResponseHeaderOpsImpl.java
index a8010261a14..accbae9fdff 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/implementation/ResponseHeaderOpsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/responseheaders/implementation/ResponseHeaderOpsImpl.java
@@ -76,6 +76,14 @@ Response<Void> getResourceMetadataSync(@HostParam("endpoint") String endpoint, R
 
     /**
      * The getResourceMetadata operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The ETag response header.</td></tr>
+     * <tr><td>x-resource-count</td><td>int</td><td>The x-resource-count response header.</td></tr>
+     * <tr><td>Last-Modified</td><td>OffsetDateTime</td><td>The Last-Modified response header.</td></tr>
+     * </table>
      * 
      * @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,6 +100,14 @@ public Mono<Response<Void>> getResourceMetadataWithResponseAsync(RequestOptions
 
     /**
      * The getResourceMetadata operation.
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The ETag response header.</td></tr>
+     * <tr><td>x-resource-count</td><td>int</td><td>The x-resource-count response header.</td></tr>
+     * <tr><td>Last-Modified</td><td>OffsetDateTime</td><td>The Last-Modified response header.</td></tr>
+     * </table>
      * 
      * @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/EtagHeadersAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersAsyncClient.java
index 53664e65642..1206ca51c9c 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
@@ -91,6 +91,13 @@ public final class EtagHeadersAsyncClient {
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -145,6 +152,13 @@ public Mono<Response<BinaryData>> putWithRequestHeadersWithResponse(String name,
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to 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/EtagHeadersClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/EtagHeadersClient.java
index 0516e1fd481..a5801eeb798 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
@@ -85,6 +85,13 @@ public final class EtagHeadersClient {
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -139,6 +146,13 @@ public Response<BinaryData> putWithRequestHeadersWithResponse(String name, Binar
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to 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 3d5ea05399c..8c775a2f351 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
@@ -107,6 +107,14 @@ public Mono<Response<BinaryData>> getWithResponse(String name, RequestOptions re
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -146,6 +154,14 @@ public Mono<Response<BinaryData>> putWithResponse(String name, BinaryData resour
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name 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/specialheaders/RepeatabilityHeadersClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/RepeatabilityHeadersClient.java
index a048aae27d6..4658166e941 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
@@ -105,6 +105,14 @@ public Response<BinaryData> getWithResponse(String name, RequestOptions requestO
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -144,6 +152,14 @@ public Response<BinaryData> putWithResponse(String name, BinaryData resource, Re
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name 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/specialheaders/implementation/EtagHeadersImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/specialheaders/implementation/EtagHeadersImpl.java
index 226695d637e..9cf0db4bbe7 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
@@ -208,6 +208,13 @@ Response<BinaryData> listWithEtagNextSync(@PathParam(value = "nextLink", encoded
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -269,6 +276,13 @@ public Mono<Response<BinaryData>> putWithRequestHeadersWithResponseAsync(String
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -326,6 +340,13 @@ public Response<BinaryData> putWithRequestHeadersWithResponse(String name, Binar
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -383,6 +404,13 @@ public Mono<Response<BinaryData>> patchWithMatchHeadersWithResponseAsync(String
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>ETag</td><td>String</td><td>The entity tag for the response.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to 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 26bfa81465b..d97f350ff6a 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
@@ -268,6 +268,14 @@ public Response<BinaryData> getWithResponse(String name, RequestOptions requestO
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -338,6 +346,14 @@ public Mono<Response<BinaryData>> putWithResponseAsync(String name, BinaryData r
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name parameter.
      * @param resource The resource instance.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
@@ -393,6 +409,14 @@ public Response<BinaryData> putWithResponse(String name, BinaryData resource, Re
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name 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.
@@ -446,6 +470,14 @@ public Mono<Response<BinaryData>> postWithResponseAsync(String name, RequestOpti
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Repeatability-Result</td><td>String</td><td>Indicates whether the repeatable request was accepted or
+     * rejected.</td></tr>
+     * </table>
+     * 
      * @param name The name 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/type/file/FileAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/type/file/FileAsyncClient.java
index 0101dbb5c90..c8ee554c3b6 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
@@ -171,6 +171,13 @@ public Mono<Response<Void>> uploadFileMultipleContentTypesWithResponse(String co
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -219,6 +226,13 @@ public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponse(BinaryData
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
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 db23f5d39f0..304123affc8 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
@@ -168,6 +168,13 @@ public Response<Void> uploadFileMultipleContentTypesWithResponse(String contentT
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -215,6 +222,13 @@ public Response<Void> uploadFileDefaultContentTypeWithResponse(BinaryData file,
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
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 3f15833f13a..5a9b7256420 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
@@ -472,6 +472,13 @@ public Response<Void> uploadFileMultipleContentTypesWithResponse(String contentT
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -496,6 +503,13 @@ public Mono<Response<BinaryData>> downloadFileMultipleContentTypesWithResponseAs
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -571,6 +585,13 @@ public Response<Void> uploadFileDefaultContentTypeWithResponse(BinaryData file,
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
@@ -595,6 +616,13 @@ public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponseAsyn
      * }
      * </pre>
      * 
+     * <p><strong>Response Headers</strong></p>
+     * <table border="1">
+     * <caption>Response Headers</caption>
+     * <tr><th>Name</th><th>Type</th><th>Description</th></tr>
+     * <tr><td>Content-Type</td><td>String</td><td>The allowed media (MIME) types of the file contents.</td></tr>
+     * </table>
+     * 
      * @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.
diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java
index 5afd5830f5e..3d82e3cf363 100644
--- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java
+++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java
@@ -13,10 +13,10 @@ public static ProxyParameterMapper getInstance() {
     }
 
     @Override
-    protected boolean isRemoveModelFromParameter(Parameter parameter, IType type) {
+    protected boolean isRemoveModelFromClientType(Parameter parameter, IType type) {
         // if it is typespec and enum type client parameter, do not remove model from parameter
         boolean isEnumType = type instanceof EnumType;
         boolean isClientParameter = Parameter.ImplementationLocation.CLIENT.equals(parameter.getImplementation());
-        return super.isRemoveModelFromParameter(parameter, type) && !(isEnumType && isClientParameter);
+        return super.isRemoveModelFromClientType(parameter, type) && !(isEnumType && isClientParameter);
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java
index cba380f94e5..267db6d2359 100644
--- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java
+++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java
@@ -125,9 +125,9 @@ private static void processPipelinePolicyDetails(ServiceClient.Builder builder,
     }
 
     @Override
-    protected boolean isRemoveModelFromParameter(Parameter parameter, IType type) {
+    protected boolean isRemoveModelFromClientType(Parameter parameter, IType type) {
         boolean isEnumType = type instanceof EnumType;
         boolean isClientParameter = Parameter.ImplementationLocation.CLIENT.equals(parameter.getImplementation());
-        return super.isRemoveModelFromParameter(parameter, type) && !(isEnumType && isClientParameter);
+        return super.isRemoveModelFromClientType(parameter, type) && !(isEnumType && isClientParameter);
     }
 }