Fix style issues

Author: dnestoro

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithAgentFunctionalTest.groovy

@@ -78,13 +78,13 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio
  outputDoesNotContain "containers found"
  }
 
- def "simple test of agent usage"() {
+ def "test agent with metadata copy task"() {
  given:
  withSample("java-application-with-reflection")
- mvn '-Pnative', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent'
+ mvn'-Pnative', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent'
 
  when:
- mvn '-Pnative', '-DskipNativeTests', 'native:metadata-copy'
+ mvn'-Pnative', '-DskipNativeTests', 'native:metadata-copy'
 
  then:
  buildSucceeded
@@ -94,13 +94,13 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio
  outputContains "Metadata copy process finished."
  }
 
- def "simple test of agent usage with direct mode"() {
+ def "test agent in direct mode with metadata copy task"() {
  given:
  withSample("java-application-with-reflection")
- mvn '-PagentConfigurationDirectMode', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent'
+ mvn'-PagentConfigurationDirectMode', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent'
 
  when:
- mvn  '-PagentConfigurationDirectMode', '-DskipNativeTests', 'native:metadata-copy'
+ mvn '-PagentConfigurationDirectMode', '-DskipNativeTests', 'native:metadata-copy'
 
  then:
  buildSucceeded
@@ -109,10 +109,10 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio
  outputContains "You are running agent in direct mode. Skipping both merge and metadata copy tasks."
  }
 
- def "simple test of agent usage with disabled stages"() {
+ def "test agent with metadata copy task and disabled stages"() {
  given:
  withSample("java-application-with-reflection")
- mvn '-PagentConfigurationWithDisabledStages', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent'
+ mvn'-PagentConfigurationWithDisabledStages', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent'
 
  when:
  mvn'-PagentConfigurationWithDisabledStages', '-DskipNativeTests', 'native:metadata-copy'

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeImageMojo.java

@@ -54,12 +54,24 @@
 import org.graalvm.buildtools.utils.SharedConstants;
 
 import javax.inject.Inject;
-import java.io.*;
+import java.io.File;
+import java.io.InputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
-import java.nio.file.*;
-import java.util.*;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeExtension.java

@@ -65,7 +65,6 @@
 import java.util.stream.Collectors;
 
 import static org.graalvm.buildtools.utils.NativeImageConfigurationUtils.getNativeImage;
-import static org.graalvm.buildtools.utils.Utils.assertNotEmptyAndTrim;
 
 /**
  * This extension is responsible for configuring the Surefire plugin to enable

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/AbstractMergeAgentFilesMojo.java

@@ -1,3 +1,44 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package org.graalvm.buildtools.maven.config;
 
 import org.apache.maven.plugin.AbstractMojo;
@@ -25,6 +66,10 @@ public abstract class AbstractMergeAgentFilesMojo extends AbstractMojo {
  protected File mergerExecutable;
 
  protected void tryInstallMergeExecutable(Path nativeImageExecutablePath) {
+ if (mergerExecutable != null && mergerExecutable.exists()) {
+ return;
+ }
+
  File nativeImageExecutable = nativeImageExecutablePath.toAbsolutePath().toFile();
  File mergerExecutable = new File(nativeImageExecutable.getParentFile(), nativeImageConfigureFileName());
  if (!mergerExecutable.exists()) {
@@ -45,6 +90,7 @@ protected void tryInstallMergeExecutable(Path nativeImageExecutablePath) {
  }
 
  }
+
  this.mergerExecutable = mergerExecutable;
  }
 

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/agent/AgentConfiguration.java

@@ -1,7 +1,51 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package org.graalvm.buildtools.maven.config.agent;
 
 import org.apache.maven.plugins.annotations.Parameter;
-import org.graalvm.buildtools.agent.*;
+import org.graalvm.buildtools.agent.AgentMode;
+import org.graalvm.buildtools.agent.ConditionalAgentMode;
+import org.graalvm.buildtools.agent.DirectAgentMode;
+import org.graalvm.buildtools.agent.StandardAgentMode;
 
 import java.util.Arrays;
 import java.util.Properties;

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/agent/CommonOptionsConfiguration.java

@@ -1,3 +1,44 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package org.graalvm.buildtools.maven.config.agent;
 
 import org.apache.maven.plugins.annotations.Parameter;

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/agent/ModesConfiguration.java

@@ -1,3 +1,44 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package org.graalvm.buildtools.maven.config.agent;
 
 import org.apache.maven.plugins.annotations.Parameter;

native-maven-plugin/src/main/java/org/graalvm/buildtools/utils/AgentUtils.java

@@ -42,7 +42,14 @@
 
 import org.apache.maven.execution.MavenSession;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.graalvm.buildtools.agent.*;
+
+import org.graalvm.buildtools.agent.AgentMode;
+import org.graalvm.buildtools.agent.DisabledAgentMode;
+import org.graalvm.buildtools.agent.StandardAgentMode;
+import org.graalvm.buildtools.agent.DirectAgentMode;
+import org.graalvm.buildtools.agent.ConditionalAgentMode;
+import org.graalvm.buildtools.agent.AgentConfiguration;
+
 import org.graalvm.buildtools.maven.config.agent.CommonOptionsConfiguration;
 
 import java.util.ArrayList;
@@ -55,7 +62,7 @@
 
 public final class AgentUtils {
 
- private AgentUtils() {}
+ private AgentUtils() { }
 
  public static AgentMode getAgentMode(Xpp3Dom agent) throws Exception {
  Xpp3Dom defaultModeNode = Xpp3DomParser.getTagByName(agent, "defaultMode");
@@ -112,7 +119,7 @@ public static AgentMode getAgentMode(Xpp3Dom agent) throws Exception {
  return agentMode;
  }
 
- public static AgentConfiguration collectAgentProperties(MavenSession session, Xpp3Dom rootNode) throws RuntimeException{
+ public static AgentConfiguration collectAgentProperties(MavenSession session, Xpp3Dom rootNode) throws RuntimeException {
  Xpp3Dom agent = Xpp3DomParser.getTagByName(rootNode, "agent");
  if (agent == null) {
  return new AgentConfiguration();
@@ -169,7 +176,7 @@ public static ArrayList<String> getDisabledStages(Xpp3Dom rootNode) {
  Xpp3Dom agent = Xpp3DomParser.getTagByName(rootNode, "agent");
  if (agent != null) {
  Xpp3Dom disabledStagesNode = Xpp3DomParser.getTagByName(agent, "disabledStages");
- if (disabledStagesNode != null){
+ if (disabledStagesNode != null) {
  Xpp3DomParser.getAllTagsByName(disabledStagesNode, "stage")
  .forEach(stageNode -> disabledStages.add(stageNode.getValue()));
  }

native-maven-plugin/src/main/java/org/graalvm/buildtools/utils/Utils.java

@@ -42,7 +42,7 @@
 
 public final class Utils {
 
- private Utils() {}
+ private Utils() { }
 
  public static boolean parseBoolean(String description, String value) {
  value = assertNotEmptyAndTrim(value, description + " must have a value").toLowerCase();

native-maven-plugin/src/main/java/org/graalvm/buildtools/utils/Xpp3DomParser.java

@@ -38,11 +38,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package org.graalvm.buildtools.utils;
 
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.util.LinkedList;
+import java.util.List;
 
 public class Xpp3DomParser {
 
@@ -62,7 +64,7 @@ public static Xpp3Dom getTagByName(Xpp3Dom root, String name) {
  return null;
  }
 
- public static LinkedList<Xpp3Dom> getAllTagsByName(Xpp3Dom root, String name) {
+ public static List<Xpp3Dom> getAllTagsByName(Xpp3Dom root, String name) {
  LinkedList<Xpp3Dom> listOfTags = new LinkedList<>();
  Xpp3Dom[] children = root.getChildren();
  for (Xpp3Dom child : children) {