Add instructions to invoke the linter and code formatter plugins to the README and...

[aai/schema-service.git] / aai-schema-service / src / main / java / org / onap / aai / schemaservice / config / AAIConfigTranslator.java

diff --git a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/AAIConfigTranslator.java b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/AAIConfigTranslator.java
index 38645db..3d1e854 100644 (file)
--- a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/AAIConfigTranslator.java
+++ b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/AAIConfigTranslator.java
@@ -8,7 +8,7 @@
  * 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
+ * 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,
@@ -17,10 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.aai.schemaservice.config;
 
-import org.onap.aai.schemaservice.nodeschema.SchemaVersion;
-import org.onap.aai.schemaservice.nodeschema.SchemaVersions;
+package org.onap.aai.schemaservice.config;
 
 import java.io.File;
 import java.util.Arrays;
@@ -31,6 +29,9 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.onap.aai.schemaservice.nodeschema.SchemaVersion;
+import org.onap.aai.schemaservice.nodeschema.SchemaVersions;
+
 /**
  * <b>AAIConfigTranslator</b> is responsible for looking at the
  * schema files and edge files based on the available versions
@@ -38,81 +39,73 @@ import java.util.stream.Stream;
  */
 public class AAIConfigTranslator extends ConfigTranslator {
 
-    private static final String FILESEP = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
+    private static final String FILESEP =
+        (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
 
     public AAIConfigTranslator(SchemaLocationsBean bean, SchemaVersions schemaVersions) {
-    super(bean, schemaVersions);
-  }
-
-  /* (non-Javadoc)
-   * @see org.onap.aai.setup.ConfigTranslator#getNodeFiles()
-   */
-  @Override
-  public Map<SchemaVersion, List<String>> getNodeFiles() {
-
-    Map<SchemaVersion, List<String>> files = new TreeMap<>();
-    for (SchemaVersion v : schemaVersions.getVersions()) {
-      List<String> container = getVersionNodeFiles(v);
-      files.put(v, container);
+        super(bean, schemaVersions);
     }
 
-    return files;
-  }
-
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.onap.aai.setup.ConfigTranslator#getNodeFiles()
+     */
+    @Override
+    public Map<SchemaVersion, List<String>> getNodeFiles() {
+
+        Map<SchemaVersion, List<String>> files = new TreeMap<>();
+        for (SchemaVersion v : schemaVersions.getVersions()) {
+            List<String> container = getVersionNodeFiles(v);
+            files.put(v, container);
+        }
+
+        return files;
+    }
 
-  private List<String> getVersionNodeFiles(SchemaVersion v) {
+    private List<String> getVersionNodeFiles(SchemaVersion v) {
 
-      return getVersionFiles(
-        bean.getNodeDirectory(),
-      v,
-      () -> bean.getNodesInclusionPattern().stream(),
-      () -> bean.getNodesExclusionPattern().stream()
-    );
-  }
+        return getVersionFiles(bean.getNodeDirectory(), v,
+            () -> bean.getNodesInclusionPattern().stream(),
+            () -> bean.getNodesExclusionPattern().stream());
+    }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.onap.aai.setup.ConfigTranslator#getEdgeFiles()
+     */
+    @Override
+    public Map<SchemaVersion, List<String>> getEdgeFiles() {
+
+        Map<SchemaVersion, List<String>> files = new TreeMap<>();
+        for (SchemaVersion v : schemaVersions.getVersions()) {
+            List<String> container = getVersionEdgeFiles(v);
+            files.put(v, container);
+        }
+
+        return files;
+    }
 
-  /* (non-Javadoc)
-   * @see org.onap.aai.setup.ConfigTranslator#getEdgeFiles()
-   */
-  @Override
-  public Map<SchemaVersion, List<String>> getEdgeFiles() {
+    private List<String> getVersionEdgeFiles(SchemaVersion v) {
 
-    Map<SchemaVersion, List<String>> files = new TreeMap<>();
-    for (SchemaVersion v : schemaVersions.getVersions()) {
-      List<String> container = getVersionEdgeFiles(v);
-      files.put(v, container);
+        return getVersionFiles(bean.getEdgeDirectory(), v,
+            () -> bean.getEdgesInclusionPattern().stream(),
+            () -> bean.getEdgesExclusionPattern().stream());
     }
 
-    return files;
-  }
-
-  private List<String> getVersionEdgeFiles(SchemaVersion v) {
-
-    return getVersionFiles(
-        bean.getEdgeDirectory(),
-        v,
-        () -> bean.getEdgesInclusionPattern().stream(),
-        () -> bean.getEdgesExclusionPattern().stream()
-    );
-  }
-
-  private List<String> getVersionFiles(
-      String startDirectory,
-      SchemaVersion schemaVersion,
-      Supplier<Stream<String>> inclusionPattern,
-      Supplier<Stream<String>> exclusionPattern
-  ){
-
-    List<String> container;
-    final String directoryName = startDirectory + FILESEP + schemaVersion.toString() + FILESEP;
-
-    container = Arrays.stream(new File(directoryName).listFiles())
-        .map(File::getName)
-        .filter(name -> inclusionPattern.get().anyMatch(name::matches))
-        .map(name -> directoryName + name)
-        .filter(name -> exclusionPattern.get().noneMatch(name::matches))
-        .collect(Collectors.toList());
-
-    return container;
-  }
+    private List<String> getVersionFiles(String startDirectory, SchemaVersion schemaVersion,
+        Supplier<Stream<String>> inclusionPattern, Supplier<Stream<String>> exclusionPattern) {
+
+        List<String> container;
+        final String directoryName = startDirectory + FILESEP + schemaVersion.toString() + FILESEP;
+
+        container = Arrays.stream(new File(directoryName).listFiles()).map(File::getName)
+            .filter(name -> inclusionPattern.get().anyMatch(name::matches))
+            .map(name -> directoryName + name)
+            .filter(name -> exclusionPattern.get().noneMatch(name::matches))
+            .collect(Collectors.toList());
+
+        return container;
+    }
 }