http-client-java, do not generate model under models sub package, for unbranded (microsoft#5269)

also bump TCGC

output

![image](https://github.com/user-attachments/assets/72071b8c-a412-4c36-b993-931f4fe06394)

Author: weidongxu-microsoft

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/plugin/JavaSettings.java

@@ -108,7 +108,10 @@ public static JavaSettings getInstance() {
                 logger.debug("List of require : {}", autorestSettings.getRequire());
             }
 
-            String fluent = getStringValue(host, "fluent");
+            final String fluent = getStringValue(host, "fluent");
+
+            final String flavor = getStringValue(host, "flavor", "azure");
+            final String defaultModelsSubPackageName = isBranded(flavor) ? "models" : "";
 
             setHeader(getStringValue(host, "license-header"));
             instance = new JavaSettings(autorestSettings,
@@ -120,8 +123,8 @@ public static JavaSettings getInstance() {
                 getBooleanValue(host, "generate-client-interfaces", false),
                 getBooleanValue(host, "generate-client-as-impl", false),
                 getStringValue(host, "implementation-subpackage", "implementation"),
-                getStringValue(host, "models-subpackage", "models"), getStringValue(host, "custom-types", ""),
-                getStringValue(host, "custom-types-subpackage", ""),
+                getStringValue(host, "models-subpackage", defaultModelsSubPackageName),
+                getStringValue(host, "custom-types", ""), getStringValue(host, "custom-types-subpackage", ""),
                 getStringValue(host, "fluent-subpackage", "fluent"),
                 getBooleanValue(host, "required-parameter-client-methods", false),
                 getBooleanValue(host, "generate-sync-async-clients", false),
@@ -163,7 +166,7 @@ public static JavaSettings getInstance() {
                 getBooleanValue(host, "disable-required-property-annotation", false),
                 getBooleanValue(host, "enable-page-size", false), getBooleanValue(host, "use-key-credential", false),
                 getBooleanValue(host, "null-byte-array-maps-to-empty-array", false),
-                getBooleanValue(host, "graal-vm-config", false), getStringValue(host, "flavor", "Azure"),
+                getBooleanValue(host, "graal-vm-config", false), flavor,
                 getBooleanValue(host, "disable-typed-headers-methods", false),
                 getBooleanValue(host, "share-jsonserializable-code", false),
                 getBooleanValue(host, "use-object-for-unknown", false), getBooleanValue(host, "android", false));
@@ -402,7 +405,11 @@ private JavaSettings(AutorestSettings autorestSettings, Map<String, Object> mode
      * @return Whether to generate with Azure branding.
      */
     public boolean isBranded() {
-        return "azure".equalsIgnoreCase(this.flavor);
+        return isBranded(this.flavor);
+    }
+
+    private static boolean isBranded(String flavor) {
+        return "azure".equalsIgnoreCase(flavor);
     }
 
     private final String keyCredentialHeaderName;

packages/http-client-java/generator/http-client-generator-test/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.39.4",
-    "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.2.tgz",
+    "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.3.tgz",
     "@typespec/http-client-java-tests": "file:"
   },
   "overrides": {
@@ -24,7 +24,7 @@
     "@typespec/openapi": "~0.62.0",
     "@typespec/xml": "~0.62.0",
     "@azure-tools/typespec-azure-core": "~0.48.0",
-    "@azure-tools/typespec-client-generator-core": "~0.48.3",
+    "@azure-tools/typespec-client-generator-core": "~0.48.4",
     "@azure-tools/typespec-azure-resource-manager": "~0.48.0",
     "@azure-tools/typespec-autorest": "~0.48.0"
   },

packages/http-client-java/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-java",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -44,7 +44,7 @@
   "peerDependencies": {
     "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0",
     "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.48.3 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.48.4 <1.0.0",
     "@typespec/compiler": ">=0.62.0 <1.0.0",
     "@typespec/http": ">=0.62.0 <1.0.0",
     "@typespec/openapi": ">=0.62.0 <1.0.0",
@@ -63,7 +63,7 @@
     "@azure-tools/typespec-azure-core": "0.48.0",
     "@azure-tools/typespec-azure-resource-manager": "0.48.0",
     "@azure-tools/typespec-azure-rulesets": "0.48.0",
-    "@azure-tools/typespec-client-generator-core": "0.48.3",
+    "@azure-tools/typespec-client-generator-core": "0.48.4",
     "@microsoft/api-extractor": "^7.47.11",
     "@microsoft/api-extractor-model": "^7.29.8",
     "@types/js-yaml": "~4.0.9",