aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/RollbackData.java127
-rw-r--r--bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/RollbackDataTest.java85
2 files changed, 145 insertions, 67 deletions
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/RollbackData.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/RollbackData.java
index 7ece05ea9e..64068d2b90 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/RollbackData.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/RollbackData.java
@@ -23,6 +23,7 @@ package org.openecomp.mso.bpmn.core;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* An object that stores data for rollbacks. Data is organized by type. A
@@ -30,80 +31,72 @@ import java.util.Map;
* in the same object for separate rollback operations.
*/
public class RollbackData implements Serializable {
- private static final long serialVersionUID = 1L;
- private Map<String, Map<String, Serializable>> dictionary =
- new HashMap<String, Map<String, Serializable>>();
-
- /**
- * Returns true if the specified type is stored in this object.
- * @param type the data type
- */
- public boolean hasType(String type) {
- return dictionary.containsKey(type);
- }
+ private static final long serialVersionUID = 1L;
- /**
- * Stores a single item.
- * @param type the data type
- * @param key the key
- * @param value the value
- */
- public void put(String type, String key, String value) {
- Map<String, Serializable> mapForType = dictionary.get(type);
+ private Map<String, Map<String, Serializable>> dictionary =
+ new HashMap<String, Map<String, Serializable>>();
- if (mapForType == null) {
- mapForType = new HashMap<String, Serializable>();
- dictionary.put(type, mapForType);
- }
+ /**
+ * Returns true if the specified type is stored in this object.
+ *
+ * @param type the data type
+ */
+ public boolean hasType(String type) {
+ return dictionary.containsKey(type);
+ }
- mapForType.put(key, value);
- }
+ /**
+ * Stores a single item.
+ *
+ * @param type the data type
+ * @param key the key
+ * @param value the value
+ */
+ public void put(String type, String key, String value) {
+ Map<String, Serializable> mapForType = dictionary.get(type);
- /**
- * Gets a single item.
- * @param type the data type
- * @param key the key
- * @return the item or null if there is no item for the specified type and key
- */
- public Serializable get(String type, String key) {
- Map<String, Serializable> mapForType = dictionary.get(type);
+ if (mapForType == null) {
+ mapForType = new HashMap<String, Serializable>();
+ dictionary.put(type, mapForType);
+ }
- if (mapForType == null) {
- return null;
- }
+ mapForType.put(key, value);
+ }
- return mapForType.get(key);
- }
+ /**
+ * Gets a single item.
+ *
+ * @param type the data type
+ * @param key the key
+ * @return the item or null if there is no item for the specified type and key
+ */
+ public Serializable get(String type, String key) {
+ Map<String, Serializable> mapForType = dictionary.get(type);
- /**
- * Gets a map containing all items associated with the specified data type.
- * @param type the data type
- * @return a map, or null if there are no items associated with the specified
- * data type
- */
- public Map<String, Serializable> get(String type) {
- return dictionary.get(type);
- }
+ if (mapForType == null) {
+ return null;
+ }
- /**
- * Returns a string representation of this object.
- */
- @Override
- public String toString() {
- StringBuilder out = new StringBuilder();
- out.append(getClass().getSimpleName());
- out.append('[');
- boolean hasOne = false;
- for (String type : dictionary.keySet()) {
- if (hasOne) {
- out.append(',');
- }
- out.append(type);
- out.append(dictionary.get(type));
- hasOne = true;
- }
- out.append(']');
- return out.toString();
- }
+ return mapForType.get(key);
+ }
+
+ /**
+ * Gets a map containing all items associated with the specified data type.
+ *
+ * @param type the data type
+ * @return a map, or null if there are no items associated with the specified data type
+ */
+ public Map<String, Serializable> get(String type) {
+ return dictionary.get(type);
+ }
+
+ /**
+ * Returns a string representation of this object.
+ */
+ @Override
+ public String toString() {
+ return dictionary.entrySet().stream().map(entry -> entry.getKey() + entry.getValue())
+ .collect(Collectors.joining(",", "[", "]"));
+ }
}
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/RollbackDataTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/RollbackDataTest.java
new file mode 100644
index 0000000000..c51af23e30
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/RollbackDataTest.java
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 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
+ *
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+import org.junit.Test;
+
+public class RollbackDataTest {
+
+ private final static String TYPE_A = "typeA";
+ private final static String TYPE_B = "typeB";
+ private static final String KEY_1 = "key1";
+ private static final String VALUE_1 = "value1";
+ private static final String VALUE_2 = "value2";
+
+ @Test
+ public void shouldReturnStringRepresentationOfDataInAnyPermutation() throws Exception {
+ // given
+ RollbackData data = new RollbackData();
+ data.put(TYPE_A, KEY_1, VALUE_1);
+ data.put(TYPE_A, "key2", "value2");
+ data.put(TYPE_B, "key3", "value3");
+ // when, then
+ assertThat(data.toString()).isIn(
+ "[typeB{key3=value3},typeA{key1=value1, key2=value2}]",
+ "[typeB{key3=value3},typeA{key2=value2, key1=value1}]",
+ "[typeA{key1=value1, key2=value2},typeB{key3=value3}]",
+ "[typeA{key2=value2, key1=value1},typeB{key3=value3}]");
+ }
+
+ @Test
+ public void shouldBeEmptyOnCreation() throws Exception {
+ // given
+ RollbackData data = new RollbackData();
+ // then
+ assertThat(data.hasType(TYPE_A)).isFalse();
+ assertThat(data.get(TYPE_A, KEY_1)).isNull();
+ }
+
+ @Test
+ public void shouldHaveTypeAfterPuttingDataOfThatType() throws Exception {
+ // given
+ RollbackData data = new RollbackData();
+ // when
+ data.put(TYPE_A, KEY_1, VALUE_1);
+ // then
+ assertThat(data.hasType(TYPE_A)).isTrue();
+ assertThat(data.hasType(TYPE_B)).isFalse();
+ assertThat(data.get(TYPE_A, KEY_1)).isEqualTo(VALUE_1);
+ }
+
+ @Test
+ public void shouldKeepTwoValuesWithSameKeysButDifferentTypes() throws Exception {
+ // given
+ RollbackData data = new RollbackData();
+ // when
+ data.put(TYPE_A, KEY_1, VALUE_1);
+ data.put(TYPE_B, KEY_1, VALUE_2);
+ // then
+ assertThat(data.get(TYPE_A, KEY_1)).isEqualTo(VALUE_1);
+ assertThat(data.get(TYPE_A)).containsExactly(entry(KEY_1, VALUE_1));
+ assertThat(data.get(TYPE_B, KEY_1)).isEqualTo(VALUE_2);
+ assertThat(data.get(TYPE_B)).containsExactly(entry(KEY_1, VALUE_2));
+ }
+} \ No newline at end of file