loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-06 15:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

maven plugin: log global settings, minor improvements (#16961)

Browse Source
This commit is contained in:
martin-mfg 2023-11-02 15:13:03 +01:00 committed by GitHub
parent e4cfd626c8
commit 39347ec37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java
View File

@ -1198,7 +1198,6 @@ public final class GeneratorSettings implements Serializable {
*/ */
public GeneratorSettings build() { public GeneratorSettings build() {
GeneratorSettings instance = new GeneratorSettings(this); GeneratorSettings instance = new GeneratorSettings(this);
//noinspection PlaceholderCountMatchesArgumentCount
LOGGER.debug("GeneratorSettings#build: {}", instance); LOGGER.debug("GeneratorSettings#build: {}", instance);
return instance; return instance;
} }

1
modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
View File

@ -903,6 +903,7 @@ public class CodeGenMojo extends AbstractMojo {
return; return;
} }
adjustAdditionalProperties(config); adjustAdditionalProperties(config);
GlobalSettings.log();
new DefaultGenerator(dryRun).opts(input).generate(); new DefaultGenerator(dryRun).opts(input).generate();
if (buildContext != null) { if (buildContext != null) {

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View File

@ -606,7 +606,7 @@ public class DefaultGenerator implements Generator {
} }
Map<String, List<CodegenOperation>> paths = processPaths(this.openAPI.getPaths()); Map<String, List<CodegenOperation>> paths = processPaths(this.openAPI.getPaths());
Set<String> apisToGenerate = null; Set<String> apisToGenerate = null;
String apiNames = GlobalSettings.getProperty("apis"); String apiNames = GlobalSettings.getProperty(CodegenConstants.APIS);
if (apiNames != null && !apiNames.isEmpty()) { if (apiNames != null && !apiNames.isEmpty()) {
apisToGenerate = new HashSet<>(Arrays.asList(apiNames.split(","))); apisToGenerate = new HashSet<>(Arrays.asList(apiNames.split(",")));
} }

13
modules/openapi-generator/src/main/java/org/openapitools/codegen/config/GlobalSettings.java
View File

@ -16,6 +16,11 @@
package org.openapitools.codegen.config; package org.openapitools.codegen.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties; import java.util.Properties;
/** /**
@ -31,6 +36,8 @@ import java.util.Properties;
*/ */
public class GlobalSettings { public class GlobalSettings {
private static final Logger LOGGER = LoggerFactory.getLogger(GlobalSettings.class);
private static ThreadLocal<Properties> properties = new InheritableThreadLocal<Properties>() { private static ThreadLocal<Properties> properties = new InheritableThreadLocal<Properties>() {
@Override @Override
protected Properties initialValue() { protected Properties initialValue() {
@ -60,4 +67,10 @@ public class GlobalSettings {
public static void reset() { public static void reset() {
properties.remove(); properties.remove();
} }
public static void log() {
StringWriter stringWriter = new StringWriter();
properties.get().list(new PrintWriter(stringWriter));
LOGGER.debug("GlobalSettings: {}", stringWriter);
}
} }