From 7feffd3dde0a0e6c4b99a58b188d0df00aa6ca92 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Fri, 6 Jun 2025 03:45:52 +0800 Subject: [PATCH 1/4] generate xml with artifactId --- hadoop-hdds/client/pom.xml | 10 ---- hadoop-hdds/common/pom.xml | 14 ------ hadoop-hdds/config/pom.xml | 3 ++ .../hadoop/hdds/conf/ConfigFileGenerator.java | 13 +++-- hadoop-hdds/container-service/pom.xml | 10 ---- hadoop-hdds/framework/pom.xml | 14 ------ hadoop-hdds/server-scm/pom.xml | 10 ---- hadoop-ozone/common/pom.xml | 10 ---- hadoop-ozone/csi/pom.xml | 10 ---- hadoop-ozone/ozone-manager/pom.xml | 10 ---- hadoop-ozone/recon/pom.xml | 10 ---- pom.xml | 50 ++----------------- 12 files changed, 16 insertions(+), 148 deletions(-) diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index bbcf366bf6bc..917d90f88e86 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -110,16 +110,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - com.github.spotbugs spotbugs-maven-plugin diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 45f10c674317..50094356f7b5 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -262,20 +262,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - rename-generated-test-config - process-test-classes - - - com.github.spotbugs spotbugs-maven-plugin diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 47ccda8baf8b..45e32b47db23 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -70,6 +70,9 @@ org.apache.hadoop.hdds.conf.ConfigFileGenerator + + -AartifactId= + diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java index 372d75753b63..896b2de97768 100644 --- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java +++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java @@ -49,7 +49,7 @@ @SupportedSourceVersion(SourceVersion.RELEASE_8) public class ConfigFileGenerator extends AbstractProcessor { - public static final String OUTPUT_FILE_NAME = "ozone-default-generated.xml"; + private static final String OUTPUT_FILE_NAME = "ozone-default-generated.xml"; private static final SimpleTypeVisitor8 GET_PARENT_ELEMENT = new SimpleTypeVisitor8() { @@ -73,9 +73,16 @@ public boolean process(Set annotations, //load existing generated config (if exists) boolean resourceExists = true; ConfigFileAppender appender = new ConfigFileAppender(); + String currentArtifactId = processingEnv.getOptions().get("artifactId"); + String outputFileName; + if (currentArtifactId == null || currentArtifactId.isEmpty()) { + outputFileName = OUTPUT_FILE_NAME; // 設定預設檔名 + } else { + outputFileName = currentArtifactId + OUTPUT_FILE_NAME.substring(5); + }; try (InputStream input = filer .getResource(StandardLocation.CLASS_OUTPUT, "", - OUTPUT_FILE_NAME).openInputStream()) { + outputFileName).openInputStream()) { appender.load(input); } catch (FileNotFoundException | NoSuchFileException ex) { appender.init(); @@ -110,7 +117,7 @@ public boolean process(Set annotations, if (!resourceExists) { FileObject resource = filer .createResource(StandardLocation.CLASS_OUTPUT, "", - OUTPUT_FILE_NAME); + outputFileName); try (Writer writer = new OutputStreamWriter( resource.openOutputStream(), StandardCharsets.UTF_8)) { diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index fde6e8c7898a..2c5314068fd6 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -263,16 +263,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - com.github.spotbugs spotbugs-maven-plugin diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 782d8b6fce87..2f4d3a58b389 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -332,20 +332,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - rename-generated-test-config - process-test-classes - - - com.github.spotbugs spotbugs-maven-plugin diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 7f9db0c04d08..4761fcd722a8 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -241,16 +241,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 0f91ba21d9a5..cb082b9d6c44 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -187,16 +187,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - org.apache.hadoop hadoop-maven-plugins diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index eb8c3b6fa9a1..6dac6cb42db0 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -194,16 +194,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - com.salesforce.servicelibs proto-backwards-compatibility diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index d2dcdb9d6578..cfe37bba1b8a 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -383,16 +383,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index df5d4527f2df..42be97ed1983 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -326,16 +326,6 @@ - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - rename-generated-config - process-classes - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/pom.xml b/pom.xml index 837522f95b0f..0341797c945c 100644 --- a/pom.xml +++ b/pom.xml @@ -1804,6 +1804,9 @@ ${maven-compiler-plugin.version} false + + -AartifactId=${project.artifactId} + @@ -2170,53 +2173,6 @@ true - - com.coderplus.maven.plugins - copy-rename-maven-plugin - ${copy-rename-maven-plugin.version} - - - - rename-generated-config - - rename - - - none - - - - ${project.build.outputDirectory}/ozone-default-generated.xml - ${project.build.outputDirectory}/${project.artifactId}-default.xml - - - - - - rename-generated-test-config - - rename - - - none - - - - ${project.build.testOutputDirectory}/ozone-default-generated.xml - ${project.build.testOutputDirectory}/${project.artifactId}-default.xml - - - - - - From 1f1824ab7e51080d58b4848d50217fd7c1c3bfa0 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Fri, 6 Jun 2025 04:01:03 +0800 Subject: [PATCH 2/4] fix checkstyle --- .../java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java index 896b2de97768..31d4ed2dcc0f 100644 --- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java +++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java @@ -79,7 +79,7 @@ public boolean process(Set annotations, outputFileName = OUTPUT_FILE_NAME; // 設定預設檔名 } else { outputFileName = currentArtifactId + OUTPUT_FILE_NAME.substring(5); - }; + } try (InputStream input = filer .getResource(StandardLocation.CLASS_OUTPUT, "", outputFileName).openInputStream()) { From cc51799be9b9776e3a885760b1d58fb29b1f5e89 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Fri, 6 Jun 2025 06:08:51 +0800 Subject: [PATCH 3/4] correct postfix --- .../java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java index 31d4ed2dcc0f..89e6afe26f4f 100644 --- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java +++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java @@ -50,6 +50,7 @@ public class ConfigFileGenerator extends AbstractProcessor { private static final String OUTPUT_FILE_NAME = "ozone-default-generated.xml"; + private static final String OUTPUT_FILE_POSTFIX = "-default.xml"; private static final SimpleTypeVisitor8 GET_PARENT_ELEMENT = new SimpleTypeVisitor8() { @@ -78,7 +79,7 @@ public boolean process(Set annotations, if (currentArtifactId == null || currentArtifactId.isEmpty()) { outputFileName = OUTPUT_FILE_NAME; // 設定預設檔名 } else { - outputFileName = currentArtifactId + OUTPUT_FILE_NAME.substring(5); + outputFileName = currentArtifactId + OUTPUT_FILE_POSTFIX; } try (InputStream input = filer .getResource(StandardLocation.CLASS_OUTPUT, "", From 44e2e16c6f4fc4b52de1e34184eb156205eda205 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Fri, 6 Jun 2025 14:30:58 +0800 Subject: [PATCH 4/4] rmove comments --- .../java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java index 89e6afe26f4f..be07fddb3102 100644 --- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java +++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java @@ -77,7 +77,7 @@ public boolean process(Set annotations, String currentArtifactId = processingEnv.getOptions().get("artifactId"); String outputFileName; if (currentArtifactId == null || currentArtifactId.isEmpty()) { - outputFileName = OUTPUT_FILE_NAME; // 設定預設檔名 + outputFileName = OUTPUT_FILE_NAME; } else { outputFileName = currentArtifactId + OUTPUT_FILE_POSTFIX; }