From 840eecbf7210d0433d94da895a3a11b97d3a4e6f Mon Sep 17 00:00:00 2001 From: "Rishi.Chail" Date: Mon, 15 Mar 2021 14:36:23 +0000 Subject: [PATCH] Fix code smells 1. removed typedefs annotation 2. chnaged final string constant name Issue-ID: CPS-89 Signed-off-by: Rishi.Chail Change-Id: I524aa8c13e8bb4c6a00d810c6e89b30a48f37d10 --- .../onap/cps/nfproxy/rest/exceptions/NfProxyRestExceptionHandler.java | 4 ++-- .../java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java | 4 ++-- cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntity.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/exceptions/NfProxyRestExceptionHandler.java mode change 100644 => 100755 cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java diff --git a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/exceptions/NfProxyRestExceptionHandler.java b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/exceptions/NfProxyRestExceptionHandler.java old mode 100644 new mode 100755 index ebcb0135e..ac35e9a1f --- a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/exceptions/NfProxyRestExceptionHandler.java +++ b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/exceptions/NfProxyRestExceptionHandler.java @@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; @RestControllerAdvice(assignableTypes = {NfProxyController.class}) public class NfProxyRestExceptionHandler { - private static final String checkLogsForDetails = "Check logs for details."; + private static final String CHECK_LOGS_FOR_DETAILS = "Check logs for details."; /** * Default exception handler. @@ -65,7 +65,7 @@ public class NfProxyRestExceptionHandler { errorMessage.setStatus(status.toString()); errorMessage.setMessage(exception.getMessage()); errorMessage.setDetails(exception instanceof CpsException ? ((CpsException) exception).getDetails() : - checkLogsForDetails); + CHECK_LOGS_FOR_DETAILS); return new ResponseEntity<>(errorMessage, status); } } 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 old mode 100644 new mode 100755 index 75a45320f..7719417c1 --- 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 @@ -42,7 +42,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; QueryRestController.class}) public class CpsRestExceptionHandler { - private static final String checkLogsForDetails = "Check logs for details."; + private static final String CHECK_LOGS_FOR_DETAILS = "Check logs for details."; private CpsRestExceptionHandler() { } @@ -88,7 +88,7 @@ public class CpsRestExceptionHandler { errorMessage.setStatus(status.toString()); errorMessage.setMessage(exception.getMessage()); errorMessage.setDetails(exception instanceof CpsException ? ((CpsException) exception).getDetails() : - checkLogsForDetails); + CHECK_LOGS_FOR_DETAILS); return new ResponseEntity<>(errorMessage, status); } } diff --git a/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntity.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntity.java index 53ceaaae1..74f75d1de 100755 --- a/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntity.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntity.java @@ -45,7 +45,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; -import org.hibernate.annotations.TypeDefs; /** * Entity to store a fragment. @@ -58,7 +57,7 @@ import org.hibernate.annotations.TypeDefs; @Builder @Entity @Table(name = "fragment") -@TypeDefs({@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)}) +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) public class FragmentEntity implements Serializable { private static final long serialVersionUID = 7737669789097119667L; -- 2.16.6