Adding logging example

[cps.git] / cps-service / src / main / java / org / onap / cps / utils / YangUtils.java

diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
index a35533c..8743b7d 100644 (file)
--- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
@@ -19,23 +19,15 @@
 
 package org.onap.cps.utils;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.opendaylight.yangtools.yang.common.YangConstants.RFC6020_YANG_FILE_EXTENSION;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
 import com.google.gson.stream.JsonReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.impl.Fragment;
-import org.onap.cps.yang.YangTextSchemaSourceSet;
-import org.onap.cps.yang.YangTextSchemaSourceSetBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -53,41 +45,16 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
+@Slf4j
 public class YangUtils {
-    private static final Logger LOGGER = Logger.getLogger(YangUtils.class.getName());
 
     private YangUtils() {
         throw new IllegalStateException("Utility class");
     }
 
     /**
-     * Parse a file containing yang modules.
-     *
-     * @param yangModelFiles list of files containing one or more yang modules. The file has to have a .yang extension.
-     * @return a SchemaContext representing the yang model
-     * @throws IOException         when the system as an IO issue
-     * @throws YangParserException when the file does not contain a valid yang structure
-     */
-    @Deprecated
-    public static YangTextSchemaSourceSet parseYangModelFiles(final List<File> yangModelFiles)
-            throws IOException, YangParserException, ReactorException {
-        final YangTextSchemaSourceSetBuilder yangModelsMapBuilder = new YangTextSchemaSourceSetBuilder();
-        for (final File file :yangModelFiles) {
-            final String fileNameWithExtension = file.getName();
-            checkArgument(fileNameWithExtension.endsWith(RFC6020_YANG_FILE_EXTENSION),
-                    "Filename %s does not end with '%s'", RFC6020_YANG_FILE_EXTENSION,
-                    fileNameWithExtension);
-            final String content = Files.asCharSource(file, Charsets.UTF_8).read();
-            yangModelsMapBuilder.put(fileNameWithExtension, content);
-        }
-        return yangModelsMapBuilder.build();
-    }
-
-    /**
-     * Parse a file containing json data for a certain model (schemaContext).
+     * Parse a string containing json data for a certain model (schemaContext).
      *
      * @param jsonData      a string containing json data for the given model
      * @param schemaContext the SchemaContext for the given data
@@ -136,7 +103,7 @@ public class YangUtils {
         } else if (normalizedNode instanceof LeafSetNode) {
             inspectLeafList(currentFragment, (LeafSetNode) normalizedNode);
         } else {
-            LOGGER.warning("Cannot normalize " + normalizedNode.getClass());
+            log.warn("Cannot normalize " + normalizedNode.getClass());
         }
     }