Remove code smells introduced in the latest commits.
Change-Id: I4b75545a2498364c44c30a8a3b13d38db91d18a5
Issue-ID: NONRTRIC-142
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
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.
* @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())
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_";
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);
}
}
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;
}
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), //
Flux<PolicyType> 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));
}
this.setRestErrorhandler();
String url = baseUrl() + "/ric?managedElementId=kista_1";
ResponseEntity<String> entity = this.restTemplate.getForEntity(url, String.class);
- assertThat(entity.getStatusCode().equals(HttpStatus.NOT_FOUND));
+ assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
}
@Test
this.setRestErrorhandler();
String urlWrongRic = baseUrl() + "/policy?type=type1&instance=instance1&ric=ricXXX&service=service1";
ResponseEntity<String> 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
// Keep alive
url = baseUrl() + "/services/keepalive?name=name";
ResponseEntity<String> 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);