*/
@Before
public void setupParameters() throws PfModelException, CoderException {
+ // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB
+
PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters();
parameters.setDatabaseDriver("org.h2.Driver");
parameters.setDatabaseUrl("jdbc:h2:mem:testdb");
import lombok.Data;
+import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.tosca.legacy.mapping.LegacyGuardPolicyMapper;
import org.slf4j.Logger;
private String guardActiveEnd;
/**
- * Get contents as a map.
+ * Get contents as a property map.
*
* @return the contents as a map.
*/
public Map<String, String> getAsPropertyMap() {
final Map<String, String> propertyMap = new HashMap<>();
+ final StandardCoder coder = new StandardCoder();
+
try {
for (Field field : this.getClass().getDeclaredFields()) {
if (field.get(this) != null && field.getType().equals(String.class)) {
- propertyMap.put(field.getName(), (String)field.get(this));
+ propertyMap.put(field.getName(), coder.encode(field.get(this)));
}
}
} catch (Exception exc) {
return propertyMap;
}
+
+ /**
+ * Set the contents from a property map.
+ *
+ * @param propertyMap the incoming property map
+ */
+ public void setContent(final Map<String, String> propertyMap) {
+ final StandardCoder coder = new StandardCoder();
+
+ try {
+ // @formatter:off
+ setActor( coder.decode(propertyMap.get("actor"), String.class));
+ setClname( coder.decode(propertyMap.get("clname"), String.class));
+ setGuardActiveEnd( coder.decode(propertyMap.get("guardActiveEnd"), String.class));
+ setGuardActiveStart(coder.decode(propertyMap.get("guardActiveStart"), String.class));
+ setLimit( coder.decode(propertyMap.get("limit"), String.class));
+ setMax( coder.decode(propertyMap.get("max"), String.class));
+ setMin( coder.decode(propertyMap.get("min"), String.class));
+ setRecipe( coder.decode(propertyMap.get("recipe"), String.class));
+ setTargets( coder.decode(propertyMap.get("targets"), String.class));
+ setTimeUnits( coder.decode(propertyMap.get("timeUnits"), String.class));
+ setTimeWindow( coder.decode(propertyMap.get("timeWindow"), String.class));
+ // @formatter:on
+ } catch (Exception exc) {
+ String errorMessage = "could not convert content to a property map";
+ LOGGER.warn(errorMessage, exc);
+ throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage, exc);
+ }
+ }
}
*/
public class LegacyGuardPolicyMapper
implements JpaToscaServiceTemplateMapper<LegacyGuardPolicyInput, Map<String, LegacyGuardPolicyOutput>> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LegacyGuardPolicyMapper.class);
// Tag for metadata fields
private static final String POLICY_ID = "policy-id";
private static final String POLICY_VERSION = "policy-version";
- private static final Logger LOGGER = LoggerFactory.getLogger(LegacyGuardPolicyMapper.class);
-
private static final Map<String, PfConceptKey> GUARD_POLICY_TYPE_MAP = new LinkedHashMap<>();
static {
}
final LegacyGuardPolicyContent content = new LegacyGuardPolicyContent();
- // @formatter:off
- content.setActor( toscaPolicy.getProperties().get("actor"));
- content.setClname( toscaPolicy.getProperties().get("clname"));
- content.setGuardActiveEnd( toscaPolicy.getProperties().get("guardActiveEnd"));
- content.setGuardActiveStart(toscaPolicy.getProperties().get("guardActiveStart"));
- content.setLimit( toscaPolicy.getProperties().get("limit"));
- content.setMax( toscaPolicy.getProperties().get("max"));
- content.setMin( toscaPolicy.getProperties().get("min"));
- content.setRecipe( toscaPolicy.getProperties().get("recipe"));
- content.setTargets( toscaPolicy.getProperties().get("targets"));
- content.setTimeUnits( toscaPolicy.getProperties().get("timeUnits"));
- content.setTimeWindow( toscaPolicy.getProperties().get("timeWindow"));
- // @formatter:on
+ content.setContent(toscaPolicy.getProperties());
final Map<String, LegacyGuardPolicyContent> propertiesMap = new LinkedHashMap<>();
propertiesMap.put("content", content);
import javax.ws.rs.core.Response;
+import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy;
final Map<String, String> propertyMap = new HashMap<>();
toscaPolicy.setProperties(propertyMap);
- toscaPolicy.getProperties().put(CONTENT_PROPERTY, legacyOperationalPolicy.getContent());
+ try {
+ toscaPolicy.getProperties().put(CONTENT_PROPERTY,
+ new StandardCoder().encode(legacyOperationalPolicy.getContent()));
+ } catch (CoderException ce) {
+ String errorMessage = "encoding of property \"content\" to JSON failed";
+ LOGGER.warn(errorMessage, ce);
+ throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage, ce);
+ }
final JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setToscaDefinitionsVersion("tosca_simple_yaml_1_0");
throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
}
- final String content = toscaPolicy.getProperties().get(CONTENT_PROPERTY);
+ String content = null;
+ try {
+ content = new StandardCoder().decode(toscaPolicy.getProperties().get(CONTENT_PROPERTY), String.class);
+ } catch (CoderException ce) {
+ String errorMessage = "decoding of property \"content\" from JSON failed";
+ LOGGER.warn(errorMessage, ce);
+ throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage, ce);
+ }
+
if (content == null) {
String errorMessage = "property \"content\" not defined on TOSCA policy";
LOGGER.warn(errorMessage);
if (properties != null) {
Map<String, Object> propertyMap = new LinkedHashMap<>();
+ final StandardCoder coder = new StandardCoder();
+
for (Entry<String, String> entry : properties.entrySet()) {
try {
// TODO: This is a HACK, we need to validate the properties against their
// TODO: the policy type from the database and parsing the property value object correctly
// TODO: Here we are simply reading a JSON string from the database and deserializing the
// TODO: property value from JSON
- propertyMap.put(entry.getKey(), new StandardCoder().decode(entry.getValue(), Object.class));
+ propertyMap.put(entry.getKey(), coder.decode(entry.getValue(), Object.class));
} catch (CoderException ce) {
String errorMessage = "error decoding property JSON value read from database: key=" + entry.getKey()
+ ", value=" + entry.getValue();
if (toscaPolicy.getProperties() != null) {
properties = new LinkedHashMap<>();
+ final StandardCoder coder = new StandardCoder();
+
for (Entry<String, Object> propertyEntry : toscaPolicy.getProperties().entrySet()) {
// TODO: This is a HACK, we need to validate the properties against their
// TODO: their data type in their policy type definition in TOSCA, which means reading
// TODO: Here we are simply serializing the property value into a string and storing it
// TODO: unvalidated into the database
try {
- properties.put(propertyEntry.getKey(), new StandardCoder().encode(propertyEntry.getValue()));
+ properties.put(propertyEntry.getKey(), coder.encode(propertyEntry.getValue()));
} catch (CoderException ce) {
String errorMessage = "error encoding property JSON value for database: key="
+ propertyEntry.getKey() + ", value=" + propertyEntry.getValue();
for (JpaToscaPolicy policy : serviceTemplate.getTopologyTemplate().getPolicies().getAll(null)) {
verifyPolicyTypeForPolicy(dao, policy);
-
dao.create(policy);
}
ToscaUtils.assertPoliciesExist(serviceTemplate);
for (JpaToscaPolicy policy : serviceTemplate.getTopologyTemplate().getPolicies().getAll(null)) {
+ verifyPolicyTypeForPolicy(dao, policy);
dao.update(policy);
}
if (PfKey.NULL_KEY_VERSION.equals(policyTypeKey.getVersion())) {
policyType = getLatestPolicyTypeVersion(dao, policyTypeKey.getName());
+ policy.getType().setVersion(policyType.getKey().getVersion());
} else {
policyType = dao.get(JpaToscaPolicyType.class, policyTypeKey);
}
Code Review / policy / models.git / commitdiff