From 2de65533ba065c8a8cad97949d22d04cc3cd6ad9 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Thu, 5 Mar 2020 08:43:04 +0100 Subject: [PATCH] Remove new code smells Remove code smells introduced in the latest commits. Change-Id: I4b75545a2498364c44c30a8a3b13d38db91d18a5 Issue-ID: NONRTRIC-142 Signed-off-by: elinuxhenrik --- .../ric/portal/dashboard/controller/Html5PathsController.java | 7 ++----- .../org/oransc/ric/portal/dashboard/model/EcompUserDetails.java | 2 +- .../src/main/java/org/oransc/policyagent/clients/OscA1Client.java | 3 ++- .../java/org/oransc/policyagent/tasks/RicSynchronizationTask.java | 7 ++++--- .../src/test/java/org/oransc/policyagent/ApplicationTest.java | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/Html5PathsController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/Html5PathsController.java index 20b8cc89..2385298e 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/Html5PathsController.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/Html5PathsController.java @@ -30,8 +30,7 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; /** * Listens for requests to known Angular routes. @@ -56,9 +55,7 @@ public class Html5PathsController { * @throws IOException * On error */ - @RequestMapping( - method = {RequestMethod.GET}, // - path = {"/policy"}) + @GetMapping("/policy") public void forwardAngularRoutes(HttpServletRequest request, HttpServletResponse response) throws IOException { URL url = new URL(request.getScheme(), request.getServerName(), request.getServerPort(), "/index.html"); if (logger.isDebugEnabled()) diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/EcompUserDetails.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/EcompUserDetails.java index 92ddc461..bfeb7d1e 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/EcompUserDetails.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/EcompUserDetails.java @@ -33,7 +33,7 @@ import org.springframework.security.core.userdetails.UserDetails; public class EcompUserDetails implements UserDetails { private static final long serialVersionUID = 1L; - private transient final EcompUser ecompUser; + private final transient EcompUser ecompUser; // This is the default Spring role-name prefix. private static final String ROLEP = "ROLE_"; diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java index c596bd59..1b7342f2 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java @@ -137,7 +137,8 @@ public class OscA1Client implements A1Client { schemaObj.put(TITLE, policyTypeId); return Mono.just(schemaObj.toString()); } catch (Exception e) { - logger.error("Unexpected response for policy type: {}, exception: {}", policyTypeResponse, e.toString()); + String exceptionString = e.toString(); + logger.error("Unexpected response for policy type: {}, exception: {}", policyTypeResponse, exceptionString); return Mono.error(e); } } diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java index 7c6e5caf..a664b26c 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java @@ -28,6 +28,7 @@ import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.clients.A1ClientFactory; import org.oransc.policyagent.clients.AsyncRestClient; import org.oransc.policyagent.repository.ImmutablePolicyType; +import org.oransc.policyagent.repository.Lock; import org.oransc.policyagent.repository.Lock.LockType; import org.oransc.policyagent.repository.Policies; import org.oransc.policyagent.repository.Policy; @@ -84,7 +85,7 @@ public class RicSynchronizationTask { } ric.getLock().lock(LockType.EXCLUSIVE) // Make sure no NBI updates are running - .flatMap(lock -> lock.unlock()) // + .flatMap(Lock::unlock) // .flatMap(lock -> this.a1ClientFactory.createA1Client(ric)) // .flatMapMany(client -> startSynchronization(ric, client)) // .subscribe(x -> logger.debug("Synchronize: {}", x), // @@ -132,11 +133,11 @@ public class RicSynchronizationTask { Flux recoverTypes = this.a1ClientFactory.createA1Client(ric) // .flatMapMany(a1Client -> synchronizePolicyTypes(ric, a1Client)); Flux deletePoliciesInRic = this.a1ClientFactory.createA1Client(ric) // - .flatMapMany(a1Client -> a1Client.deleteAllPolicies()) // + .flatMapMany(A1Client::deleteAllPolicies) // .doOnComplete(() -> deleteAllPoliciesInRepository(ric)); Flux.concat(recoverTypes, deletePoliciesInRic) // - .subscribe(x -> logger.debug("Brute recover: " + x), // + .subscribe(x -> logger.debug("Brute recover: ", x), // throwable -> onRecoveryError(ric, throwable), // () -> onSynchronizationComplete(ric)); } diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java index db5e2bdb..05485d7c 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -230,7 +230,7 @@ public class ApplicationTest { this.setRestErrorhandler(); String url = baseUrl() + "/ric?managedElementId=kista_1"; ResponseEntity entity = this.restTemplate.getForEntity(url, String.class); - assertThat(entity.getStatusCode().equals(HttpStatus.NOT_FOUND)); + assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } @Test @@ -273,7 +273,7 @@ public class ApplicationTest { this.setRestErrorhandler(); String urlWrongRic = baseUrl() + "/policy?type=type1&instance=instance1&ric=ricXXX&service=service1"; ResponseEntity entity = this.putForEntity(urlWrongRic, jsonString()); - assertThat(entity.getStatusCode().equals(HttpStatus.METHOD_NOT_ALLOWED)); + assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.METHOD_NOT_ALLOWED); Policy policy = policies.getPolicy("instance1"); assertThat(policy.ric().name()).isEqualTo("ric1"); // Not changed @@ -413,7 +413,7 @@ public class ApplicationTest { // Keep alive url = baseUrl() + "/services/keepalive?name=name"; ResponseEntity entity = this.restTemplate.postForEntity(url, null, String.class); - assertThat(entity.getStatusCode().equals(HttpStatus.OK)); + assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); // DELETE assertThat(services.size()).isEqualTo(1); -- 2.16.6