From 933cdbd4c20f18fe47f253bd721baf6ae996e906 Mon Sep 17 00:00:00 2001 From: vempo Date: Thu, 25 Oct 2018 19:27:22 +0300 Subject: Code formatting of configuration framework Fixed code formatting, removed meaningless Javadoc comments, added copyright headers, minor (and safe) static analysis fixes. Change-Id: I3eda1f242905da5b80e024cf30a69ff59381fc43 Issue-ID: SDC-1867 Signed-off-by: vempo --- .../java/org/onap/config/NonConfigResource.java | 145 ++++++++++----------- 1 file changed, 71 insertions(+), 74 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java') diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java index 830cdfef5a..e7128c746d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java @@ -1,3 +1,19 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.onap.config; import java.io.File; @@ -9,87 +25,68 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; -/** - * The type Non config resource. - */ public class NonConfigResource { - private static Set urls = new HashSet<>(); - private static Set files = new HashSet<>(); + private static final Set urls = new HashSet<>(); + private static final Set files = new HashSet<>(); - /** - * Add. - * - * @param url the url - */ - public static void add(URL url) { - urls.add(url); - } - - /** - * Add. - * - * @param file the file - */ - public static void add(File file) { - files.add(file); - } + public static void add(URL url) { + urls.add(url); + } - /** - * Locate path. - * - * @param resource the resource - * @return the path - */ - public static Path locate(String resource) { - try { - if (resource != null) { - File file = new File(resource); - if (file.exists()) { - return Paths.get(resource); - } - for (File availableFile : files) { - if (availableFile.getAbsolutePath().endsWith(resource) && availableFile.exists()) { - return Paths.get(availableFile.getAbsolutePath()); - } + public static Path locate(String resource) { + try { + if (resource != null) { + File file = new File(resource); + if (file.exists()) { + return Paths.get(resource); + } + for (File availableFile : files) { + if (availableFile.getAbsolutePath().endsWith(resource) && availableFile.exists()) { + return Paths.get(availableFile.getAbsolutePath()); + } + } + if (System.getProperty("node.config.location") != null) { + Path path = locate(new File(System.getProperty("node.config.location")), resource); + if (path != null) { + return path; + } + } + if (System.getProperty("config.location") != null) { + Path path = locate(new File(System.getProperty("config.location")), resource); + if (path != null) { + return path; + } + } + for (URL url : urls) { + if (url.getFile().endsWith(resource)) { + return Paths.get(url.toURI()); + } + } + } + } catch (Exception exception) { + exception.printStackTrace(); } - if (System.getProperty("node.config.location") != null) { - Path path = locate(new File(System.getProperty("node.config.location")), resource); - if (path != null) { - return path; - } - } - if (System.getProperty("config.location") != null) { - Path path = locate(new File(System.getProperty("config.location")), resource); - if (path != null) { - return path; - } - } - for (URL url : urls) { - if (url.getFile().endsWith(resource)) { - return Paths.get(url.toURI()); - } - } - } - } catch (Exception exception) { - exception.printStackTrace(); + return null; } - return null; - } - private static Path locate(File root, String resource) { - if (root.exists()) { - Collection filesystemResources = ConfigurationUtils.getAllFiles(root, true, false); - Predicate f1 = ConfigurationUtils::isConfig; - for (File file : filesystemResources) { - if (!f1.test(file)) { - add(file); - if (file.getAbsolutePath().endsWith(resource)) { - return Paths.get(file.getAbsolutePath()); - } + private static Path locate(File root, String resource) { + if (root.exists()) { + Collection filesystemResources = ConfigurationUtils.getAllFiles(root, true, false); + Predicate f1 = ConfigurationUtils::isConfig; + for (File file : filesystemResources) { + if (!f1.test(file)) { + add(file); + if (file.getAbsolutePath().endsWith(resource)) { + return Paths.get(file.getAbsolutePath()); + } + } + } } - } + return null; + } + + public static void add(File file) { + files.add(file); } - return null; - } } -- cgit 1.2.3-korg