eng, migrate to tsp-spector (#2998)

Author: weidongxu-microsoft

.gitignore

@@ -84,10 +84,10 @@ javagen/*.yaml
 # vanilla
 /azure-dataplane-tests/src/main/java/module-info.java
 
-# Cadl output
+# tsp-spector output
 /typespec-tests/tsp-output/
-/typespec-tests/cadl-ranch-coverage.json
-/typespec-tests/cadl-ranch-coverage-java.json
+/typespec-tests/tsp-spector-coverage.json
+/typespec-tests/tsp-spector-coverage-java.json
 /typespec-tests/tsp-src/
 
 # Coverage report

core

@@ -87,8 +87,8 @@ jobs:
 #        displayName: 'Check no Diff'
 
       - script: |
-          node node_modules/\@azure-tools/cadl-ranch/dist/cli/cli.js serve node_modules/\@azure-tools/cadl-ranch-specs/http/ --coverageFile ./cadl-ranch-coverage-java.json &
-        displayName: 'Start Cadl Ranch Test Server'
+          npx --no-install tsp-spector server start ./node_modules/@typespec/http-specs/specs ./node_modules/@azure-tools/azure-http-specs/specs --coverageFile ./tsp-spector-coverage-java.json
+        displayName: 'Start Spector Test Server'
         workingDirectory: ./typespec-tests
 
       - task: Maven@3
@@ -104,8 +104,8 @@ jobs:
           publishJUnitResults: false
 
       - script: |
-          node node_modules/\@azure-tools/cadl-ranch/dist/cli/cli.js server stop
-        displayName: 'Stop Cadl Ranch Test Server'
+          npx --no-install tsp-spector server stop
+        displayName: 'Stop Spector Test Server'
         workingDirectory: ./typespec-tests
 
       - template: /eng/pipelines/steps/cleanup-maven-local-cache.yml

eng/pipelines/ci-typespec-java-dev-nightly.yaml

@@ -79,8 +79,8 @@ jobs:
           publishJUnitResults: false
 
       - script: |
-          node node_modules/\@azure-tools/cadl-ranch/dist/cli/cli.js serve node_modules/\@azure-tools/cadl-ranch-specs/http/ --coverageFile ./cadl-ranch-coverage-java.json &
-        displayName: 'Start Cadl Ranch Test Server'
+          npx --no-install tsp-spector server start ./node_modules/@typespec/http-specs/specs ./node_modules/@azure-tools/azure-http-specs/specs --coverageFile ./tsp-spector-coverage-java.json
+        displayName: 'Start Spector Test Server'
         workingDirectory: ./typespec-tests
 
       - task: Maven@3
@@ -96,27 +96,22 @@ jobs:
           publishJUnitResults: false
 
       - script: |
-          node node_modules/\@azure-tools/cadl-ranch/dist/cli/cli.js server stop
-        displayName: 'Stop Cadl Ranch Test Server'
+          npx --no-install tsp-spector server stop
+        displayName: 'Stop Spector Test Server'
         workingDirectory: ./typespec-tests
 
-      - script: |
-          node node_modules/\@azure-tools/cadl-ranch/dist/cli/cli.js check-coverage node_modules/@azure-tools/cadl-ranch-specs/http --coverageFiles ./cadl-ranch-coverage-java.json
-        displayName: 'Cadl Ranch Coverage Report'
-        workingDirectory: ./typespec-tests
-        continueOnError: true
-
-      - publish: $(Build.SourcesDirectory)/typespec-tests/cadl-ranch-coverage-java.json
+      - publish: $(Build.SourcesDirectory)/typespec-tests/tsp-spector-coverage-java.json
         artifact: CoverageReport
-        displayName: 'Publish Cadl Ranch Coverage Report'
+        displayName: 'Publish Spector Coverage Report'
 
       - task: AzureCLI@2
-        displayName: 'Upload to Cadl Ranch Coverage Report Dashboard'
+        displayName: 'Upload to Spector Coverage Report Dashboard'
         condition: eq(variables.isMain, 'true')
         inputs:
-          azureSubscription: "Cadl Ranch Storage"
+          azureSubscription: "TypeSpec Storage"
           scriptType: "bash"
           scriptLocation: "inlineScript"
-          inlineScript: node $(Build.SourcesDirectory)/typespec-tests/node_modules/\@azure-tools/cadl-ranch/dist/cli/cli.js upload-coverage --coverageFile $(Build.SourcesDirectory)/typespec-tests/cadl-ranch-coverage-java.json --generatorName java --storageAccountName azuresdkcadlranch --generatorMode azure --generatorVersion $(node -p -e "require('./typespec-extension/package.json').version")
+          inlineScript: npx --no-install tsp-spector upload-coverage --coverageFile ./tsp-spector-coverage-java.json --generatorName "@azure-tools/typespec-java" --storageAccountName typespec --containerName coverages --generatorMode azure --generatorVersion $(node -p -e "require('../typespec-extension/package.json').version")
+          workingDirectory: ./typespec-tests
 
       - template: /eng/pipelines/steps/cleanup-maven-local-cache.yml

eng/pipelines/ci-typespec-java.yaml

@@ -90,7 +90,7 @@ $generateScript = {
   }
 
   $tspTrace = "--trace import-resolution --trace projection --trace typespec-java"
-  $tspCommand = "npx tsp compile $tspFile $tspOptions $tspTrace"
+  $tspCommand = "npx --no-install tsp compile $tspFile $tspOptions $tspTrace"
 
   $timer = [Diagnostics.Stopwatch]::StartNew()
   $generateOutput = Invoke-Expression $tspCommand
@@ -136,28 +136,29 @@ if (Test-Path ./tsp-output) {
   Remove-Item ./tsp-output -Recurse -Force
 }
 
-# run other local tests except partial update
+# generate for other local test sources except partial update
 $job = Get-Item ./tsp/* -Filter "*.tsp" -Exclude "*partialupdate*" | ForEach-Object -Parallel $generateScript -ThrottleLimit $Parallelization -AsJob
 
 $job | Wait-Job -Timeout 600
 $job | Receive-Job
 
 # partial update test
-npx tsp compile ./tsp/partialupdate.tsp --option="@azure-tools/typespec-java.emitter-output-dir={project-root}/existingcode"
+npx --no-install tsp compile ./tsp/partialupdate.tsp --option="@azure-tools/typespec-java.emitter-output-dir={project-root}/existingcode"
 Copy-Item -Path ./existingcode/src/main/java/tsptest/partialupdate -Destination ./src/main/java/tsptest/partialupdate -Recurse -Force
 Remove-Item ./existingcode -Recurse -Force
 
-# run cadl ranch tests sources
-Copy-Item -Path node_modules/@azure-tools/cadl-ranch-specs/http -Destination ./ -Recurse -Force
+# generate for http-specs/azure-http-specs test sources
+Copy-Item -Path node_modules/@typespec/http-specs/specs -Destination ./ -Recurse -Force
+Copy-Item -Path node_modules/@azure-tools/azure-http-specs/specs -Destination ./ -Recurse -Force
 # remove xml tests, emitter has not supported xml model
-Remove-Item ./http/payload/xml -Recurse -Force
+Remove-Item ./specs/payload/xml -Recurse -Force
 
-$job = (Get-ChildItem ./http -Include "main.tsp","old.tsp" -File -Recurse) | ForEach-Object -Parallel $generateScript -ThrottleLimit $Parallelization -AsJob
+$job = (Get-ChildItem ./specs -Include "main.tsp","old.tsp" -File -Recurse) | ForEach-Object -Parallel $generateScript -ThrottleLimit $Parallelization -AsJob
 
 $job | Wait-Job -Timeout 1200
 $job | Receive-Job
 
-Remove-Item ./http -Recurse -Force
+Remove-Item ./specs -Recurse -Force
 
 Copy-Item -Path ./tsp-output/*/src -Destination ./ -Recurse -Force -Exclude @("ReadmeSamples.java", "module-info.java")
 

package-lock.json

@@ -6,10 +6,11 @@
     "format": "npm run -s prettier -- --write",
     "check-format": "npm run prettier -- --check",
     "prettier": "prettier --config ./.prettierrc.yaml **/*.tsp",
-    "testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
+    "spector-serve": "tsp-spector serve ./node_modules/@typespec/http-specs/specs ./node_modules/@azure-tools/azure-http-specs/specs --coverageFile ./tsp-spector-coverage-java.json"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.39.5",
+    "@typespec/http-specs": "0.1.0-alpha.5",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.4",
     "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.27.0.tgz"
   },
   "devDependencies": {

typespec-tests/Generate.ps1

@@ -105,8 +105,6 @@
           </excludePackageNames>
           <sourceFileExcludes>
             <sourceFileExclude>module-info.java</sourceFileExclude>
-            <!-- Java 11 seems having a bug on line starting with @, in @code tag -->
-            <sourceFileExclude>com/cadl/naming/NamingAsyncClient.java</sourceFileExclude>
           </sourceFileExcludes>
           <failOnError>true</failOnError>
           <failOnWarnings>true</failOnWarnings>

typespec-tests/package.json

@@ -24,9 +24,9 @@ The existing code is already in sync. Run this if you have changed the code of T
 
 ## Run Test
 
-Start Cadl-Ranch
+Start tsp-spector Test Server
 
-`npm run testserver-run`
+`npm run spector-serve`
 
 Then, run the tests in `typespec-tests` module as usual Java Tests.
 

typespec-tests/pom.xml

@@ -80,7 +80,7 @@ Mono<Response<BinaryData>> operationWithResponse(String name, RequestOptions req
     }
 
     /**
-     * Expected query parameter: kind= "real"
+     * Expected query parameter: kind="real"
      * Expected response body:
      * ```json
      * {
@@ -147,7 +147,7 @@ Mono<OuterModel> operation(String name) {
     }
 
     /**
-     * Expected query parameter: kind= "real"
+     * Expected query parameter: kind="real"
      * Expected response body:
      * ```json
      * {