aboutsummaryrefslogtreecommitdiffstats
path: root/appc-inbound/appc-design-services/provider/src/main/java
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-02-18 01:39:30 -0800
committerTakamune Cho <takamune.cho@att.com>2019-02-19 16:51:08 +0000
commit18e906c444f39b4df933ae9570dc4ee5df5e36df (patch)
treea63448090e10565ecdd55e1de9696a66b3512127 /appc-inbound/appc-design-services/provider/src/main/java
parentdfa107152577e88749eb5344a861279d09499ad4 (diff)
Correct line indent spacing
The indent spacing was incorrectly changed to 2 spaces instead of 4 by https://gerrit.onap.org/r/#/c/78396/ The incorrect spacing change was causing merge conflicts in another commit. Change-Id: I6693b3bfaa5685318c8ada5d7984235c788b9504 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1420
Diffstat (limited to 'appc-inbound/appc-design-services/provider/src/main/java')
-rw-r--r--appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java96
1 files changed, 48 insertions, 48 deletions
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java
index 4340acca9..5d0154cdf 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java
@@ -35,64 +35,64 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class XResponseProcessor {
- private final EELFLogger log = EELFManager.getInstance().getLogger(XInterfaceService.class);
- Dme2Client dme2Client;
+ private final EELFLogger log = EELFManager.getInstance().getLogger(XInterfaceService.class);
+ Dme2Client dme2Client;
- public static XResponseProcessor getInstance() {
- return new XResponseProcessor();
- }
+ public static XResponseProcessor getInstance() {
+ return new XResponseProcessor();
+ }
- public String parseResponse(String execute, String action) throws Exception {
- ObjectMapper objectMapper = new ObjectMapper();
- JsonNode payloadObject = objectMapper.readTree(execute);
- log.info("payloadObject " + payloadObject);
+ public String parseResponse(String execute, String action) throws Exception {
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode payloadObject = objectMapper.readTree(execute);
+ log.info("payloadObject " + payloadObject);
- // String queryParam = null;
- String instarResponse = null;
- HashMap<String, String> payload = null;
- String ipAddress = null;
- String mask = null;
+ // String queryParam = null;
+ String instarResponse = null;
+ HashMap<String, String> payload = null;
+ String ipAddress = null;
+ String mask = null;
- try {
+ try {
- // check the payload whether its having ipaddr along with subnet
- ipAddress = payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS) != null
- ? payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS).textValue()
- : (payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS) != null)
- ? payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS).textValue()
- .toUpperCase()
- : null;
+ // check the payload whether its having ipaddr along with subnet
+ ipAddress = payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS) != null
+ ? payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS).textValue()
+ : (payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS) != null)
+ ? payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS).textValue()
+ .toUpperCase()
+ : null;
- mask = payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK) != null
- ? payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK).textValue()
- : (payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK) != null)
- ? payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK).textValue().toUpperCase()
- : null;
+ mask = payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK) != null
+ ? payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK).textValue()
+ : (payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK) != null)
+ ? payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK).textValue().toUpperCase()
+ : null;
- // TODO -short format
+ // TODO -short format
- /*
- * if (mask != null) { queryParam = ipAddress + "," +mask ;
- * log.info("Calling Instar with IpAddress "+ ipAddress + " Mask value: "+ mask ); } else {
- * queryParam = "ipAddress "+ipAddress ; log.info("Calling Instar with IpAddress "+
- * ipAddress); }
- */
+ /*
+ * if (mask != null) { queryParam = ipAddress + "," +mask ;
+ * log.info("Calling Instar with IpAddress "+ ipAddress + " Mask value: "+ mask ); } else {
+ * queryParam = "ipAddress "+ipAddress ; log.info("Calling Instar with IpAddress "+
+ * ipAddress); }
+ */
- payload = new HashMap<String, String>();
- payload.put("ipAddress", ipAddress);
- payload.put("mask", mask);
- log.info("Calling Instar with IpAddress " + ipAddress + " Mask value: " + mask);
- dme2Client = new Dme2Client("getVnfbyIpadress", "payload", payload);
+ payload = new HashMap<String, String>();
+ payload.put("ipAddress", ipAddress);
+ payload.put("mask", mask);
+ log.info("Calling Instar with IpAddress " + ipAddress + " Mask value: " + mask);
+ dme2Client = new Dme2Client("getVnfbyIpadress", "payload", payload);
- instarResponse = dme2Client.send();
+ instarResponse = dme2Client.send();
- log.debug("Resposne from Instar = " + instarResponse);
- if (instarResponse == null || instarResponse.length() < 0)
- throw new Exception("No Data received from Instar for this action " + action);
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
+ log.debug("Resposne from Instar = " + instarResponse);
+ if (instarResponse == null || instarResponse.length() < 0)
+ throw new Exception("No Data received from Instar for this action " + action);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ }
+ return instarResponse;
}
- return instarResponse;
- }
}