Merge "Added check of callback URL in service registration"

diff --combined policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
index 19e0425,3bc231f..7015e81
--- 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
@@@ -184,7 -184,7 +184,7 @@@ public class ApplicationTest 
              ric.getLock().lockBlocking(LockType.EXCLUSIVE);
              ric.getLock().unlockBlocking();
              assertThat(ric.getLock().getLockCounter()).isEqualTo(0);
 -            assertThat(ric.getState()).isEqualTo(Ric.RicState.IDLE);
 +            assertThat(ric.getState()).isEqualTo(Ric.RicState.AVAILABLE);
          }
      }
  
@@@ -211,7 -211,7 +211,7 @@@
  
      @Test
      public void testSynchronization() throws Exception {
 -        addRic("ric").setState(Ric.RicState.UNDEFINED);
 +        addRic("ric").setState(Ric.RicState.UNAVAILABLE);
          String ricName = "ric";
          Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName);
  
@@@ -222,7 -222,7 +222,7 @@@
          Policy policy = addPolicy(policyId, "typeName", "service", ricName); // This should be created in the RIC
          supervision.checkAllRics(); // The created policy should be put in the RIC
          await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ricName).getState()));
 -        await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic(ricName).getState()));
 +        await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ricName).getState()));
  
          Policies ricPolicies = getA1Client(ricName).getPolicies();
          assertThat(ricPolicies.size()).isEqualTo(1);
@@@ -266,7 -266,7 +266,7 @@@
  
          String url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
          final String policyBody = jsonString();
 -        this.rics.getRic(ricName).setState(Ric.RicState.IDLE);
 +        this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE);
  
          restClient().put(url, policyBody).block();
  
@@@ -290,7 -290,7 +290,7 @@@
          url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
          this.rics.getRic(ricName).setState(Ric.RicState.SYNCHRONIZING);
          testErrorCode(restClient().put(url, policyBody), HttpStatus.LOCKED);
 -        this.rics.getRic(ricName).setState(Ric.RicState.IDLE);
 +        this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE);
      }
  
      @Test
@@@ -558,6 -558,8 +558,8 @@@
          testErrorCode(restClient().put("/service", "crap"), HttpStatus.BAD_REQUEST);
          testErrorCode(restClient().put("/service", "{}"), HttpStatus.BAD_REQUEST);
          testErrorCode(restClient().put("/service", createServiceJson("name", -123)), HttpStatus.BAD_REQUEST);
+         testErrorCode(restClient().put("/service", createServiceJson("name", 0, "missing.portandprotocol.com")),
+             HttpStatus.BAD_REQUEST);
  
          // GET non existing servive
          testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND);
@@@ -611,7 -613,11 +613,11 @@@
      }
  
      private String createServiceJson(String name, long keepAliveIntervalSeconds) {
-         ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, "callbackUrl");
+         return createServiceJson(name, keepAliveIntervalSeconds, "https://examples.javacodegeeks.com/core-java/");
+     }
+ 
+     private String createServiceJson(String name, long keepAliveIntervalSeconds, String url) {
+         ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, url);
  
          String json = gson.toJson(service);
          return json;
@@@ -718,7 -724,7 +724,7 @@@
              .controllerName("") //
              .build();
          Ric ric = new Ric(conf);
 -        ric.setState(Ric.RicState.IDLE);
 +        ric.setState(Ric.RicState.AVAILABLE);
          this.rics.put(ric);
          return ric;
      }