@azure-tools/typespec-java 0.25.0 → 0.26.1

package/dist/src/code-model-builder.js

@@ -1,8 +1,8 @@
 import { AnySchema, ApiVersion, ArraySchema, BinaryResponse, BinarySchema, BooleanSchema, ByteArraySchema, ChoiceValue, DateSchema, DateTimeSchema, DictionarySchema, Discriminator, GroupProperty, GroupSchema, HttpHeader, HttpParameter, ImplementationLocation, KeySecurityScheme, Language, Metadata, NumberSchema, OAuth2SecurityScheme, ObjectSchema, OperationGroup, Parameter, ParameterLocation, Property, Relations, Response, SchemaResponse, SchemaType, Security, SerializationStyle, StringSchema, TimeSchema, UnixTimeSchema, UriSchema, VirtualParameter, } from "@autorest/codemodel";
 import { KnownMediaType } from "@azure-tools/codegen";
 import { createSdkContext, getAllModels, getWireName, isApiVersion, isSdkBuiltInKind, isSdkIntKind, } from "@azure-tools/typespec-client-generator-core";
-import { getDoc, getEffectiveModelType, getNamespaceFullName, getOverloadedOperation, getSummary, getVisibility, isArrayModelType, isRecordModelType, listServices, } from "@typespec/compiler";
-import { Visibility, getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, isHeader, isPathParam, isQueryParam, } from "@typespec/http";
+import { getDoc, getEffectiveModelType, getNamespaceFullName, getOverloadedOperation, getSummary, isArrayModelType, isRecordModelType, listServices, } from "@typespec/compiler";
+import { Visibility, getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, isCookieParam, isHeader, isPathParam, isQueryParam, } from "@typespec/http";
 import { getSegment } from "@typespec/rest";
 import { getAddedOnVersions } from "@typespec/versioning";
 import { fail } from "assert";
@@ -20,7 +20,7 @@ import { createPollOperationDetailsSchema, getFileDetailsSchema } from "./extern
 import { ClientContext } from "./models.js";
 import { CONTENT_TYPE_KEY, ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, cloneOperationParameter, getServiceVersion, isKnownContentType, isLroNewPollingStrategy, isPayloadProperty, operationIsJsonMergePatch, operationIsMultipart, operationIsMultipleContentTypes, } from "./operation-utils.js";
 import { ProcessingCache, getAccess, getDurationFormat, getNonNullSdkType, getUnionDescription, getUsage, isStable, modelIs, pushDistinct, } from "./type-utils.js";
-import { getNamespace, logWarning, pascalCase, removeClientSuffix, stringArrayContainsIgnoreCase, trace, } from "./utils.js";
+import { getNamespace, logError, logWarning, pascalCase, removeClientSuffix, stringArrayContainsIgnoreCase, trace, } from "./utils.js";
 const { isEqual } = pkg;
 export class CodeModelBuilder {
     constructor(program1, context) {
@@ -39,12 +39,10 @@ export class CodeModelBuilder {
         }
         const service = listServices(this.program)[0];
         if (!service) {
-            throw Error("TypeSpec for HTTP must define a service.");
+            this.logError("TypeSpec for HTTP must define a service.");
         }
         this.serviceNamespace = service.type;
         this.namespace = getNamespaceFullName(this.serviceNamespace) || "Azure.Client";
-        // java namespace
-        const javaNamespace = this.getJavaNamespace(this.namespace);
         const namespace1 = this.namespace;
         this.typeNameOptions = {
             // shorten type names by removing TypeSpec and service namespace
@@ -67,9 +65,7 @@ export class CodeModelBuilder {
                     summary: this.getSummary(this.serviceNamespace),
                     namespace: this.namespace,
                 },
-                java: {
-                    namespace: javaNamespace,
-                },
+                java: {},
             },
         });
     }
