davsclaus commented on code in PR #28777:
URL: https://github.com/apache/camel/pull/28777#discussion_r4433115803
##########
dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeRestGenerator.java:
##########
@@ -143,17 +147,42 @@ public Integer doCall() throws Exception {
}
}
if (generateDataObjects) {
- generateDto();
+ Path packageDir = packageDirectory();
+ try {
+ generateDto(packageDir);
+ } catch (IOException e) {
+ printer().printErr("Failed to write the generated DTOs to " +
packageDir, e);
+ return CliExitCode.FAILURE;
+ }
}
return 0;
}
- private void generateDto() throws IOException {
+ /**
+ * The directory of the package of the DTOs, in the working directory.
+ */
+ Path packageDirectory() {
+ return Paths.get(packageName.replace('.', File.separatorChar));
+ }
+
+ // the generator writes into a temporary directory, from which the DTOs
are copied into the directory of their package
+ private void generateDto(Path packageDir) throws IOException {
final String code = "code";
final String generatorName = RuntimeType.quarkus.equals(runtime) ?
"jaxrs-spec" : "java-camel";
final String library = RuntimeType.quarkus.equals(runtime) ? "quarkus"
: "spring-boot";
File output = Files.createTempDirectory("gendto").toFile();
+ try {
+ generateDto(code, generatorName, library, output);
+ Path generated =
output.toPath().resolve(code).resolve(packageName.replace('.',
File.separatorChar));
+ if (Files.isDirectory(generated)) {
+ copyDirectory(generated, packageDir);
+ }
Review Comment:
Done in b01f20aa4db7: when the generator writes no DTOs (a specification
without schemas), the command prints `WARN: No DTOs were generated: the
specification <input> has no schemas` and still exits with 0. Test:
`warnsWhenTheSpecificationHasNoSchemas`.
_Claude Code on behalf of davsclaus (Claus Ibsen)_
##########
dsl/camel-jbang/camel-jbang-plugin-generate/src/test/java/org/apache/camel/dsl/jbang/core/commands/generate/CodeRestGeneratorTest.java:
##########
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dsl.jbang.core.commands.generate;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.dsl.jbang.run.common.StringPrinter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import picocli.CommandLine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CodeRestGeneratorTest {
+
+ private static final String SPEC =
Paths.get("src/test/resources/petstore-v3.json").toAbsolutePath().toString();
+
+ private static final List<String> DTOS = List.of(
+ "Address.java", "Category.java", "Customer.java",
"ModelApiResponse.java", "Order.java", "Pet.java", "Tag.java",
+ "User.java");
+
+ @TempDir
+ Path dir;
+
+ private final StringPrinter printer = new StringPrinter();
+
+ @Test
+ void writesTheDtosOfAPackageWhoseParentDirectoryDoesNotExist() throws
Exception {
+ Path packageDir = dir.resolve("org").resolve("acme");
+ Set<String> tempDirs = generatedTempDirs();
+
+ int exitCode = generate(packageDir, "--package=org.acme");
+
+ assertThat(exitCode).as(printer.getOutput()).isZero();
+
assertThat(filesOf(packageDir)).containsExactlyInAnyOrderElementsOf(DTOS);
+
assertThat(Files.readString(packageDir.resolve("Pet.java"))).contains("package
org.acme;");
+ assertThat(dir.resolve("rest.yaml")).exists();
+ assertThat(generatedTempDirs()).as("the temporary directory of the
generator is removed").isEqualTo(tempDirs);
+ }
+
+ @Test
+ void replacesTheDtosOfAnEarlierRunAndKeepsTheOtherFiles() throws Exception
{
+ Path packageDir = dir.resolve("org").resolve("acme");
+ Files.createDirectories(packageDir);
+ Files.writeString(packageDir.resolve("Pet.java"), "an earlier run");
+ Files.writeString(packageDir.resolve("Mine.java"), "not generated");
+
+ int exitCode = generate(packageDir, "--package=org.acme");
+
+ assertThat(exitCode).as(printer.getOutput()).isZero();
+
assertThat(Files.readString(packageDir.resolve("Pet.java"))).contains("package
org.acme;");
+
assertThat(Files.readString(packageDir.resolve("Mine.java"))).isEqualTo("not
generated");
+ }
+
+ @Test
+ void failsWhenTheDtosCannotBeWritten() throws Exception {
+ // a file where the directory of the package would be
+ Path packageDir = Files.writeString(dir.resolve("model"), "a file");
+
+ int exitCode = generate(packageDir, "--package=model");
+
+ assertThat(exitCode).isEqualTo(1);
+ assertThat(printer.getOutput()).contains("ERROR: Failed to write the
generated DTOs to " + packageDir);
+ }
+
+ @Test
+ void copiesADirectoryIntoOneWithoutParents() throws IOException {
+ Path source =
Files.createDirectories(dir.resolve("source").resolve("sub"));
+ Files.writeString(source.resolve("A.java"), "a");
+ Path target = dir.resolve("x").resolve("y");
+
+ CodeRestGenerator.copyDirectory(source.getParent(), target);
+
+ assertThat(target.resolve("sub").resolve("A.java")).hasContent("a");
+ }
+
+ private int generate(Path packageDir, String... args) throws Exception {
+ CodeRestGenerator command = new CodeRestGenerator(new
CamelJBangMain().withPrinter(printer)) {
+ @Override
+ Path packageDirectory() {
+ return packageDir;
+ }
+ };
+ new CommandLine(command).parseArgs(Stream.concat(
+ Stream.of("--input=" + SPEC, "--dto", "--output=" +
dir.resolve("rest.yaml")),
+ Stream.of(args)).toArray(String[]::new));
+ return command.doCall();
+ }
+
+ private static List<String> filesOf(Path directory) throws IOException {
+ try (Stream<Path> files = Files.list(directory)) {
+ return files.map(f -> f.getFileName().toString()).toList();
+ }
+ }
+
+ private static Set<String> generatedTempDirs() throws IOException {
+ try (Stream<Path> files =
Files.list(Paths.get(System.getProperty("java.io.tmpdir")))) {
+ return files.map(f -> f.getFileName().toString()).filter(n ->
n.startsWith("gendto"))
Review Comment:
Done in b01f20aa4db7, with a seam rather than a weaker assertion:
`CodeRestGenerator.createTempDirectory()` is package-private, and the test
creates the temporary directory in its own `@TempDir` and asserts that this one
directory no longer exists. It no longer lists `java.io.tmpdir`.
_Claude Code on behalf of davsclaus (Claus Ibsen)_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
