From 427ab9d892be8e23e24a4c807f31b1b6956ccac3 Mon Sep 17 00:00:00 2001
From: Aleksandar Gradinac <aleksandar.gradinac@oracle.com>
Date: Wed, 6 Jul 2022 05:07:43 +0200
Subject: [PATCH] Fix checkstyle errors

---
 .../buildtools/utils/FileUtilsTest.java       | 48 ++++++++++++++++++-
 .../MetadataRepositoryConfiguration.java      |  1 -
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/common/utils/src/test/java/org/graalvm/buildtools/utils/FileUtilsTest.java b/common/utils/src/test/java/org/graalvm/buildtools/utils/FileUtilsTest.java
index 3cb76d5d9..0af07030f 100644
--- a/common/utils/src/test/java/org/graalvm/buildtools/utils/FileUtilsTest.java
+++ b/common/utils/src/test/java/org/graalvm/buildtools/utils/FileUtilsTest.java
@@ -1,3 +1,43 @@
+/*
+ * Copyright (c) 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.utils;
 
 import org.junit.jupiter.api.DisplayName;
@@ -17,7 +57,9 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class FileUtilsTest {
 
@@ -97,8 +139,10 @@ void testExtract(@TempDir Path tempDir) throws IOException {
         assertTrue(Files.isDirectory(tempDir.resolve("org.graalvm.internal/library-with-reflection/1")));
 
         assertTrue(Files.exists(tempDir.resolve("org.graalvm.internal/library-with-reflection/1/reflect-config.json")));
-        assertEquals("[  {    \"name\": \"org.graalvm.internal.reflect.Message\",    \"allDeclaredFields\": true,    \"allDeclaredMethods\": true  }]", String.join("", Files.readAllLines(tempDir.resolve("org.graalvm.internal/library-with-reflection/1/reflect-config.json"))));
+        assertEquals("[  {    \"name\": \"org.graalvm.internal.reflect.Message\",    \"allDeclaredFields\": true,    \"allDeclaredMethods\": true  }]",
+                String.join("", Files.readAllLines(tempDir.resolve("org.graalvm.internal/library-with-reflection/1/reflect-config.json"))));
     }
+
     @Test
     @DisplayName("It is protected against ZIP slip attacks")
     void testZipSlip(@TempDir Path tempDir) throws IOException {
diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/MetadataRepositoryConfiguration.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/MetadataRepositoryConfiguration.java
index 18f8e0791..d63610721 100644
--- a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/MetadataRepositoryConfiguration.java
+++ b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/config/MetadataRepositoryConfiguration.java
@@ -44,7 +44,6 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.graalvm.buildtools.utils.SharedConstants;
 
 import java.io.File;
 import java.net.URL;