@autorest/java 4.1.35 → 4.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/java",
-  "version": "4.1.35",
+  "version": "4.1.36",
   "description": "The Java extension for classic generators in AutoRest.",
   "scripts": {
     "autorest": "autorest",
@@ -30,7 +30,6 @@
   "files": [
     "*/package.json",
     "/readme.md",
-    "/androidgen/*.md",
     "/fluentgen/*.md",
     "/fluentnamer/*.md",
     "/javagen/*.md",
@@ -40,6 +39,6 @@
   ],
   "devDependencies": {
     "autorest": "^3.7.1",
-    "@microsoft.azure/autorest.testserver": "3.3.49"
+    "@microsoft.azure/autorest.testserver": "3.3.50"
   }
 }

package/readme.md

@@ -325,7 +325,7 @@ use: $(this-folder)/fluentgen
 ```
 
 ```  yaml $(java) && $(android)
-use: $(this-folder)/androidgen
+use: $(this-folder)/javagen
 ```
 
 #### Help

package/typespec-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.18.3",
+  "version": "0.20.1",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -45,17 +45,17 @@
     "target/emitter.jar"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.44.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.44.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.44.1 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.44.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.44.3 <1.0.0",
-    "@typespec/compiler": ">=0.58.0 <1.0.0",
-    "@typespec/http": ">=0.58.0 <1.0.0",
-    "@typespec/openapi": ">=0.58.0 <1.0.0",
-    "@typespec/rest": ">=0.58.0 <1.0.0",
-    "@typespec/versioning": ">=0.58.0 <1.0.0",
-    "@typespec/xml": ">=0.58.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.45.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.45.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.45.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.45.4 <1.0.0",
+    "@typespec/compiler": ">=0.59.0 <1.0.0",
+    "@typespec/http": ">=0.59.0 <1.0.0",
+    "@typespec/openapi": ">=0.59.0 <1.0.0",
+    "@typespec/rest": ">=0.59.0 <1.0.0",
+    "@typespec/versioning": ">=0.59.0 <1.0.0",
+    "@typespec/xml": ">=0.59.0 <1.0.0"
   },
   "dependencies": {
     "@autorest/codemodel": "~4.20.0",
@@ -63,29 +63,29 @@
     "lodash": "~4.17.21"
   },
   "devDependencies": {
-    "@azure-tools/typespec-azure-core": "0.44.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.44.0",
-    "@azure-tools/typespec-autorest": "0.44.1",
-    "@azure-tools/typespec-azure-rulesets": "0.44.0",
-    "@azure-tools/typespec-client-generator-core": "0.44.3",
+    "@azure-tools/typespec-azure-core": "0.45.0",
+    "@azure-tools/typespec-azure-resource-manager": "0.45.0",
+    "@azure-tools/typespec-autorest": "0.45.0",
+    "@azure-tools/typespec-azure-rulesets": "0.45.0",
+    "@azure-tools/typespec-client-generator-core": "0.45.4",
     "@types/js-yaml": "~4.0.9",
     "@types/lodash": "~4.17.7",
     "@types/mocha": "~10.0.7",
-    "@types/node": "~20.14.11",
-    "@typescript-eslint/eslint-plugin": "~7.16.1",
-    "@typescript-eslint/parser": "~7.16.1",
-    "@typespec/compiler": "0.58.0",
-    "@typespec/http": "0.58.0",
-    "@typespec/openapi": "0.58.0",
-    "@typespec/rest": "0.58.0",
-    "@typespec/versioning": "0.58.0",
-    "@typespec/xml": "0.58.0",
+    "@types/node": "~22.5.1",
+    "@typescript-eslint/eslint-plugin": "~8.3.0",
+    "@typescript-eslint/parser": "~8.3.0",
+    "@typespec/compiler": "0.59.1",
+    "@typespec/http": "0.59.1",
+    "@typespec/openapi": "0.59.0",
+    "@typespec/rest": "0.59.1",
+    "@typespec/versioning": "0.59.0",
+    "@typespec/xml": "0.59.0",
     "c8": "~10.1.2",
     "eslint": "~8.57.0",
     "eslint-plugin-deprecation": "~3.0.0",
-    "mocha": "~10.6.0",
+    "mocha": "~10.7.3",
     "prettier": "~3.3.3",
     "rimraf": "~6.0.1",
-    "typescript": "~5.5.3"
+    "typescript": "~5.5.4"
   }
 }

package/typespec-tests/package.json

@@ -9,25 +9,26 @@
     "testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.34.10",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.18.3.tgz"
+    "@azure-tools/cadl-ranch-specs": "0.36.1",
+    "@azure-tools/cadl-ranch-expect": "0.15.1",
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.20.1.tgz"
   },
   "devDependencies": {
-    "@typespec/prettier-plugin-typespec": "~0.58.0",
+    "@typespec/prettier-plugin-typespec": "~0.59.0",
     "prettier-plugin-organize-imports": "4.0.0",
     "prettier": "~3.3.3"
   },
   "overrides": {
-    "@typespec/compiler": ">=0.58.0 <1.0.0",
-    "@typespec/http": ">=0.58.0 <1.0.0",
-    "@typespec/rest": ">=0.58.0 <1.0.0",
-    "@typespec/versioning": ">=0.58.0 <1.0.0",
-    "@typespec/openapi": ">=0.58.0 <1.0.0",
-    "@typespec/xml": ">=0.58.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.44.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.44.2 < 1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.44.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.44.1 <1.0.0"
+    "@typespec/compiler": "~0.59.0",
+    "@typespec/http": "~0.59.0",
+    "@typespec/rest": "~0.59.0",
+    "@typespec/versioning": "~0.59.0",
+    "@typespec/openapi": "~0.59.0",
+    "@typespec/xml": "~0.59.0",
+    "@azure-tools/typespec-azure-core": "~0.45.0",
+    "@azure-tools/typespec-client-generator-core": "~0.45.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.45.0",
+    "@azure-tools/typespec-autorest": "~0.45.0"
   },
   "private": true
 }

package/androidgen/README.md

@@ -1,74 +0,0 @@
-#### Androidgen
-
-``` yaml
-pass-thru:
-  - model-deduplicator
-  - subset-reducer
-
-use-extension:
-  "@autorest/modelerfour": "4.26.2"
-
-pipeline:
-
-# --- extension remodeler ---
-
-  # "Shake the tree", and normalize the model
-  modelerfour:
-    input: openapi-document/multi-api/identity     # the plugin where we get inputs from
-
-  # allow developer to do transformations on the code model.
-  modelerfour/new-transform:
-    input: modelerfour
-
-  androidgen:
-    scope: android
-    input: modelerfour/identity
-    output-artifact: java-files
-  
-  androidgen/emitter:
-    input: androidgen
-    scope: scope-androidgen/emitter
-
-scope-androidgen/emitter:
-    input-artifact: java-files
-    output-uri-expr: $key
-
-output-artifact: java-files
-
-modelerfour:
-  seal-single-value-enum-by-default: true
-
-  skip-special-headers:
-    - Repeatability-Request-ID
-    - Repeatability-First-Sent
-```
-
-```yaml !$(data-plane)
-modelerfour:
-  flatten-models: true
-  flatten-payloads: true
-  group-parameters: true
-```
-
-```yaml $(data-plane)
-modelerfour:
-  flatten-models: false
-  flatten-payloads: false
-  group-parameters: false
-
-  lenient-model-deduplication: true
-
-  naming:
-    choiceValue: upper
-    preserve-uppercase-max-length: 2
-    override:
-      ip: Ip
-      id: Id
-
-require:
-  - $(this-folder)data-plane.md
-```
-
-```yaml $(data-plane) && $(sdk-integration)
-regenerate-pom: true
-```

package/androidgen/data-plane.md

@@ -1,23 +0,0 @@
-#### data-plane
-
-```yaml
-azure-arm: false
-
-license-header: MICROSOFT_MIT_SMALL
-
-generate-client-interfaces: false
-generate-client-as-impl: true
-generate-sync-async-clients: true
-generate-builder-per-client: true
-sync-methods: all
-enable-sync-stack: true
-required-fields-as-ctor-args: true
-enable-page-size: true
-use-key-credential: true
-
-use-default-http-status-code-to-exception-type-mapping: true
-polling: {}
-
-models-subpackage: implementation.models
-client-logger: true
-```

package/androidgen/package.json

@@ -1,27 +0,0 @@
-{
-  "name": "@autorest/java.android",
-  "version": "4.0.0",
-  "description": "The Android extension for classic generators in AutoRest.",
-  "scripts": {
-    "autorest": "autorest",
-    "start": "java -jar target/azure-autorest-androidgen-jar-with-dependencies.jar",
-    "debug": "java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-androidgen-jar-with-dependencies.jar",
-    "build": "mvn package -Dlocal"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Azure/autorest.java"
-  },
-  "readme": "./readme.md",
-  "keywords": [
-    "autorest",
-    "java",
-    "android"
-  ],
-  "author": "Microsoft Corporation",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Azure/autorest/issues"
-  },
-  "homepage": "https://github.com/Azure/autorest.java/blob/main/README.md"
-}