Merge "Remove Sonar issues"

diff --combined policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
index a1972f6,7618306..d856c8a
--- 1/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
--- 2/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@@ -81,7 -81,6 +81,7 @@@ import org.springframework.context.Appl
  import org.springframework.context.annotation.Bean;
  import org.springframework.http.HttpStatus;
  import org.springframework.http.ResponseEntity;
 +import org.springframework.test.context.TestPropertySource;
  import org.springframework.test.context.junit.jupiter.SpringExtension;
  import org.springframework.web.reactive.function.client.WebClientResponseException;
  
@@@ -91,10 -90,6 +91,10 @@@ import reactor.util.annotation.Nullable
  
  @ExtendWith(SpringExtension.class)
  @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 +@TestPropertySource(
 +    properties = { //
 +        "server.ssl.key-store=./config/keystore.jks", //
 +        "app.webclient.trust-store=./config/truststore.jks"})
  class ApplicationTest {
      private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class);
  
@@@ -337,7 -332,7 +337,7 @@@
  
          url = "/policies";
          String rsp = restClient().get(url).block();
-         assertThat(rsp.contains(policyInstanceId)).as("Response contains policy instance ID.").isTrue();
+         assertThat(rsp).contains(policyInstanceId).as("Response contains policy instance ID.");
  
          url = "/policy?id=" + policyInstanceId;
          rsp = restClient().get(url).block();
@@@ -408,7 -403,7 +408,7 @@@
          assertThat(info.size()).isEqualTo(1);
          PolicyInfo policyInfo = info.get(0);
          assertThat(policyInfo.id).isEqualTo("id1");
-         assertThat(policyInfo.type).isEqualTo("");
+         assertThat(policyInfo.type).isEmpty();
      }
  
      @Test
@@@ -602,7 -597,7 +602,7 @@@
          // GET (all)
          url = "/services";
          rsp = restClient().get(url).block();
-         assertThat(rsp.contains(serviceName)).as("Response contains service name").isTrue();
+         assertThat(rsp).contains(serviceName).as("Response contains service name");
          logger.info(rsp);
  
          // Keep alive