Merge "Make URL configurable in REST Requestor/Client"

7 files changed, 231 insertions, 22 deletions

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java
index 8ada5e617..08467f0bd 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@
 
 package org.onap.policy.apex.plugins.event.carrier.restrequestor;
 
+import java.util.Properties;
+
 /**
  * This class holds a record of a REST request for the REST requestor plugin.
  *
@@ -29,6 +32,7 @@ public class ApexRestRequest {
     private long executionId;
     private String eventName;
     private Object event;
+    private Properties executionProperties;
     private long timestamp;
 
     /**
@@ -38,8 +42,10 @@ public class ApexRestRequest {
      * @param eventName the event name
      * @param event the event
      */
-    public ApexRestRequest(final long executionId, final String eventName, final Object event) {
+    public ApexRestRequest(final long executionId, final Properties executionProperties,
+            final String eventName, final Object event) {
         this.executionId = executionId;
+        this.executionProperties = executionProperties;
         this.eventName = eventName;
         this.event = event;
     }
@@ -72,6 +78,15 @@ public class ApexRestRequest {
     }
 
     /**
+     * Gets the executionProperties.
+     *
+     * @return the executionProperties
+     */
+    public Properties getExecutionProperties() {
+        return executionProperties;
+    }
+
+    /**
      * Gets the timestamp.
      *
      * @return the timestamp
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
index cd74e183a..f1024d0fc 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +27,16 @@ import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Optional;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -99,6 +104,8 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable {
     // The number of the next request runner thread
     private static long nextRequestRunnerThreadNo = 0;
 
+    private String untaggedUrl = null;
+
     @Override
     public void init(final String consumerName, final EventHandlerParameters consumerParameters,
                     final ApexEventReceiver incomingEventReceiver) throws ApexEventException {
@@ -241,6 +248,23 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable {
                     continue;
                 }
 
+                Properties inputExecutionProperties = restRequest.getExecutionProperties();
+                untaggedUrl = restConsumerProperties.getUrl();
+                if (inputExecutionProperties != null) {
+                    Set<String> names = restConsumerProperties.getKeysFromUrl();
+                    Set<String> inputProperty = inputExecutionProperties.stringPropertyNames();
+
+                    names.stream().map(key -> Optional.of(key)).forEach(op -> {
+                        op.filter(str -> inputProperty.contains(str))
+                                .orElseThrow(() -> new ApexEventRuntimeException(
+                                        "key\"" + op.get() + "\"specified on url \"" + restConsumerProperties.getUrl() +
+                                                "\"not found in execution properties passed by the current policy"));
+                    });
+
+                    untaggedUrl = names.stream().reduce(untaggedUrl,
+                            (acc, str) -> acc.replace("{" + str + "}", (String) inputExecutionProperties.get(str)));
+                }
+
                 // Set the time stamp of the REST request
                 restRequest.setTimestamp(System.currentTimeMillis());
 
@@ -332,12 +356,12 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable {
 
             try {
                 // Execute the REST request
-                final Response response = sendEventAsRestRequest();
+                final Response response = sendEventAsRestRequest(untaggedUrl);
 
                 // Check that the event request worked
                 if (!Response.Status.Family.familyOf(response.getStatus()).equals(Response.Status.Family.SUCCESSFUL)) {
                     final String errorMessage = "reception of response to \"" + request + "\" from URL \""
-                                    + restConsumerProperties.getUrl() + "\" failed with status code "
+                                    + untaggedUrl + "\" failed with status code "
                                     + response.getStatus() + " and message \"" + response.readEntity(String.class)
                                     + "\"";
                     throw new ApexEventRuntimeException(errorMessage);
@@ -349,7 +373,7 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable {
                 // Check there is content
                 if (eventJsonString == null || eventJsonString.trim().length() == 0) {
                     final String errorMessage = "received an enpty response to \"" + request + "\" from URL \""
-                                    + restConsumerProperties.getUrl() + "\"";
+                                    + untaggedUrl + "\"";
                     throw new ApexEventRuntimeException(errorMessage);
                 }
 
@@ -380,24 +404,24 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable {
          *
          * @return the response to the REST request
          */
-        public Response sendEventAsRestRequest() {
+        public Response sendEventAsRestRequest(String untaggedUrl) {
             switch (restConsumerProperties.getHttpMethod()) {
                 case GET:
-                    return client.target(restConsumerProperties.getUrl()).request(APPLICATION_JSON)
+                    return client.target(untaggedUrl).request(APPLICATION_JSON)
                                     .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap()).get();
 
                 case PUT:
-                    return client.target(restConsumerProperties.getUrl()).request(APPLICATION_JSON)
+                    return client.target(untaggedUrl).request(APPLICATION_JSON)
                                     .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap())
                                     .put(Entity.json(request.getEvent()));
 
                 case POST:
-                    return client.target(restConsumerProperties.getUrl()).request(APPLICATION_JSON)
+                    return client.target(untaggedUrl).request(APPLICATION_JSON)
                                     .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap())
                                     .post(Entity.json(request.getEvent()));
 
                 case DELETE:
-                    return client.target(restConsumerProperties.getUrl()).request(APPLICATION_JSON)
+                    return client.target(untaggedUrl).request(APPLICATION_JSON)
                                     .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap()).delete();
 
                 default:
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
index bbe61f3fe..59a9ac971 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,7 +160,8 @@ public class ApexRestRequestorProducer implements ApexEventProducer {
 
             // Use the consumer to handle this event
             final ApexRestRequestorConsumer restRequstConsumer = (ApexRestRequestorConsumer) consumer;
-            restRequstConsumer.processRestRequest(new ApexRestRequest(executionId, eventName, event));
+            restRequstConsumer.processRestRequest(new ApexRestRequest(
+                executionId, executionProperties, eventName, event));
 
             eventsSent++;
         } else {
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParameters.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParameters.java
index 9bff0e2e4..d583b790e 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParameters.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParameters.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,10 @@
 package org.onap.policy.apex.plugins.event.carrier.restrequestor;
 
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
@@ -78,8 +83,12 @@ public class RestRequestorCarrierTechnologyParameters extends CarrierTechnologyP
     private HttpMethod httpMethod = null;
     private String[][] httpHeaders = null;
 
+    private static final Pattern patternProperKey = Pattern.compile("(?<=\\{)[^}]*(?=\\})");
+    private static final Pattern patternErrorKey = Pattern.compile(
+        "(\\{[^\\{}]*.?\\{)|(\\{[^\\{}]*$)|(\\}[^\\{}]*.?\\})|(^[^\\{}]*.?\\})|\\{\\s*\\}");
+
     /**
-     * Constructor to create a REST carrier technology parameters instance and regiaaaster the instance with the
+     * Constructor to create a REST carrier technology parameters instance and register the instance with the
      * parameter service.
      */
     public RestRequestorCarrierTechnologyParameters() {
@@ -175,6 +184,36 @@ public class RestRequestorCarrierTechnologyParameters extends CarrierTechnologyP
     }
 
     /**
+     * Get the tag for the REST Producer Properties.
+     *
+     * @return set of the tags
+     */
+    public Set<String> getKeysFromUrl() {
+        Matcher matcher = patternProperKey.matcher(this.url);
+        Set<String> key = new HashSet<>();
+        while (matcher.find()) {
+            key.add(matcher.group());
+        }
+        return key;
+    }
+
+    /**
+     * Validate tags in url.
+     * http://www.blah.com/{par1/somethingelse (Missing end tag) use  {[^\\{}]*$
+     * http://www.blah.com/{par1/{some}thingelse (Missing end tag2) use {[^}]*{
+     * http://www.blah.com/{par1}/some}thingelse (Missing start tag1) use }[^{}]*.}
+     * http://www.blah.com/par1}/somethingelse (Missing start tag2) use }[^{}]*}
+     * http://www.blah.com/{}/somethingelse (Empty tag) use {[\s]*}
+     *
+     * @return if url is legal
+     */
+    public boolean validateTagInUrl() {
+        // Check url tag syntax error
+        Matcher matcher = patternErrorKey.matcher(this.url);
+        return (!matcher.find());
+    }
+
+    /**
      * {@inheritDoc}.
      */
     @Override
@@ -201,6 +240,12 @@ public class RestRequestorCarrierTechnologyParameters extends CarrierTechnologyP
             }
         }
 
