diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 54eb8bfab8a..e52981a7450 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -13,13 +13,13 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Compile with Maven - run: mvn clean package jacoco:report + run: mvn -B -q clean install jacoco:report - name: Jacoco Aggregate run: mvn jacoco:report-aggregate - name: Publish to Sonar - run: mvn -B -q sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/} + run: mvn -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/} diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java index 20a18901099..7ad0e1ba709 100644 --- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java @@ -39,15 +39,16 @@ import java.util.stream.Collectors; import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4; import static org.apache.commons.lang3.StringUtils.isEmpty; -@SuppressWarnings({"unused","java:S106"}) +@SuppressWarnings({"unused","java:S106", "java:S1192"}) @Command(name = "config-help", description = "Config help for chosen lang") public class ConfigHelp extends OpenApiGeneratorCommand { - private static final Logger LOGGER = LoggerFactory.getLogger(Generate.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConfigHelp.class); private static final String FORMAT_TEXT = "text"; private static final String FORMAT_MARKDOWN = "markdown"; private static final String FORMAT_YAMLSAMPLE = "yamlsample"; + private static final int FEATURE_SET_DISPLAY_WIDTH= 20; @Option(name = {"-g", "--generator-name"}, title = "generator name", description = "generator to get config help for") @@ -147,7 +148,7 @@ public class ConfigHelp extends OpenApiGeneratorCommand { LOGGER.error("[error] Check the spelling of the generator's name and try again."); System.exit(1); } catch (IOException e) { - e.printStackTrace(); + LOGGER.error("Unexpected error", e); } } @@ -396,7 +397,7 @@ public class ConfigHelp extends OpenApiGeneratorCommand { String definedByKey = "Defined By"; int maxNameLength = flattened.stream().map(FeatureSet.FeatureSetFlattened::getFeatureName).mapToInt(String::length).max().orElse(nameKey.length()); int maxSupportedLength = supportedKey.length(); - int definedInLength = 20; + int definedInLength = FEATURE_SET_DISPLAY_WIDTH; String format = "%-" + maxNameLength + "s\t%-" + maxSupportedLength + "s\t%-" + definedInLength + "s"; flattened.forEach(featureSet -> { diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 2e41d33653c..d0eb7ad5792 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -15,6 +15,7 @@ maven plugin to build modules from OpenAPI Generator UTF-8 + **/src/main/java/org/openapitools/codegen/plugin/**/* diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 08f9c33febc..129f8a28433 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -19,6 +19,7 @@ 3.0.0 4.13 2.10.2 + **/org/openapitools/codegen/online/**/*