import static org.junit.Assert.assertEquals;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.dao.DaoParameters;
*/
public class AuthorativeToscaProviderReferenceTest {
private static PfDao pfDao;
- private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ private static final StandardCoder coder = new StandardCoder();
// @formatter:off
private static final String[] EXAMPLE_POLICY_TYPES = {
* Populate the database.
*
* @throws PfModelException on database exceptions
+ * @throws CoderException on JSON encoding/decoding errors
*/
@BeforeClass
- public static void beforeFillDatabase() throws PfModelException {
+ public static void beforeFillDatabase() throws PfModelException, CoderException {
for (String policyTypeDataString : EXAMPLE_POLICY_TYPES) {
String[] policyTypeDataArray = policyTypeDataString.split("#");
String policyTypeYamlDefinition = ResourceUtils.getResourceAsString(policyTypeDataArray[2]);
Object yamlObject = new Yaml().load(policyTypeYamlDefinition);
- String policyTypeJsonDefinition = gson.toJson(yamlObject);
+ String policyTypeJsonDefinition = coder.encode(yamlObject);
- ToscaServiceTemplate serviceTemplate = gson.fromJson(policyTypeJsonDefinition, ToscaServiceTemplate.class);
+ ToscaServiceTemplate serviceTemplate = coder.decode(policyTypeJsonDefinition, ToscaServiceTemplate.class);
policyTypeMap.put(new ToscaEntityKey(policyTypeDataArray[0], policyTypeDataArray[1]), serviceTemplate);
new AuthorativeToscaProvider().createPolicyTypes(pfDao, serviceTemplate);
}
}
@Test
- public void testPolicyTypeRead() throws PfModelException {
+ public void testPolicyTypeRead() throws PfModelException, CoderException {
for (Entry<ToscaEntityKey, ToscaServiceTemplate> policyTypeMapEntry : policyTypeMap.entrySet()) {
ToscaServiceTemplate serviceTemplate = new AuthorativeToscaProvider().getPolicyTypes(pfDao,
policyTypeMapEntry.getKey().getName(), policyTypeMapEntry.getKey().getVersion());
assertEquals(1, serviceTemplate.getPolicyTypes().size());
- String originalJson = gson.toJson(policyTypeMapEntry.getValue());
- String databaseJson = gson.toJson(serviceTemplate);
+ String originalJson = coder.encode(policyTypeMapEntry.getValue());
+ String databaseJson = coder.encode(serviceTemplate);
// TODO: This test has no chance of passing yet but must eventually pass to prove that the policy types
// TODO: that were retrieved are the same as the policy types that were stored
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import com.google.gson.GsonBuilder;
-
import java.net.URISyntaxException;
import java.util.Base64;
import java.util.List;
private void testYamlStringPolicyPersistence(final String policyString) throws Exception {
Object yamlObject = new Yaml().load(policyString);
- String yamlAsJsonString = new GsonBuilder().setPrettyPrinting().create().toJson(yamlObject);
+ String yamlAsJsonString = new StandardCoder().encode(yamlObject);
testJsonStringPolicyPersistence(yamlAsJsonString);
}
ToscaServiceTemplate gotToscaServiceTemplate =
databaseProvider.getPolicies(policy.getName(), policy.getVersion());
- assertEquals(gotToscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0)
- .get(policy.getName()).getType(), policy.getType());
+ assertEquals(policy.getType(), gotToscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0)
+ .get(policy.getName()).getType());
gotToscaServiceTemplate = databaseProvider.getFilteredPolicies(ToscaPolicyFilter.builder().build());
- assertEquals(getToscaPolicyFromMapList(gotToscaServiceTemplate.getToscaTopologyTemplate().getPolicies(),
- policy.getName()).getType(), policy.getType());
+ assertEquals(policy.getType(),
+ getToscaPolicyFromMapList(gotToscaServiceTemplate.getToscaTopologyTemplate().getPolicies(),
+ policy.getName()).getType());
gotToscaServiceTemplate = databaseProvider.getFilteredPolicies(
ToscaPolicyFilter.builder().name(policy.getName()).version(policy.getVersion()).build());
- assertEquals(gotToscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0)
- .get(policy.getName()).getType(), policy.getType());
+ assertEquals(policy.getType(), gotToscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0)
+ .get(policy.getName()).getType());
}
}
}
String policyName) {
ToscaPolicy toscaPolicy = new ToscaPolicy();
for (Map<String, ToscaPolicy> policyMap : toscaPolicyMapList) {
- if (policyMap.get(policyName) != null) {
- toscaPolicy = policyMap.get(policyName);
+ toscaPolicy = policyMap.get(policyName);
+ if (toscaPolicy != null) {
break;
}
}
private void createPolicyTypes() throws CoderException, PfModelException, URISyntaxException {
Set<String> policyTypeResources = ResourceUtils.getDirectoryContents("policytypes");
- for (String policyTyoeResource : policyTypeResources) {
- Object yamlObject = new Yaml().load(ResourceUtils.getResourceAsString(policyTyoeResource));
+ for (String policyTypeResource : policyTypeResources) {
+ Object yamlObject = new Yaml().load(ResourceUtils.getResourceAsString(policyTypeResource));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import com.google.gson.GsonBuilder;
-
import java.util.Base64;
import java.util.List;
import java.util.Set;
private void testYamlStringPolicyTypePersistence(final String policyTypeString) throws Exception {
Object yamlObject = new Yaml().load(policyTypeString);
- String yamlAsJsonString = new GsonBuilder().setPrettyPrinting().create().toJson(yamlObject);
+ String yamlAsJsonString = new StandardCoder().encode(yamlObject);
testJsonStringPolicyTypePersistence(yamlAsJsonString);
}
assertNotNull(serviceTemplate);
ToscaPolicyType inPolicyType = serviceTemplate.getPolicyTypes().values().iterator().next();
- try {
- databaseProvider.createPolicyTypes(serviceTemplate);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ databaseProvider.createPolicyTypes(serviceTemplate);
+ checkPolicyTypePersistence(inPolicyType);
+
databaseProvider.updatePolicyTypes(serviceTemplate);
+ checkPolicyTypePersistence(inPolicyType);
+ }
+ private void checkPolicyTypePersistence(ToscaPolicyType inPolicyType) throws PfModelException {
List<ToscaPolicyType> policyTypeList =
databaseProvider.getPolicyTypeList(inPolicyType.getName(), inPolicyType.getVersion());
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2020 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=========================================================
+-->
+
+<configuration>
+
+ <contextName>PolicyModels</contextName>
+ <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
+ <property name="LOG_DIR" value="${java.io.tmpdir}/pf_logging/" />
+
+ <!-- USE FOR STD OUTPUT ONLY -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${LOG_DIR}/policy-models.log</file>
+ <encoder>
+ <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
+ %logger{26} - %msg %n %ex{full}</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.onap.policy" level="info" additivity="false">
+ <appender-ref ref="STDOUT" />
+ </logger>
+</configuration>
<!--
============LICENSE_START=======================================================
Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ Modifications Copyright (C) 2020 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=========================================================
-->
<configuration>
- <contextName>Apex</contextName>
+ <contextName>PolicyModels</contextName>
<statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
<property name="LOG_DIR" value="${java.io.tmpdir}/pf_logging/" />
</root>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_DIR}/apex.log</file>
+ <file>${LOG_DIR}/policy-models.log</file>
<encoder>
<pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
%logger{26} - %msg %n %ex{full}</pattern>
Code Review / policy / models.git / commitdiff