Skip to content

http-client-java, generate mock Long number for BigDecimal #5433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 3, 2025
Merged

http-client-java, generate mock Long number for BigDecimal #5433

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44dc982
generate long for BigDecimal
weidongxu-microsoft Dec 24, 2024
1c22dea
break string, if too long
weidongxu-microsoft Dec 24, 2024
23b3694
Remove redundant String.join statement
weidongxu-microsoft Jan 3, 2025
7fa13d6
skip the test case when constant string too long
weidongxu-microsoft Jan 3, 2025
6281599
Merge branch 'main' into http-client-java_fix-mock-test
weidongxu-microsoft Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion ...in/java/com/microsoft/typespec/http/client/generator/core/template/ModelTestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ public static ModelTestTemplate getInstance() {
@Override
public void write(ClientModel model, JavaFile javaFile) {

// TODO: there is still possible "code too large" error
// example: https://github.com/Azure/azure-rest-api-specs/tree/main/specification/logic/resource-manager

final boolean immutableOutputModel = JavaSettings.getInstance().isOutputModelImmutable()
&& model.getImplementationDetails() != null
&& !model.getImplementationDetails().isInput();
Expand Down Expand Up @@ -66,7 +69,7 @@ public void write(ClientModel model, JavaFile javaFile) {
classBlock.annotation("org.junit.jupiter.api.Test");
classBlock.publicMethod("void testDeserialize() throws Exception", methodBlock -> {
methodBlock.line(String.format("%1$s model = BinaryData.fromString(%2$s).toObject(%1$s.class);",
model.getName(), ClassType.STRING.defaultValueExpression(jsonStr)));
model.getName(), getJavaStringExpression(jsonStr)));
writer.writeAssertion(methodBlock);
});

Expand All @@ -88,4 +91,25 @@ public void write(ClientModel model, JavaFile javaFile) {
}
});
}

private static String getJavaStringExpression(String jsonStr) {
// 2^16, but half the size, for there maybe lots of `\"` in JSON
final int maxConstantStringLength = 65536 / 2;
if (jsonStr.length() < maxConstantStringLength) {
return ClassType.STRING.defaultValueExpression(jsonStr);
} else {
// avoid "constant string too long"
StringBuilder sb = new StringBuilder("String.join(\"\"");
String remains = jsonStr;
String.join("", "", "");
while (remains.length() >= maxConstantStringLength) {
String current = remains.substring(0, maxConstantStringLength - 1);
remains = remains.substring(maxConstantStringLength - 1);

sb.append(", ").append(ClassType.STRING.defaultValueExpression(current));
}
sb.append(")");
return sb.toString();
}
}
}
2 changes: 2 additions & 0 deletions ...c/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelTestCaseUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ public static Object jsonFromType(int depth, IType type) {
return RANDOM.nextInt() & Integer.MAX_VALUE;
} else if (type.asNullable() == ClassType.LONG) {
return RANDOM.nextLong() & Long.MAX_VALUE;
} else if (type.asNullable() == ClassType.BIG_DECIMAL) {
return RANDOM.nextLong() & Long.MAX_VALUE;
} else if (type.asNullable() == ClassType.FLOAT) {
return RANDOM.nextFloat() * 100;
} else if (type.asNullable() == ClassType.DOUBLE) {
Expand Down
Loading