diff --git a/pom.xml b/pom.xml index 02ed0f2..baf4c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 3.5.3 + 3.5.11 io.github.raduking openapi-offline-generator-plugin - 1.0.5 + 1.0.6 maven-plugin ${project.groupId}:${project.artifactId} @@ -57,18 +57,21 @@ 2.2.41 2.8.13 - 1.0.20 + 1.1.8 0.15.0 + + 3.2.8 0.9.0 3.15.2 - 2.46.1 - 3.42.0 - 4.36 + 3.3.0 + 3.44.0 + 4.38 + 1.0.0 @@ -369,15 +372,22 @@ org.eclipse.jdt.core ${org.eclipse.jdt.core.version} + + io.github.raduking + code-format + ${code.format.version} + - ${project.basedir}/formatter/java-formatter.xml + java-code-style.xml ${eclipse.formatter.version} - - + + + + @@ -480,7 +490,7 @@ org.jacoco jacoco-maven-plugin - ${jacoco.plugin.version} + ${jacoco.maven.plugin.version} diff --git a/src/main/java/org/oogp/GeneratorException.java b/src/main/java/org/oogp/GeneratorException.java index ea31908..fd6cd3a 100644 --- a/src/main/java/org/oogp/GeneratorException.java +++ b/src/main/java/org/oogp/GeneratorException.java @@ -1,5 +1,7 @@ package org.oogp; +import java.io.Serial; + /** * Exception class for generator-related errors. * @@ -10,6 +12,7 @@ public class GeneratorException extends RuntimeException { /** * Serial version UID. */ + @Serial private static final long serialVersionUID = -4336559629781875288L; /** diff --git a/src/main/java/org/oogp/OpenApiGenerator.java b/src/main/java/org/oogp/OpenApiGenerator.java index be20f58..19f8bdb 100644 --- a/src/main/java/org/oogp/OpenApiGenerator.java +++ b/src/main/java/org/oogp/OpenApiGenerator.java @@ -8,6 +8,8 @@ import org.morphix.reflection.Constructors; import org.oogp.jakarta.OpenApiSpecJakartaGenerator; import org.oogp.spring.OpenApiSpecSpringDocGenerator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Main class for OpenAPI generation used in the CLI mode. @@ -16,11 +18,15 @@ */ public class OpenApiGenerator { + /** + * Logger instance. + */ + private static final Logger LOGGER = LoggerFactory.getLogger(OpenApiGenerator.class); + /** * Main method. * * @param args the command line arguments - * @throws Exception in case of errors */ static void main(final String[] args) { if (args.length != 1) { @@ -36,7 +42,7 @@ static void main(final String[] args) { generate(properties); } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Error while generating OpenAPI specification", e); System.exit(3); } } diff --git a/src/main/java/org/oogp/jakarta/OpenApiSpecJakartaGenerator.java b/src/main/java/org/oogp/jakarta/OpenApiSpecJakartaGenerator.java index 1e0dcb9..d16ef8f 100644 --- a/src/main/java/org/oogp/jakarta/OpenApiSpecJakartaGenerator.java +++ b/src/main/java/org/oogp/jakarta/OpenApiSpecJakartaGenerator.java @@ -134,7 +134,11 @@ public static void generate(final GeneratorProperties properties) throws IOExcep String outputFile = properties.getOutputFile(); File out = new File(outputFile); - out.getParentFile().mkdirs(); + boolean created = out.getParentFile().mkdirs(); + if (!created) { + // could not create directories, but maybe they already exist, log a warning just in case + LOGGER.warn("Could not create directories for output file: {}", out.getAbsolutePath()); + } ObjectMapper mapper = switch (outputFile) { case String s when s.endsWith(".json") -> Json.mapper(); diff --git a/src/main/java/org/oogp/spring/OpenApiSpecSpringDocGenerator.java b/src/main/java/org/oogp/spring/OpenApiSpecSpringDocGenerator.java index 72609bc..9204467 100644 --- a/src/main/java/org/oogp/spring/OpenApiSpecSpringDocGenerator.java +++ b/src/main/java/org/oogp/spring/OpenApiSpecSpringDocGenerator.java @@ -210,7 +210,11 @@ public static void generate(final GeneratorProperties properties) throws IOExcep addExtensions(openAPI, properties.getExtensions()); File out = new File(outputFile); - out.getParentFile().mkdirs(); + boolean created = out.getParentFile().mkdirs(); + if (!created) { + // could not create directories, but maybe they already exist, log a warning just in case + LOGGER.warn("Could not create directories for output file: {}", out.getAbsolutePath()); + } boolean isOpenapi31 = openApiResource.getSpringDocConfigProperties().isOpenapi31(); ObjectMapper mapper = switch (outputFile) { diff --git a/src/test/java/org/oogp/isolated/offsetdatetime/controller/OffsetDateTimeController.java b/src/test/java/org/oogp/isolated/offsetdatetime/controller/OffsetDateTimeController.java index b60f3ea..e03c304 100644 --- a/src/test/java/org/oogp/isolated/offsetdatetime/controller/OffsetDateTimeController.java +++ b/src/test/java/org/oogp/isolated/offsetdatetime/controller/OffsetDateTimeController.java @@ -17,7 +17,7 @@ public class OffsetDateTimeController implements OffsetDateTimeApi { private static final Logger LOGGER = LoggerFactory.getLogger(OffsetDateTimeController.class); - private ObjectMapper objectMapper = new ObjectMapper(); + private final ObjectMapper objectMapper = new ObjectMapper(); @Override public ResponseEntity getObjectWithOffsetDateTime(final OffsetDateTime dateTime) {