+        if (!validateTagInUrl()) {
+            result.setResult("url", ValidationStatus.INVALID,
+                "no proper URL has been set for event sending on REST client");
+        }
+
+
         return result;
     }
 
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestTest.java
index 559d2dba8..dc55c06f7 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestTest.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -24,6 +25,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import java.util.Properties;
+
 /**
  * Test the ApexRestRequest class.
  */
@@ -34,11 +37,14 @@ public class ApexRestRequestTest {
         final String eventName = "EventName";
         final String eventString = "The Event String";
 
-        ApexRestRequest rr = new ApexRestRequest(1, eventName, eventString);
+        Properties properties = new Properties();
+        properties.put("key", "value");
+        ApexRestRequest rr = new ApexRestRequest(1, properties, eventName, eventString);
 
         assertEquals(1, rr.getExecutionId());
         assertEquals(eventName, rr.getEventName());
         assertEquals(eventString, rr.getEvent());
+        assertEquals(properties, rr.getExecutionProperties());
 
         rr.setTimestamp(1234567);
         assertEquals(1234567, rr.getTimestamp());
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
index 44e020381..ac1af67dd 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -28,9 +29,12 @@ import org.junit.Test;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventReceiver;
+import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode;
 
+import java.util.Properties;
+
 /**
  * Test the ApexRestRequestorConsumer class.
  *
@@ -125,7 +129,7 @@ public class ApexRestRequestorConsumerTest {
         try {
             consumer.init(consumerName, consumerParameters, incomingEventReceiver);
             consumer.start();
-            ApexRestRequest request = new ApexRestRequest(123, "EventName", "Event body");
+            ApexRestRequest request = new ApexRestRequest(123, null,"EventName", "Event body");
             consumer.processRestRequest(request);
             ThreadUtilities.sleep(2000);
             consumer.stop();
@@ -134,4 +138,67 @@ public class ApexRestRequestorConsumerTest {
             fail("test should not throw an exception");
         }
     }
+
+    @Test
+    public void testApexRestRequestorConsumerUrlUpdate() {
+        ApexRestRequestorConsumer consumer = new ApexRestRequestorConsumer();
+        assertNotNull(consumer);
+
+        String consumerName = "ConsumerName";
+
+        EventHandlerParameters consumerParameters = new EventHandlerParameters();
+        ApexEventReceiver incomingEventReceiver = null;
+        RestRequestorCarrierTechnologyParameters rrctp = new RestRequestorCarrierTechnologyParameters();
+        consumerParameters.setCarrierTechnologyParameters(rrctp);
+        consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
+        rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
+
+        rrctp.setUrl("http://www.{site}.{site}.{net}");
+        consumerParameters.setPeerTimeout(EventHandlerPeeredMode.REQUESTOR, 2000);
+        Properties properties = new Properties();
+        properties.put("site", "onap");
+        properties.put("net", "org");
+        try {
+            consumer.init(consumerName, consumerParameters, incomingEventReceiver);
+            consumer.start();
+            ApexRestRequest request = new ApexRestRequest(123, properties,"EventName", "Event body");
+            consumer.processRestRequest(request);
+            ThreadUtilities.sleep(2000);
+            consumer.stop();
+            assertEquals(0, consumer.getEventsReceived());
+        } catch (Exception aee) {
+            fail("test should not throw an exception");
+        }
+    }
+
+    @Test
+    public void testApexRestRequestorConsumerUrlUpdateError() {
+        ApexRestRequestorConsumer consumer = new ApexRestRequestorConsumer();
+        assertNotNull(consumer);
+
+        String consumerName = "ConsumerName";
+
+        EventHandlerParameters consumerParameters = new EventHandlerParameters();
+        ApexEventReceiver incomingEventReceiver = null;
+        RestRequestorCarrierTechnologyParameters rrctp = new RestRequestorCarrierTechnologyParameters();
+        consumerParameters.setCarrierTechnologyParameters(rrctp);
+        consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
+        rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
+
+        rrctp.setUrl("http://www.{site}.{net}");
+        consumerParameters.setPeerTimeout(EventHandlerPeeredMode.REQUESTOR, 2000);
+        Properties properties = new Properties();
+        properties.put("site", "onap");
+        try {
+            consumer.init(consumerName, consumerParameters, incomingEventReceiver);
+            consumer.start();
+            ApexRestRequest request = new ApexRestRequest(123, properties,"EventName", "Event body");
+            consumer.processRestRequest(request);
+            ThreadUtilities.sleep(2000);
+            consumer.stop();
+            assertEquals(0, consumer.getEventsReceived());
+        } catch (Exception aee) {
+            fail("test should not throw an exception");
+        }
+    }
 }
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
index 7be42e264..68c6811b4 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -31,6 +32,8 @@ import org.onap.policy.apex.service.parameters.ApexParameterHandler;
 import org.onap.policy.apex.service.parameters.ApexParameters;
 import org.onap.policy.common.parameters.ParameterException;
 
+import java.util.Set;
+
 /**
  * Test REST Requestor carrier technology parameters.
  */
@@ -143,4 +146,51 @@ public class RestRequestorCarrierTechnologyParametersTest {
                         + "[url=http://some.where, httpMethod=DELETE, httpHeaders=[[aaa, bbb], [ccc, ddd]]]",
                         rrctp.toString());
     }
