Add junit coverage to RequestInfoBuilder class

[appc.git] / appc-config / appc-flow-controller / provider / src / main / java / org / onap / appc / flow / controller / node / ResourceUriExtractor.java

diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java
index c36a74b..af65b12 100644 (file)
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java
@@ -2,13 +2,15 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2018 Nokia. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved. 
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
  * =============================================================================
  * 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
+ * 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,
@@ -22,68 +24,74 @@ package org.onap.appc.flow.controller.node;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.HTTP;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_CONTEXT;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_HOST_IP_ADDRESS;
-import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_PORT_NUMBER;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_SUB_CONTEXT;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_URL;
-
+import static org.onap.appc.flow.controller.utils.FlowControllerConstants.VNF_TYPE;
+import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PROTOCOL;
+import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PORT;
+import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_CONTEXT_URL;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.util.Properties;
 import org.apache.commons.lang.StringUtils;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 
 /**
  * Helper class for RestServiceNode
  */
 class ResourceUriExtractor {
 
-  private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class);
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class);
 
-  String extractResourceUri(SvcLogicContext ctx, Properties prop) throws Exception {
-    String resourceUri = ctx.getAttribute(INPUT_URL);
+    String extractResourceUri(SvcLogicContext ctx, Properties prop) throws Exception {
+        String resourceUri = ctx.getAttribute(INPUT_URL);
 
-    if (StringUtils.isBlank(resourceUri)) {
-      resourceUri = getAddress(ctx);
-      log.info("resourceUri= " + resourceUri);
-      resourceUri += getContext(ctx, prop);
-      log.info("resourceUri= " + resourceUri);
-      resourceUri += getSubContext(ctx, prop);
-    }
-    log.info("resourceUri= " + resourceUri);
+        if (StringUtils.isBlank(resourceUri)) {
+            resourceUri = getAddress(ctx, prop);
+            log.info("resourceUri= " + resourceUri);
+            resourceUri += getContext(ctx, prop);
+            log.info("resourceUri= " + resourceUri);
+            resourceUri += getSubContext(ctx, prop);
+        }
+        log.info("resourceUri= " + resourceUri);
 
-    return resourceUri;
-  }
+        return resourceUri;
+    }
 
-  private String getAddress(SvcLogicContext ctx) {
-    String address = ctx.getAttribute(INPUT_HOST_IP_ADDRESS);
-    String port = ctx.getAttribute(INPUT_PORT_NUMBER);
-    return HTTP + address + ":" + port;
-  }
+    private String getAddress(SvcLogicContext ctx, Properties prop) {
+        String address = ctx.getAttribute(INPUT_HOST_IP_ADDRESS);
+        String portPath = ctx.getAttribute(VNF_TYPE) + "." + (REST_PROTOCOL) + "."
+                + ctx.getAttribute(INPUT_REQUEST_ACTION) + "." + (REST_PORT);
+        String port = prop.getProperty(portPath);
+        return HTTP + address + ":" + port;
+    }
 
-  private String getContext(SvcLogicContext ctx, Properties prop) throws Exception {
-    String context;
-    if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_CONTEXT))) {
-      context = "/" + ctx.getAttribute(INPUT_CONTEXT);
-    } else if (prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".context") != null) {
-      context = "/" + prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".context");
-    } else {
-      throw new Exception("Could Not found the context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
+    private String getContext(SvcLogicContext ctx, Properties prop) throws Exception {
+        String context;
+        String urlPath = ctx.getAttribute(VNF_TYPE) + "." + REST_PROTOCOL + "." + ctx.getAttribute(INPUT_REQUEST_ACTION)
+                + "." + REST_CONTEXT_URL;
+        if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_CONTEXT))) {
+            context = "/" + ctx.getAttribute(INPUT_CONTEXT);
+        } else if (prop.getProperty(urlPath) != null) {
+            context = "/" + prop.getProperty(urlPath);
+        } else {
+            throw new Exception("Could not find the context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
+        }
+        return context;
     }
-    return context;
-  }
 
-  private String getSubContext(SvcLogicContext ctx, Properties prop) throws Exception {
-    String subContext;
-    if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_SUB_CONTEXT))) {
-      subContext = "/" + ctx.getAttribute(INPUT_SUB_CONTEXT);
-    } else if (prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context") != null) {
-      subContext = "/" + prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context");
-    } else {
-      throw new Exception("Could Not found the sub context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
+    private String getSubContext(SvcLogicContext ctx, Properties prop) throws Exception {
+        String subContext;
+        if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_SUB_CONTEXT))) {
+            subContext = "/" + ctx.getAttribute(INPUT_SUB_CONTEXT);
+        } else if (prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context") != null) {
+            subContext = "/" + prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context");
+        } else {
+            throw new Exception(
+                    "Could not find the sub context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
+        }
+        return subContext;
     }
-    return subContext;
-  }
 
-}
\ No newline at end of file
+}