This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8e931c4c57558e9aaa3bcf6e03500a2501649b9d Author: James Netherton <[email protected]> AuthorDate: Wed Aug 17 10:36:40 2022 +0100 Minor tidying of UpdateExtensionDocPageMojo --- .../quarkus/maven/UpdateExtensionDocPageMojo.java | 30 ++++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java index 6c04d5b780..c3c9f4bcf1 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java @@ -84,7 +84,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { final Path multiModuleProjectDirectoryPath = multiModuleProjectDirectory.toPath(); final CamelQuarkusExtension ext = CamelQuarkusExtension.read(basePath.resolve("pom.xml")); - final Path quarkusAwsClienTestsDir = multiModuleProjectDirectoryPath + final Path quarkusAwsClientTestsDir = multiModuleProjectDirectoryPath .resolve("integration-test-groups/aws2-quarkus-client"); final Path pomRelPath = multiModuleProjectDirectoryPath.relativize(basePath).resolve("pom.xml"); @@ -142,7 +142,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { model.put( "quarkusAwsClient", getQuarkusAwsClient( - quarkusAwsClienTestsDir, + quarkusAwsClientTestsDir, ext.getRuntimeArtifactIdBase(), ext.getQuarkusAwsClientBaseName(), ext.getQuarkusAwsClientFqClassName(), @@ -164,7 +164,6 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { throw new TemplateModelException("Wrong argument count in camelBitLink()"); } final ArtifactModel<?> model = (ArtifactModel<?>) DeepUnwrap.unwrap((TemplateModel) arguments.get(0)); - final String kind = model.getKind(); if (CqCatalog.isFirstScheme(model)) { return camelBitLink(model); } else { @@ -239,7 +238,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { // Apostrophes. string = string.replaceAll("([a-z])'s([^a-z])", "$1s$2"); // Allow only letters, -, _, . - string = string.replaceAll("[^\\w-_\\.]", "-").replaceAll("-{2,}", "-"); + string = string.replaceAll("[^\\w-_.]", "-").replaceAll("-{2,}", "-"); // Get rid of any - at the start and end. string = string.replaceAll("-+$", "").replaceAll("^-+", ""); @@ -251,7 +250,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { evalTemplate(charset, docPagePath, cfg, model, "extension-doc-page.adoc", "//"); - camelBits(charset, cfg, models, multiModuleProjectDirectoryPath, ext, model); + camelBits(charset, cfg, models, multiModuleProjectDirectoryPath, model); } static void evalTemplate(final Charset charset, final Path docPagePath, final Configuration cfg, @@ -265,7 +264,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { + " Do not edit directly!\n" + commentMarker + " This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page\n" - + evalTemplate(cfg, template, model, new StringWriter()).toString(); + + evalTemplate(cfg, template, model, new StringWriter()); try { Files.write(docPagePath, pageText.getBytes(charset)); } catch (IOException e) { @@ -274,7 +273,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { } void camelBits(Charset charset, Configuration cfg, List<ArtifactModel<?>> models, Path multiModuleProjectDirectoryPath, - CamelQuarkusExtension ext, Map<String, Object> model) { + Map<String, Object> model) { models.stream() .filter(CqCatalog::isFirstScheme) .forEach(m -> { @@ -354,17 +353,16 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { } try (Stream<Path> files = Files.walk(deploymentPackageDir)) { - final boolean anyMatch = files + return files .filter(p -> p.getFileName().toString().endsWith("Processor.java")) .map(p -> { try { - return new String(Files.readAllBytes(p), StandardCharsets.UTF_8); + return Files.readString(p); } catch (Exception e) { throw new RuntimeException("Could not read from " + p, e); } }) .anyMatch(source -> source.contains("new ExtensionSslNativeSupportBuildItem")); - return anyMatch; } catch (IOException e) { throw new RuntimeException("Could not walk " + deploymentPackageDir, e); } @@ -395,7 +393,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { Path p = basePath.resolve("src/main/doc/" + fileName); if (Files.exists(p)) { try { - final String result = new String(Files.readAllBytes(p), charset); + final String result = Files.readString(p, charset); if (!result.endsWith("\n")) { return result + "\n"; } @@ -417,12 +415,12 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { .resolve("target/asciidoc/generated/config/all-configuration-roots-generated-doc"); if (!Files.exists(configRootsModelsDir)) { throw new IllegalStateException("You should run " + UpdateExtensionDocPageMojo.class.getSimpleName() - + " after compileation with io.quarkus.annotation.processor.ExtensionAnnotationProcessor"); + + " after compilation with io.quarkus.annotation.processor.ExtensionAnnotationProcessor"); } final FsMap configRootsModels = new FsMap(configRootsModelsDir); final ObjectMapper mapper = new ObjectMapper(); - final List<ConfigDocItem> configDocItems = new ArrayList<ConfigDocItem>(); + final List<ConfigDocItem> configDocItems = new ArrayList<>(); for (String configRootClass : configRootClasses) { final String rawModel = configRootsModels.get(configRootClass); if (rawModel == null) { @@ -430,9 +428,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { } try { final List<ConfigDocItem> items = mapper.readValue(rawModel, Constants.LIST_OF_CONFIG_ITEMS_TYPE_REF); - for (ConfigDocItem item : items) { - configDocItems.add(item); - } + configDocItems.addAll(items); } catch (JsonProcessingException e) { throw new RuntimeException("Could not parse " + rawModel, e); } @@ -492,7 +488,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo { public String getClientFieldName() { /* Just lowercase the first letter of getClientClassSimpleName() */ - char c[] = getClientClassSimpleName().toCharArray(); + char[] c = getClientClassSimpleName().toCharArray(); c[0] += 32; return new String(c); }
