[typespec-java] flatten typespec-java, cleanup autorest related code

.chronus/changes/add-typespec-java-2026-6-25-0-0-0.md

@@ -0,0 +1,8 @@
+---
+changeKind: internal
+packages:
+  - "@azure-tools/typespec-java"
+---
+
+[Java] Flatten the `typespec-java` emitter folder structure and clean up autorest.java-specific tooling.
+

.github/CODEOWNERS

@@ -7,3 +7,4 @@
 /docs/howtos/DataPlane*/ @lmazuel @m-nash @iscai-msft @srnagar @joheredi
 
 /packages/typespec-python @iscai-msft @msyyc @tadelesh @l0lawrence @ChenxiJiang333 @kashifkhan
+/packages/typespec-java @weidongxu-microsoft @haolingdong-msft @XiaofeiCao

.github/actions/setup-java/action.yml

@@ -0,0 +1,11 @@
+name: Setup Java
+description: Setup JDK and Maven for typespec-java package development and CI
+
+runs:
+  using: composite
+
+  steps:
+    - name: Setup mise
+      uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4.0.1
+      with:
+        install_args: "java maven"

.github/workflows/ci-java.yml

@@ -1,4 +1,4 @@
-name: "typespec-java / CI"
+name: "java / test e2e"
 
 on:
   pull_request:
@@ -8,35 +8,75 @@ on:
     paths:
       - "packages/typespec-java/**"
       - ".github/workflows/ci-java.yml"
+      - ".github/actions/setup-java/**"
   merge_group:
 
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    name: Build
+    name: "Build & Test"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
+
       - uses: ./.github/actions/setup
+
+      - uses: ./.github/actions/setup-java
+
       - name: Install dependencies
         run: pnpm install
-      - name: Build typespec-java package
+
+      # Build the emitter (build:generator builds emitter.jar from the core
+      # generator after applying core.patch; build:emitter copies sources + tsc)
+      # together with the peer packages it compiles against.
+      - name: Build
         run: pnpm turbo run --filter "@azure-tools/typespec-java..." build
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
+
+      - name: Test (emitter unit tests)
+        run: pnpm run test
+        working-directory: packages/typespec-java
+
+  e2e:
+    name: "Regen & Spector Tests"
     needs: build
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           submodules: recursive
+
       - uses: ./.github/actions/setup
+
+      - uses: ./.github/actions/setup-java
+
       - name: Install dependencies
         run: pnpm install
-      - name: Run linters
-        working-directory: packages/typespec-java
-        run: pnpm lint
+
+      # The emitter compiles against these peer packages; Generate.ps1 -> Setup.ps1
+      # -> Build-TypeSpec.ps1 runs `pnpm build` for the emitter, which needs them
+      # already built.
+      - name: Build dependencies
+        run: pnpm turbo run --filter "@azure-tools/typespec-java^..." build
+
+      # emitter-tests is a standalone npm+Maven project (not in the pnpm
+      # workspace). Generate.ps1 calls Setup.ps1 (builds the emitter + Azure jar,
+      # npm install) and regenerates the SDK from the spector specs into the
+      # gitignored src/main/java. Spector-Tests.ps1 then runs the JUnit tests
+      # against the Spector mock server.
+      - name: Regenerate
+        shell: pwsh
+        run: ./Generate.ps1
+        working-directory: packages/typespec-java/emitter-tests
+
+      - name: Spector tests
+        shell: pwsh
+        run: ./Spector-Tests.ps1
+        working-directory: packages/typespec-java/emitter-tests

.github/workflows/nightly-e2e.yml

@@ -55,6 +55,13 @@ jobs:
             working-directory: packages/typespec-ts
             run-prepare: false
             run-regenerate: false
+          - name: Java
+            lang: java
+            package-filter: "@azure-tools/typespec-java"
+            working-directory: packages/typespec-java/emitter-tests
+            mise-install-args: "java maven"
+            run-prepare: false
+            run-regenerate: true
 
     env:
       TYPESPEC_VS_CI_BUILD: true
@@ -155,6 +162,7 @@ jobs:
             "@azure-tools/typespec-azure-resource-manager",
             "@azure-tools/typespec-autorest",
             "@azure-tools/typespec-python",