@@ -77,6 +73,20 @@ export class CodeModelBuilder {
         this.sdkContext = await createSdkContext(this.emitterContext, "@azure-tools/typespec-java", {
             versioning: { previewStringRegex: /$/ },
         }); // include all versions and do the filter by ourselves
+        // java namespace
+        if (this.options.namespace) {
+            // legacy mode, clientNamespace from TCGC will be ignored
+            this.legacyJavaNamespace = true;
+            this.baseJavaNamespace = this.options.namespace;
+        }
+        else {
+            this.legacyJavaNamespace = false;
+            // baseJavaNamespace is used for model from Azure.Core/Azure.ResourceManager but cannot be mapped to azure-core,
+            // or some model (e.g. Options, FileDetails) that is created in this emitter.
+            // otherwise, the clientNamespace from SdkType will be used.
+            this.baseJavaNamespace = this.getBaseJavaNamespace();
+        }
+        this.codeModel.language.java.namespace = this.baseJavaNamespace;
         // TODO: reportDiagnostics from TCGC temporary disabled
         // issue https://github.com/Azure/typespec-azure/issues/1675
         // this.program.reportDiagnostics(this.sdkContext.diagnostics);
@@ -108,7 +118,7 @@ export class CodeModelBuilder {
             else {
                 const schema = this.processSchema(arg.type, arg.name);
                 this.trackSchemaUsage(schema, {
-                    usage: [SchemaContext.Input, SchemaContext.Output /*SchemaContext.Public*/],
+                    usage: [SchemaContext.Input, SchemaContext.Output, SchemaContext.Public],
                 });
                 parameter = new Parameter(arg.name, (_a = arg.doc) !== null && _a !== void 0 ? _a : "", schema, {
                     implementation: ImplementationLocation.Client,
@@ -149,10 +159,15 @@ export class CodeModelBuilder {
                         break;
                     case "apiKey":
                         {
-                            const keyScheme = new KeySecurityScheme({
-                                name: scheme.name,
-                            });
-                            securitySchemes.push(keyScheme);
+                            if (scheme.in === "header") {
+                                const keyScheme = new KeySecurityScheme({
+                                    name: scheme.name,
+                                });
+                                securitySchemes.push(keyScheme);
+                            }
+                            else {
+                                this.logWarning(`ApiKey auth is currently only supported for ApiKeyLocation.header.`);
+                            }
                         }
                         break;
                     case "http":
@@ -163,7 +178,7 @@ export class CodeModelBuilder {
                                 schemeOrApiKeyPrefix = pascalCase(schemeOrApiKeyPrefix);
                                 if (this.isBranded()) {
                                     // Azure would not allow BasicAuth or BearerAuth
-                                    this.logWarning(`${scheme.scheme} auth method is currently not supported.`);
+                                    this.logWarning(`HTTP auth with ${scheme.scheme} scheme is not supported for Azure.`);
                                     continue;
                                 }
                             }
@@ -184,7 +199,8 @@ export class CodeModelBuilder {
         }
     }
     isBranded() {
-        return !this.options["flavor"] || this.options["flavor"].toLocaleLowerCase() === "azure";
+        var _a;
+        return ((_a = this.options["flavor"]) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "azure";
     }
     processModels() {
         const processedSdkModels = new Set();
@@ -291,96 +307,110 @@ export class CodeModelBuilder {
         }
     }
     processClients() {
-        var _a, _b, _c;
+        var _a;
         // preprocess group-etag-headers
         this.options["group-etag-headers"] = (_a = this.options["group-etag-headers"]) !== null && _a !== void 0 ? _a : true;
         const sdkPackage = this.sdkContext.sdkPackage;
         for (const client of sdkPackage.clients) {
-            let clientName = client.name;
-            let javaNamespace = this.getJavaNamespace(this.namespace);
-            const clientFullName = client.name;
-            const clientNameSegments = clientFullName.split(".");
-            if (clientNameSegments.length > 1) {
-                clientName = clientNameSegments.at(-1);
-                const clientSubNamespace = clientNameSegments.slice(0, -1).join(".");
-                javaNamespace = this.getJavaNamespace(this.namespace + "." + clientSubNamespace);
-            }
-            const codeModelClient = new CodeModelClient(clientName, (_b = client.doc) !== null && _b !== void 0 ? _b : "", {
-                summary: client.summary,
-                language: {
-                    default: {
-                        namespace: this.namespace,
-                    },
-                    java: {
-                        namespace: javaNamespace,
-                    },
+            this.processClient(client);
+        }
+    }
+    processClient(client) {
+        var _a, _b;
+        let clientName = client.name;
+        let javaNamespace = this.getJavaNamespace(client);
+        const clientFullName = client.name;
+        const clientNameSegments = clientFullName.split(".");
+        if (clientNameSegments.length > 1) {
+            clientName = clientNameSegments.at(-1);
+            const clientSubNamespace = clientNameSegments.slice(0, -1).join(".").toLowerCase();
+            javaNamespace = javaNamespace + "." + clientSubNamespace;
+        }
+        const codeModelClient = new CodeModelClient(clientName, (_a = client.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: client.summary,
+            language: {
+                default: {
+                    namespace: this.namespace,
                 },
-                // at present, use global security definition
-                security: this.codeModel.security,
-            });
-            codeModelClient.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
-            // versioning
-            const versions = client.apiVersions;
-            if (versions && versions.length > 0) {
-                if (!this.sdkContext.apiVersion || ["all", "latest"].includes(this.sdkContext.apiVersion)) {
-                    this.apiVersion = versions[versions.length - 1];
-                }
-                else {
-                    this.apiVersion = versions.find((it) => it === this.sdkContext.apiVersion);
-                    if (!this.apiVersion) {
-                        throw new Error("Unrecognized api-version: " + this.sdkContext.apiVersion);
-                    }
-                }
-                codeModelClient.apiVersions = [];
-                for (const version of this.getFilteredApiVersions(this.apiVersion, versions, this.options["service-version-exclude-preview"])) {
-                    const apiVersion = new ApiVersion();
-                    apiVersion.version = version;
-                    codeModelClient.apiVersions.push(apiVersion);
+                java: {
+                    namespace: javaNamespace,
+                },
+            },
+            // at present, use global security definition
+            security: this.codeModel.security,
+        });
+        codeModelClient.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
+        // versioning
+        const versions = client.apiVersions;
+        if (versions && versions.length > 0) {
+            if (!this.sdkContext.apiVersion || ["all", "latest"].includes(this.sdkContext.apiVersion)) {
+                this.apiVersion = versions[versions.length - 1];
+            }
+            else {
+                this.apiVersion = versions.find((it) => it === this.sdkContext.apiVersion);
+                if (!this.apiVersion) {
+                    this.logError("Unrecognized api-version: " + this.sdkContext.apiVersion);
                 }
             }
-            // client initialization
-            let baseUri = "{endpoint}";
-            let hostParameters = [];
-            client.initialization.properties.forEach((initializationProperty) => {
-                if (initializationProperty.kind === "endpoint") {
-                    let sdkPathParameters = [];
-                    if (initializationProperty.type.kind === "union") {
-                        if (initializationProperty.type.variantTypes.length === 2) {
-                            // only get the sdkPathParameters from the endpoint whose serverUrl is not {"endpoint"}
-                            for (const endpointType of initializationProperty.type.variantTypes) {
-                                if (endpointType.kind === "endpoint" && endpointType.serverUrl !== "{endpoint}") {
-                                    sdkPathParameters = endpointType.templateArguments;
-                                    baseUri = endpointType.serverUrl;
-                                }
+            codeModelClient.apiVersions = [];
+            for (const version of this.getFilteredApiVersions(this.apiVersion, versions, this.options["service-version-exclude-preview"])) {
+                const apiVersion = new ApiVersion();
+                apiVersion.version = version;
+                codeModelClient.apiVersions.push(apiVersion);
+            }
+        }
+        // client initialization
+        let baseUri = "{endpoint}";
+        let hostParameters = [];
+        client.initialization.properties.forEach((initializationProperty) => {
+            if (initializationProperty.kind === "endpoint") {
+                let sdkPathParameters = [];
+                if (initializationProperty.type.kind === "union") {
+                    if (initializationProperty.type.variantTypes.length === 2) {
+                        // only get the sdkPathParameters from the endpoint whose serverUrl is not {"endpoint"}
+                        for (const endpointType of initializationProperty.type.variantTypes) {
+                            if (endpointType.kind === "endpoint" && endpointType.serverUrl !== "{endpoint}") {
+                                sdkPathParameters = endpointType.templateArguments;
+                                baseUri = endpointType.serverUrl;
                             }
                         }
-                        else if (initializationProperty.type.variantTypes.length > 2) {
-                            throw new Error("Multiple server url defined for one client is not supported yet.");
-                        }
                     }
-                    else if (initializationProperty.type.kind === "endpoint") {
-                        sdkPathParameters = initializationProperty.type.templateArguments;
-                        baseUri = initializationProperty.type.serverUrl;
+                    else if (initializationProperty.type.variantTypes.length > 2) {
+                        this.logError("Multiple server url defined for one client is not supported yet.");
                     }
-                    hostParameters = this.processHostParameters(sdkPathParameters);
-                    codeModelClient.addGlobalParameters(hostParameters);
                 }
-            });
-            const clientContext = new ClientContext(baseUri, hostParameters, codeModelClient.globalParameters, codeModelClient.apiVersions);
-            // preprocess operation groups and operations
-            // operations without operation group
-            const serviceMethodsWithoutSubClient = this.listServiceMethodsUnderClient(client);
-            let codeModelGroup = new OperationGroup("");
-            for (const serviceMethod of serviceMethodsWithoutSubClient) {
-                if (!this.needToSkipProcessingOperation(serviceMethod.__raw, clientContext)) {
-                    codeModelGroup.addOperation(this.processOperation(serviceMethod, clientContext, ""));
+                else if (initializationProperty.type.kind === "endpoint") {
+                    sdkPathParameters = initializationProperty.type.templateArguments;
+                    baseUri = initializationProperty.type.serverUrl;
                 }
+                hostParameters = this.processHostParameters(sdkPathParameters);
+                codeModelClient.addGlobalParameters(hostParameters);
             }
-            if (((_c = codeModelGroup.operations) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-                codeModelClient.operationGroups.push(codeModelGroup);
+        });
+        const clientContext = new ClientContext(baseUri, hostParameters, codeModelClient.globalParameters, codeModelClient.apiVersions);
+        const enableSubclient = Boolean(this.options["enable-subclient"]);
+        // preprocess operation groups and operations
+        // operations without operation group
+        const serviceMethodsWithoutSubClient = this.listServiceMethodsUnderClient(client);
+        let codeModelGroup = new OperationGroup("");
+        for (const serviceMethod of serviceMethodsWithoutSubClient) {
+            if (!this.needToSkipProcessingOperation(serviceMethod.__raw, clientContext)) {
+                codeModelGroup.addOperation(this.processOperation(serviceMethod, clientContext, ""));
+            }
+        }
+        if (((_b = codeModelGroup.operations) === null || _b === void 0 ? void 0 : _b.length) > 0 || enableSubclient) {
+            codeModelClient.operationGroups.push(codeModelGroup);
+        }
+        const subClients = this.listSubClientsUnderClient(client, !enableSubclient);
+        if (enableSubclient) {
+            // subclient, no operation group
+            for (const subClient of subClients) {
+                const codeModelSubclient = this.processClient(subClient);
+                codeModelClient.addSubClient(codeModelSubclient);
             }
+        }
+        else {
             // operations under operation groups
-            const subClients = this.listSubClientsUnderClient(client, true, true);
             for (const subClient of subClients) {
                 const serviceMethods = this.listServiceMethodsUnderClient(subClient);
                 // operation group with no operation is skipped
@@ -394,45 +424,47 @@ export class CodeModelBuilder {
                     codeModelClient.operationGroups.push(codeModelGroup);
                 }
             }
-            this.codeModel.clients.push(codeModelClient);
-            // postprocess for ServiceVersion
-            let apiVersionSameForAllClients = true;
-            let sharedApiVersions = undefined;
-            for (const client of this.codeModel.clients) {
-                const apiVersions = client.apiVersions;
-                if (!apiVersions) {
-                    // client does not have apiVersions
-                    apiVersionSameForAllClients = false;
-                }
-                else if (!sharedApiVersions) {
-                    // first client, set it to sharedApiVersions
-                    sharedApiVersions = apiVersions;
-                }
-                else {
-                    apiVersionSameForAllClients = isEqual(sharedApiVersions, apiVersions);
-                }
-                if (!apiVersionSameForAllClients) {
-                    break;
-                }
+        }
+        this.codeModel.clients.push(codeModelClient);
+        // postprocess for ServiceVersion
+        let apiVersionSameForAllClients = true;
+        let sharedApiVersions = undefined;
+        for (const client of this.codeModel.clients) {
+            const apiVersions = client.apiVersions;
+            if (!apiVersions) {
+                // client does not have apiVersions
+                apiVersionSameForAllClients = false;
             }
-            if (apiVersionSameForAllClients) {
-                const serviceVersion = getServiceVersion(this.codeModel);
-                for (const client of this.codeModel.clients) {
-                    client.serviceVersion = serviceVersion;
-                }
+            else if (!sharedApiVersions) {
+                // first client, set it to sharedApiVersions
+                sharedApiVersions = apiVersions;
             }
             else {
-                for (const client of this.codeModel.clients) {
-                    const apiVersions = client.apiVersions;
-                    if (apiVersions) {
-                        client.serviceVersion = getServiceVersion(client);
-                    }
+                apiVersionSameForAllClients = isEqual(sharedApiVersions, apiVersions);
+            }
+            if (!apiVersionSameForAllClients) {
+                break;
+            }
+        }
+        if (apiVersionSameForAllClients) {
+            const serviceVersion = getServiceVersion(this.codeModel);
+            for (const client of this.codeModel.clients) {
+                client.serviceVersion = serviceVersion;
+            }
+        }
+        else {
+            for (const client of this.codeModel.clients) {
+                const apiVersions = client.apiVersions;
+                if (apiVersions) {
+                    client.serviceVersion = getServiceVersion(client);
                 }
             }
         }
+        return codeModelClient;
     }
-    listSubClientsUnderClient(client, includeNestedOperationGroups, isRootClient) {
-        const operationGroups = [];
+    listSubClientsUnderClient(client, includeNestedSubClients) {
+        const isRootClient = !client.parent;
+        const subClients = [];
         for (const method of client.methods) {
             if (method.kind === "clientaccessor") {
                 const subClient = method.response;
@@ -441,15 +473,15 @@ export class CodeModelBuilder {
                     subClient.name =
                         removeClientSuffix(client.name) + removeClientSuffix(pascalCase(subClient.name));
                 }
-                operationGroups.push(subClient);
-                if (includeNestedOperationGroups) {
-                    for (const operationGroup of this.listSubClientsUnderClient(subClient, includeNestedOperationGroups, false)) {
-                        operationGroups.push(operationGroup);
+                subClients.push(subClient);
+                if (includeNestedSubClients) {
+                    for (const operationGroup of this.listSubClientsUnderClient(subClient, includeNestedSubClients)) {
+                        subClients.push(operationGroup);
                     }
                 }
             }
         }
-        return operationGroups;
+        return subClients;
     }
     listServiceMethodsUnderClient(client) {
         const methods = [];
@@ -578,6 +610,11 @@ export class CodeModelBuilder {
         clientContext.hostParameters.forEach((it) => codeModelOperation.addParameter(it));
         // path/query/header parameters
         for (const param of httpOperation.parameters) {
+            // TODO, switch to TCGC param.kind=="cookie"
+            if (param.__raw && isCookieParam(this.program, param.__raw)) {
+                // ignore cookie parameter
+                continue;
+            }
             // if it's paged operation with request body, skip content-type header added by TCGC, as next link call should not have content type header
             if ((sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") &&
                 httpOperation.bodyParam &&
@@ -625,6 +662,10 @@ export class CodeModelBuilder {
     }
     processRouteForPaged(op, responses, sdkMethod) {
         var _a, _b;
+        if (!this.isBranded()) {
+            // TODO: currently unbranded does not support paged operation
+            return;
+        }
         if (sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") {
             for (const response of responses) {
                 const bodyType = response.type;
@@ -664,7 +705,7 @@ export class CodeModelBuilder {
                     language: {
                         java: {
                             name: "OperationLocationPollingStrategy",
-                            namespace: this.getJavaNamespace(this.namespace) + ".implementation",
+                            namespace: this.baseJavaNamespace + ".implementation",
                         },
                     },
                 });
@@ -1076,7 +1117,7 @@ export class CodeModelBuilder {
                                     namespace: namespace,
                                 },
                                 java: {
-                                    namespace: this.getJavaNamespace(namespace),
+                                    namespace: this.getJavaNamespace(),
                                 },
                             },
                         }));
@@ -1251,6 +1292,11 @@ export class CodeModelBuilder {
             op.addException(response);
             if (response instanceof SchemaResponse) {
                 this.trackSchemaUsage(response.schema, { usage: [SchemaContext.Exception] });
+                if (trackConvenienceApi && !this.isBranded()) {
+                    this.trackSchemaUsage(response.schema, {
+                        usage: [op.internalApi ? SchemaContext.Internal : SchemaContext.Public],
+                    });
+                }
             }
         }
         else {
@@ -1316,7 +1362,9 @@ export class CodeModelBuilder {
                     }
             }
         }
-        throw new Error(`Unrecognized type: '${type.kind}'.`);
+        const errorMsg = `Unrecognized type: '${type.kind}'.`;
+        this.logError(errorMsg);
+        throw new Error(errorMsg);
     }
     processBuiltInType(type, nameHint) {
         nameHint = nameHint || type.kind;
@@ -1447,7 +1495,7 @@ export class CodeModelBuilder {
                     namespace: namespace,
                 },
                 java: {
-                    namespace: this.getJavaNamespace(namespace),
+                    namespace: this.getJavaNamespace(type),
                 },
             },
         });
@@ -1521,7 +1569,7 @@ export class CodeModelBuilder {
                     namespace: namespace,
                 },
                 java: {
-                    namespace: this.getJavaNamespace(namespace),
+                    namespace: this.getJavaNamespace(type),
                 },
             },
         });
@@ -1599,7 +1647,7 @@ export class CodeModelBuilder {
         if (type.kind === "Model") {
             const effective = getEffectiveModelType(program, type, isSchemaProperty);
             if (this.isArm() && ((_a = getNamespace(effective)) === null || _a === void 0 ? void 0 : _a.startsWith("Azure.ResourceManager"))) {
-                // Catalog is TrackedResource<CatalogProperties>
+                // e.g. typespec: Catalog is TrackedResource<CatalogProperties>
                 return type;
             }
             else if (effective.name) {
@@ -1662,7 +1710,7 @@ export class CodeModelBuilder {
     processUnionSchema(type, name) {
         var _a, _b;
         if (!(type.__raw && type.__raw.kind === "Union")) {
-            throw new Error(`Invalid type for union: '${type.kind}'.`);
+            this.logError(`Invalid type for union: '${type.kind}'.`);
         }
         const rawUnionType = type.__raw;
         const namespace = getNamespace(rawUnionType);
@@ -1685,7 +1733,7 @@ export class CodeModelBuilder {
                         namespace: namespace,
                     },
                     java: {
-                        namespace: this.getJavaNamespace(namespace),
+                        namespace: this.getJavaNamespace(),
                     },
                 },
             });
@@ -1708,7 +1756,8 @@ export class CodeModelBuilder {
     getUnionVariantName(type, option) {
         var _a, _b;
         if (type === undefined) {
-            throw new Error("type is undefined.");
+            this.logError("type is undefined.");
+            return "UnionVariant";
         }
         switch (type.kind) {
             case "Scalar": {
@@ -1765,29 +1814,34 @@ export class CodeModelBuilder {
             case "UnionVariant":
                 return (_b = (typeof type.name === "string" ? type.name : undefined)) !== null && _b !== void 0 ? _b : "UnionVariant";
             default:
-                throw new Error(`Unrecognized type for union variable: '${type.kind}'.`);
+                this.logError(`Unrecognized type for union variable: '${type.kind}'.`);
+                return "UnionVariant";
         }
     }
     processMultipartFormDataFilePropertySchema(property) {
-        var _a, _b, _c, _d;
+        var _a;
         const processSchemaFunc = (type) => this.processSchema(type, "");
+        const processNamespaceFunc = (type) => {
+            var _a;
+            const namespace = type.kind === "model" ? ((_a = getNamespace(type.__raw)) !== null && _a !== void 0 ? _a : this.namespace) : this.namespace;
+            const javaNamespace = type.kind === "model" ? this.getJavaNamespace(type) : this.getJavaNamespace();
+            return { namespace, javaNamespace };
+        };
         if (property.type.kind === "bytes" || property.type.kind === "model") {
-            const namespace = property.type.kind === "model"
-                ? ((_a = getNamespace(property.type.__raw)) !== null && _a !== void 0 ? _a : this.namespace)
-                : this.namespace;
-            return getFileDetailsSchema(property, (_b = getNamespace(property.type.__raw)) !== null && _b !== void 0 ? _b : this.namespace, namespace, this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc);
+            const namespaceTuple = processNamespaceFunc(property.type);
+            return getFileDetailsSchema(property, namespaceTuple.namespace, namespaceTuple.javaNamespace, this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc);
         }
         else if (property.type.kind === "array" &&
             (property.type.valueType.kind === "bytes" || property.type.valueType.kind === "model")) {
-            const namespace = property.type.valueType.kind === "model"
-                ? ((_c = getNamespace(property.type.valueType.__raw)) !== null && _c !== void 0 ? _c : this.namespace)
-                : this.namespace;
-            return new ArraySchema(property.name, (_d = property.doc) !== null && _d !== void 0 ? _d : "", getFileDetailsSchema(property, namespace, this.getJavaNamespace(namespace), this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc), {
+            const namespaceTuple = processNamespaceFunc(property.type.valueType);
+            return new ArraySchema(property.name, (_a = property.doc) !== null && _a !== void 0 ? _a : "", getFileDetailsSchema(property, namespaceTuple.namespace, namespaceTuple.javaNamespace, this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc), {
                 summary: property.summary,
             });
         }
         else {
-            throw new Error(`Invalid type for multipart form data: '${property.type.kind}'.`);
+            const errorMsg = `Invalid type for multipart form data: '${property.type.kind}'.`;
+            this.logError(errorMsg);
+            throw new Error(errorMsg);
         }
     }
     getDoc(target) {
@@ -1817,13 +1871,13 @@ export class CodeModelBuilder {
             return true;
         }
         else {
-            const visibility = target.__raw ? getVisibility(this.program, target.__raw) : undefined;
+            const visibility = target.kind === "property" ? target.visibility : undefined;
             if (visibility) {
-                return (!visibility.includes("write") &&
-                    !visibility.includes("create") &&
-                    !visibility.includes("update") &&
-                    !visibility.includes("delete") &&
-                    !visibility.includes("query"));
+                return (!visibility.includes(Visibility.All) &&
+                    !visibility.includes(Visibility.Create) &&
+                    !visibility.includes(Visibility.Update) &&
+                    !visibility.includes(Visibility.Delete) &&
+                    !visibility.includes(Visibility.Query));
             }
             else {
                 return false;
@@ -1871,20 +1925,58 @@ export class CodeModelBuilder {
             return undefined;
         }
     }
-    getJavaNamespace(namespace) {
-        const tspNamespace = this.namespace;
-        const baseJavaNamespace = this.emitterContext.options.namespace;
-        if (!namespace) {
-            return undefined;
+    getBaseJavaNamespace() {
+        // hack, just find the shortest clientNamespace among all clients
+        // hopefully it is the root namespace of the SDK
+        let baseJavaNamespace = undefined;
+        this.sdkContext.sdkPackage.clients
+            .map((it) => it.clientNamespace)
+            .forEach((it) => {
+            if (baseJavaNamespace === undefined || baseJavaNamespace.length > it.length) {
+                baseJavaNamespace = it;
+            }
+        });
+        // fallback if there is no client
+        if (!baseJavaNamespace) {
+            baseJavaNamespace = this.namespace;
+        }
+        return baseJavaNamespace.toLowerCase();
+    }
+    getJavaNamespace(type = undefined) {
+        // clientNamespace from TCGC
+        const clientNamespace = type === null || type === void 0 ? void 0 : type.clientNamespace;
+        if (this.isBranded() && type) {
+            // special handling for namespace of model that cannot be mapped to azure-core
+            if (type.crossLanguageDefinitionId === "TypeSpec.Http.File") {
+                // TypeSpec.Http.File
+                return this.baseJavaNamespace;
+            }
+            else if (type.crossLanguageDefinitionId === "Azure.Core.Foundations.OperationState") {
+                // Azure.Core.OperationState
+                return this.baseJavaNamespace;
+            }
+            else if (type.crossLanguageDefinitionId === "Azure.Core.ResourceOperationStatus" ||
+                type.crossLanguageDefinitionId === "Azure.Core.Foundations.OperationStatus") {
+                // Azure.Core.ResourceOperationStatus<>
+                // Azure.Core.Foundations.OperationStatus<>
+                // usually this model will not be generated, but javadoc of protocol method requires it be in SDK namespace
+                return this.baseJavaNamespace;
+            }
+            else if (type.crossLanguageDefinitionId.startsWith("Azure.ResourceManager.")) {
+                // models in Azure.ResourceManager
+                return this.baseJavaNamespace;
+            }
         }
-        else if (baseJavaNamespace &&
-            (namespace === tspNamespace || namespace.startsWith(tspNamespace + "."))) {
-            return baseJavaNamespace + namespace.slice(tspNamespace.length).toLowerCase();
+        if (this.legacyJavaNamespace || !clientNamespace) {
+            return this.baseJavaNamespace;
         }
         else {
-            return namespace.toLowerCase();
+            return clientNamespace.toLowerCase();
         }
     }
+    logError(msg) {
+        logError(this.program, msg);
+    }
     logWarning(msg) {
         if (this.loggingEnabled) {
             logWarning(this.program, msg);