Skip to content

Commit 84ebce0

Browse files
http-client-java, prepare release 0.1.6 (microsoft#5592)
Use code="invalid-runtime-dependency" if cannot find JDK or Maven, as this is what .NET plan to use (it could change). ![image](https://github.com/user-attachments/assets/fb29e758-310d-4de5-89ce-f15e4321b164)
1 parent 74ec773 commit 84ebce0

File tree

7 files changed

+70
-64
lines changed

7 files changed

+70
-64
lines changed

packages/http-client-java/emitter/src/emitter.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ import { fileURLToPath } from "url";
1212
import { CodeModelBuilder } from "./code-model-builder.js";
1313
import { CodeModel } from "./common/code-model.js";
1414
import { logError, spawnAsync, SpawnError } from "./utils.js";
15-
import { JDK_NOT_FOUND_MESSAGE, validateDependencies } from "./validate.js";
15+
import {
16+
CODE_RUNTIME_DEPENDENCY,
17+
JDK_NOT_FOUND_MESSAGE,
18+
validateDependencies,
19+
} from "./validate.js";
1620

1721
export interface EmitterOptions {
1822
namespace?: string;
@@ -193,7 +197,7 @@ export async function $onEmit(context: EmitContext<EmitterOptions>) {
193197
program.trace("http-client-java", `Code generation log: ${result.stdout}`);
194198
} catch (error: any) {
195199
if (error && "code" in error && error["code"] === "ENOENT") {
196-
logError(program, JDK_NOT_FOUND_MESSAGE);
200+
logError(program, JDK_NOT_FOUND_MESSAGE, CODE_RUNTIME_DEPENDENCY);
197201
} else {
198202
logError(
199203
program,

packages/http-client-java/emitter/src/utils.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { NoTarget, Program, Type } from "@typespec/compiler";
22
import { spawn, SpawnOptions } from "child_process";
33

4-
export function logError(program: Program, msg: string) {
4+
export function logError(program: Program, msg: string, code: string = "http-client-java") {
55
program.reportDiagnostic({
6-
code: "http-client-java",
6+
code: code,
77
severity: "error",
88
message: msg,
99
target: NoTarget,
1010
});
1111
}
1212

13-
export function logWarning(program: Program, msg: string) {
13+
export function logWarning(program: Program, msg: string, code: string = "http-client-java") {
1414
program.reportDiagnostic({
15-
code: "http-client-java",
15+
code: code,
1616
severity: "warning",
1717
message: msg,
1818
target: NoTarget,

packages/http-client-java/emitter/src/validate.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { logError, spawnAsync, trace } from "./utils.js";
33

44
export const JDK_NOT_FOUND_MESSAGE =
55
"Java Development Kit (JDK) is not found in PATH. Please install JDK 17 or above. Microsoft Build of OpenJDK can be downloaded from https://learn.microsoft.com/java/openjdk/download";
6+
export const CODE_RUNTIME_DEPENDENCY = "invalid-runtime-dependency";
67

78
export async function validateDependencies(
89
program: Program | undefined,
@@ -24,7 +25,7 @@ export async function validateDependencies(
2425
// // eslint-disable-next-line no-console
2526
// console.log("[ERROR] " + message);
2627
if (program && logDiagnostic) {
27-
logError(program, message);
28+
logError(program, message, CODE_RUNTIME_DEPENDENCY);
2829
}
2930
}
3031
}
@@ -36,7 +37,7 @@ export async function validateDependencies(
3637
// // eslint-disable-next-line no-console
3738
// console.log("[ERROR] " + message);
3839
if (program && logDiagnostic) {
39-
logError(program, message);
40+
logError(program, message, CODE_RUNTIME_DEPENDENCY);
4041
}
4142
}
4243

@@ -60,7 +61,7 @@ export async function validateDependencies(
6061
// // eslint-disable-next-line no-console
6162
// console.log("[ERROR] " + message);
6263
if (program && logDiagnostic) {
63-
logError(program, message);
64+
logError(program, message, CODE_RUNTIME_DEPENDENCY);
6465
}
6566
}
6667
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"dependencies": {
1515
"@typespec/http-specs": "0.1.0-alpha.5",
16-
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.1.5.tgz",
16+
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.1.6.tgz",
1717
"@typespec/http-client-java-tests": "file:"
1818
},
1919
"overrides": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"@typespec/http-specs": "0.1.0-alpha.5",
1616
"@azure-tools/azure-http-specs": "0.1.0-alpha.4",
17-
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.1.5.tgz",
17+
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.1.6.tgz",
1818
"@typespec/http-client-java-tests": "file:"
1919
},
2020
"overrides": {

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

+47-46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/http-client-java/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typespec/http-client-java",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
55
"keywords": [
66
"TypeSpec"
@@ -65,21 +65,21 @@
6565
"@azure-tools/typespec-azure-rulesets": "0.49.0",
6666
"@azure-tools/typespec-client-generator-core": "0.49.1",
6767
"@typespec/spector": "0.1.0-alpha.5",
68-
"@microsoft/api-extractor": "^7.48.0",
69-
"@microsoft/api-extractor-model": "^7.30.0",
68+
"@microsoft/api-extractor": "^7.49.1",
69+
"@microsoft/api-extractor-model": "^7.30.2",
7070
"@types/js-yaml": "~4.0.9",
71-
"@types/lodash": "~4.17.13",
72-
"@types/node": "~22.10.1",
71+
"@types/lodash": "~4.17.14",
72+
"@types/node": "~22.10.6",
7373
"@typespec/compiler": "0.63.0",
7474
"@typespec/http": "0.63.0",
7575
"@typespec/openapi": "0.63.0",
76-
"@typespec/rest": "0.63.0",
76+
"@typespec/rest": "0.63.1",
7777
"@typespec/versioning": "0.63.0",
7878
"@vitest/coverage-v8": "^2.1.8",
7979
"@vitest/ui": "^2.1.8",
8080
"c8": "~10.1.3",
8181
"rimraf": "~6.0.1",
82-
"typescript": "~5.7.2",
82+
"typescript": "~5.7.3",
8383
"vitest": "^2.1.8"
8484
}
8585
}

0 commit comments

Comments
 (0)