* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
import org.apache.commons.io.IOUtils;
import org.onap.policy.rest.XACMLRestProperties;
import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.utils.CryptoUtils;
import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.onap.policy.xacml.api.pap.OnapPDP;
import org.onap.policy.xacml.api.pap.OnapPDPGroup;
import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier;
import org.onap.policy.xacml.std.pap.StdPDPPolicy;
import org.onap.policy.xacml.std.pap.StdPDPStatus;
+
import com.att.research.xacml.api.pap.PAPException;
import com.att.research.xacml.api.pap.PDPPolicy;
import com.att.research.xacml.api.pap.PDPStatus;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.CollectionType;
+
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
* Set up link with PAP Servlet and get our initial set of Groups
* @throws Exception
*/
- public RESTfulPAPEngine (String myURLString) throws PAPException, IOException {
+ public RESTfulPAPEngine (String myURLString) throws PAPException {
//
// Get our URL to the PAP servlet
//
@Override
public void newGroup(String name, String description)
- throws PAPException, NullPointerException {
+ throws PAPException {
String escapedName = null;
String escapedDescription = null;
try {
@Override
public void removeGroup(OnapPDPGroup group, OnapPDPGroup newGroup)
- throws PAPException, NullPointerException {
+ throws PAPException {
String moveToGroupString = null;
if (newGroup != null) {
moveToGroupString = "movePDPsToGroupId=" + newGroup.getId();
}
@Override
- public void newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws PAPException,
- NullPointerException {
+ public void newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws PAPException {
StdPDP newPDP = new StdPDP(id, name, description, jmxport);
sendToPAP("PUT", newPDP, null, null, groupID + group.getId(), "pdpId=" + id);
return;
HttpURLConnection connection = null;
String papID = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID);
LOGGER.info("User Id is " + papID);
- String papPass = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS);
+ String papPass = CryptoUtils.decryptTxtNoExStr(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS));
Base64.Encoder encoder = Base64.getEncoder();
String encoding = encoder.encodeToString((papID+":"+papPass).getBytes(StandardCharsets.UTF_8));
Object contentObj = content;
try {
String fullURL = papServletURLString;
if (parameters != null && parameters.length > 0) {
- String queryString = "";
+ StringBuilder queryString = new StringBuilder();
for (String p : parameters) {
- queryString += "&" + p;
+ queryString.append("&" + p);
}
fullURL += "?" + queryString.substring(1);
}
final CollectionType javaType =
mapper.getTypeFactory().constructCollectionType(collectionTypeClass, responseContentClass);
- Object objectFromJSON = mapper.readValue(json, javaType);
- return objectFromJSON;
+ return mapper.readValue(json, javaType);
} else {
// single value object expected
- Object objectFromJSON = mapper.readValue(json, responseContentClass);
- return objectFromJSON;
+ return mapper.readValue(json, responseContentClass);
}
}
LOGGER.error("No Location header to redirect to when response code="+connection.getResponseCode());
throw new IOException("No redirect Location header when response code="+connection.getResponseCode());
}
- int qIndex = newURL.indexOf("?");
+ int qIndex = newURL.indexOf('?');
if (qIndex > 0) {
newURL = newURL.substring(0, qIndex);
}