+
+    @Test
+    public void testUrlValidation() {
+        RestRequestorCarrierTechnologyParameters rrctp =
+            new RestRequestorCarrierTechnologyParameters();
+
+        rrctp.setUrl("http://some.where.no.tag.in.url");
+        assertEquals("http://some.where.no.tag.in.url", rrctp.getUrl());
+
+        String[][] httpHeaders = new String[2][2];
+        httpHeaders[0][0] = "aaa";
+        httpHeaders[0][1] = "bbb";
+        httpHeaders[1][0] = "ccc";
+        httpHeaders[1][1] = "ddd";
+
+        rrctp.setHttpHeaders(httpHeaders);
+        assertEquals("aaa", rrctp.getHttpHeaders()[0][0]);
+        assertEquals("bbb", rrctp.getHttpHeaders()[0][1]);
+        assertEquals("ccc", rrctp.getHttpHeaders()[1][0]);
+        assertEquals("ddd", rrctp.getHttpHeaders()[1][1]);
+
+        assertEquals(true, rrctp.validateTagInUrl());
+
+        rrctp.setUrl("http://{place}.{that}/is{that}.{one}");
+        assertEquals(true, rrctp.validateTagInUrl());
+
+        Set<String> keymap = rrctp.getKeysFromUrl();
+        assertEquals(true, keymap.contains("place"));
+        assertEquals(true, keymap.contains("that"));
+        assertEquals(true, keymap.contains("one"));
+
+        rrctp.setUrl("http://{place.{that}/{is}.{not}/{what}.{exist}");
+        assertEquals(false, rrctp.validateTagInUrl());
+        rrctp.setUrl("http://{place}.{that}/{is}.{not}/{what}.{exist");
+        assertEquals(false, rrctp.validateTagInUrl());
+        rrctp.setUrl("http://place.that/is.not/what.{exist");
+        assertEquals(false, rrctp.validateTagInUrl());
+        rrctp.setUrl("http://place}.{that}/{is}.{not}/{what}.{exist}");
+        assertEquals(false, rrctp.validateTagInUrl());
+        rrctp.setUrl("http://{place}.{that}/is}.{not}/{what}.{exist}");
+        assertEquals(false, rrctp.validateTagInUrl());
+        rrctp.setUrl("http://{place}.{that}/{}.{not}/{what}.{exist}");
+        assertEquals(false, rrctp.validateTagInUrl());
+        rrctp.setUrl("http://{place}.{that}/{ }.{not}/{what}.{exist}");
+        assertEquals(false, rrctp.validateTagInUrl());
+    }
+
 }