Merge "lowered code smells"

diff --combined ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
index 89e8fe7,b7d3cc7..6bb5b69
--- 1/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
--- 2/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
@@@ -4,6 -4,8 +4,8 @@@
   * ===================================================================
   * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   * ===================================================================
+  *  Modification Copyright © 2020 IBM.
+  * ===================================================================
   *
   * Unless otherwise specified, all software contained herein is licensed
   * under the Apache License, Version 2.0 (the "License");
@@@ -39,10 -41,15 +41,10 @@@ package org.onap.portalapp.portal.contr
  
  import java.util.List;
  
 -import java.util.Set;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
 -import javax.validation.ConstraintViolation;
  import javax.validation.Valid;
 -import javax.validation.Validation;
 -import javax.validation.Validator;
 -import javax.validation.ValidatorFactory;
  import org.onap.portalapp.controller.EPRestrictedBaseController;
  import org.onap.portalapp.portal.domain.MicroserviceData;
  import org.onap.portalapp.portal.domain.WidgetCatalog;
@@@ -64,6 -71,10 +66,10 @@@ import org.springframework.http.Respons
  import org.springframework.web.bind.annotation.PathVariable;
  import org.springframework.web.bind.annotation.RequestBody;
  import org.springframework.web.bind.annotation.RequestMapping;
+ import org.springframework.web.bind.annotation.GetMapping;
+ import org.springframework.web.bind.annotation.PostMapping;
+ import org.springframework.web.bind.annotation.PutMapping;
+ import org.springframework.web.bind.annotation.DeleteMapping;
  import org.springframework.web.bind.annotation.RequestMethod;
  import org.springframework.web.bind.annotation.RestController;
  import org.springframework.web.client.RestTemplate;
@@@ -85,7 -96,7 +91,7 @@@ public class MicroserviceController ext
        @Autowired
        private MicroserviceService microserviceService;
  
-       @RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.POST)
+       @PostMapping(value = { "/portalApi/microservices" })
        public PortalRestResponse<String> createMicroservice(HttpServletRequest request, HttpServletResponse response,
                        @Valid @RequestBody MicroserviceData newServiceData) throws Exception {
                if (newServiceData == null) {
@@@ -108,13 -119,13 +114,13 @@@
                return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
        }
  
-       @RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.GET)
+       @GetMapping(value = { "/portalApi/microservices" })
        public List<MicroserviceData> getMicroservice(HttpServletRequest request, HttpServletResponse response)
                        throws Exception {
                return microserviceService.getMicroserviceData();
        }
  
-       @RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.PUT)
+       @PutMapping(value = { "/portalApi/microservices/{serviceId}" })
        public PortalRestResponse<String> updateMicroservice(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("serviceId") long serviceId, @Valid @RequestBody MicroserviceData newServiceData) {
  
@@@ -135,7 -146,7 +141,7 @@@
                return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
        }
        
-       @RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.DELETE)
+       @DeleteMapping(value = { "/portalApi/microservices/{serviceId}" })
        public PortalRestResponse<String> deleteMicroservice(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("serviceId") long serviceId) {
                try {