Merge "Associate anchor to schema set"
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
index d4faebc..2b09624 100644
--- a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
@@ -19,6 +19,7 @@
package org.onap.cps.rest.exceptions;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.onap.cps.rest.controller.AdminRestController;
import org.onap.cps.rest.controller.DataRestController;
@@ -33,6 +34,7 @@
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
+@Slf4j
@RestControllerAdvice(assignableTypes = {AdminRestController.class, DataRestController.class})
public class CpsRestExceptionHandler {
@@ -71,6 +73,7 @@
private static ResponseEntity<Object> buildErrorResponse(final HttpStatus status, final String message,
final String details) {
+ log.error("An error has occurred : {} Status: {} Details: {}", message, status, details);
final ErrorMessage errorMessage = new ErrorMessage();
errorMessage.setStatus(status.toString());
errorMessage.setMessage(message);
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 b96480a..8743b7d 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
@@ -25,8 +25,8 @@
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.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -46,8 +46,8 @@
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+@Slf4j
public class YangUtils {
- private static final Logger LOGGER = Logger.getLogger(YangUtils.class.getName());
private YangUtils() {
throw new IllegalStateException("Utility class");
@@ -103,7 +103,7 @@
} else if (normalizedNode instanceof LeafSetNode) {
inspectLeafList(currentFragment, (LeafSetNode) normalizedNode);
} else {
- LOGGER.warning("Cannot normalize " + normalizedNode.getClass());
+ log.warn("Cannot normalize " + normalizedNode.getClass());
}
}