+            "@azure-tools/typespec-java",
             "@azure-tools/typespec-ts"
           ];
           console.log("--- Dev versions (next tag on npm) ---");

.gitignore

@@ -227,8 +227,23 @@ packages/typespec-python/tests/generated/**
 packages/typespec-python/alpha
 
 # java emitter
-packages/typespec-java/src/typespec-extension/generator/**
-packages/typespec-java/src/typespec-extension/test
-packages/typespec-java/src/typespec-extension/src/*
-packages/typespec-java/src/typespec-extension/generator/**
-!packages/typespec-java/src/typespec-extension/options.ts
+# Emitter TS sources copied from core/packages/http-client-java/emitter at build
+# time (only src/options.ts is committed).
+packages/typespec-java/src/**
+!packages/typespec-java/src/options.ts
+packages/typespec-java/test/**
+# Java emitter.jar + assets staged from the core generator build.
+packages/typespec-java/generator/**
+# Packed tarball produced by Build-TypeSpec.ps1 (consumed by emitter-tests).
+packages/typespec-java/*.tgz
+
+# java emitter-tests (standalone Maven+npm spector suite)
+# Generated SDK + generated tests are regenerated, never committed; only
+# hand-written tests, specs, customization and the harness are tracked.
+packages/typespec-java/emitter-tests/src/main/**
+packages/typespec-java/emitter-tests/**/generated/**
+packages/typespec-java/emitter-tests/tsp-output/**
+packages/typespec-java/emitter-tests/specs/**
+packages/typespec-java/emitter-tests/node_modules/**
+packages/typespec-java/emitter-tests/package-lock.json
+packages/typespec-java/emitter-tests/tsp-spector-coverage-*.json

.prettierignore

@@ -101,3 +101,13 @@ packages/typespec-ts/test/integration/generated/
 packages/typespec-ts/test/azure-integration/generated/
 packages/typespec-ts/test/modular-integration/generated/
 packages/typespec-ts/test/azure-modular-integration/generated/
+
+# typespec-java emitter-tests is a standalone npm project (excluded from the pnpm
+# workspace) with its own .prettierrc.yaml that loads the typespec prettier plugin
+# from its own node_modules. Those aren't installed in the root format job, so root
+# prettier must not descend into it; the project formats itself via its own scripts.
+packages/typespec-java/emitter-tests/
+# Emitter TypeScript sources (except options.ts) are copied from core at build time.
+packages/typespec-java/src/**
+!packages/typespec-java/src/options.ts
+packages/typespec-java/test/

cspell.yaml

@@ -26,175 +26,92 @@ ignorePaths:
   - "*.lock.yml"
   # temp ignore typespec-ts while repo move is inflight
   - packages/typespec-ts/**
+  # typespec-java specs and hand-written tests are synced verbatim from
+  # core / autorest.java; don't spell-check upstream-sourced content.
+  - packages/typespec-java/emitter-tests/tsp/**
+  - packages/typespec-java/emitter-tests/src/**
+  # Developer/user docs ported verbatim from autorest.java's typespec-extension.
+  - packages/typespec-java/docs/**
 useGitignore: true
 enableFiletypes:
   - tsp
   - typespec
 words:
-  - AADDS
-  - adtest
-  - alexa
   - allof
   - apim
-  - appinsightsappid
   - apos
   - armcontoso
   - armId
-  - Arqs
-  - azcore
-  - azkeys
   - azsdk
-  - azsecrets
   - Bazs
-  - Bcff
-  - BNOT
   - byos
-  - byval
-  - centralus
-  - centraluseuap
   - chartjs
-  - Chenjie
-  - clazz
   - clsx
-  - Cmek
-  - commitish
   - contosobenchmark
   - contosowidgetmanager
-  - DALMATION
-  - dcont
-  - deduplicator
-  - devcenter
-  - Dhttp
-  - discriminatorenum
-  - Dlocal
-  - Dmaven
+  - Chenjie
   - DMSS
   - Donezo
-  - DskipTests
-  - Dspotless
-  - Dtrim
   - dynatrace
-  - Easm
-  - endpointlro
-  - ESRPRELPACMANTEST
   - espt
-  - euap
-  - exampleapptenantid
-  - exampleid
-  - farchived
   - fhir
   - foos
   - français
-  - Globa
-  - groupme
-  - GZRS
   - healthdataaiservices
   - horiz
   - Howtos
   - incentivizes
   - infile
-  - ipconfigurations
   - kvset
   - kwargs
   - liftr
   - LINUXNEXTVMIMAGE
   - LINUXOS
   - LINUXVMIMAGE
-  - llcinitial
-  - llcresi
-  - llcupdate
-  - LNOT
   - locationyaml
   - logz
   - LRO
   - lropaging
-  - lroparameterizedendpoints
   - Lucene
-  - luisappid
   - MACVMIMAGE
   - mgmt
-  - mkdirp
   - mobo
-  - msaappid
-  - msaapptenantid
   - msazure
   - msdata
-  - mycert
-  - mycompany
   - mylocation
-  - mysignalrservice
-  - ndash
-  - noflatten
-  - nonstringenum
-  - northcentralus
-  - notypedheadersmethods
   - nsps
   - nupkg
   - odata
-  - okhttp
-  - olcmtest
-  - olcmtestcontainer
   - Onco
   - oncophenotype
-  - Pageble
   - PAYG
-  - petstoreopgrp
   - popd
-  - println
   - prismjs
-  - propery
   - psscriptanalyzer
-  - Ptest
   - pushd
-  - pypi
   - pystac
   - pytest
   - qnas
-  - RAGRS
-  - RAGZRS
   - regionality
+  - responseasbool
   - reinjected
   - Reranker
-  - requiredfieldsascotrargstransformation
-  - requirexmsflattened
-  - responseasbool
   - rpaasoneboxacr
   - rpass
-  - Rscc
-  - Rscd
-  - Rsce
-  - Rscl
-  - Rsct
-  - sampleclientid
-  - scont
-  - Serv
   - SERVICERP
   - seti
-  - signalr
-  - Skus
-  - southcentralus
   - stac
   - strconv
-  - streamstyleserializationctorargs
-  - subid
-  - subscriptionidapiversion
-  - supportsnetworkacls
   - tcgc
-  - testcmk
-  - tofile
   - tsmv
-  - uknorth
-  - uksouth
-  - ukwest
   - userrp
   - vnet
-  - westcentralus
   - WINDOWSVMIMAGE
-  - Xcognitive
   - azcore
   - azkeys
   - azsecrets
   - byval
+  - devcenter
   - petstoreopgrp
   - pypi
   - Tsps

eng/pipelines/jobs/build-for-publish.yml

@@ -41,6 +41,30 @@ jobs:
           PackagePath: packages/typespec-python
           GeneratorName: "@azure-tools/typespec-python"
 
+      # Java e2e tests and spector coverage upload. The emitter-tests project is a
+      # standalone npm+Maven project (not in the pnpm workspace). Generate.ps1
+      # builds the emitter jar + tgz (Build-TypeSpec.ps1), npm installs it and
+      # regenerates the SDK from the spector specs; Spector-Tests.ps1 starts the
+      # mock server, runs the JUnit tests and produces tsp-spector-coverage-java.json.
+      - script: pnpm turbo run --filter "@azure-tools/typespec-java^..." build
+        displayName: "Build typespec-java dependencies"
+
+      - pwsh: ./Generate.ps1
+        displayName: "Regenerate Java test code"
+        workingDirectory: packages/typespec-java/emitter-tests
+        env:
+          JAVA_HOME: $(JAVA_HOME_11_X64)
+
+      - pwsh: ./Spector-Tests.ps1
+        displayName: "Run Java spector tests"
+        workingDirectory: packages/typespec-java/emitter-tests
+        env:
+          JAVA_HOME: $(JAVA_HOME_11_X64)
+
+      - template: /eng/pipelines/templates/upload-spector-coverage.yml
+        parameters:
+          PackagePath: packages/typespec-java/emitter-tests
+          GeneratorName: "@azure-tools/typespec-java"
       # TypeScript (typespec-ts) e2e tests and spector coverage upload.
       # The emitter was migrated here from Azure/autorest.typescript; this replaces
       # the coverage upload that previously ran in that (now deprecated) repo.