From a27be9fdbbf2d271c9c5780ba70fe15a24dbdb63 Mon Sep 17 00:00:00 2001
From: "Nelson,Thomas(tn1381)(arthurdent3)" <tn1381@att.com>
Date: Tue, 29 Jan 2019 15:55:37 -0500
Subject: Push variuos changes

- Spring Boot
- Cadi
- Cassandra Locking

Change-Id: Ie9882f81f0ca141bdb7862cdabf978481fcd7c4a
Issue-ID: MUSIC-296,MUSIC-272
Signed-off-by: Nelson,Thomas(tn1381)(arthurdent3) <tn1381@att.com>
---
 .../conductor/conditionals/JsonConditional.java    | 101 +++++++++++----------
 1 file changed, 51 insertions(+), 50 deletions(-)

(limited to 'src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java')

diff --git a/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java b/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java
index 8cacc369..4efcabea 100644
--- a/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java
+++ b/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java
@@ -19,6 +19,7 @@
  * ============LICENSE_END=============================================
  * ====================================================================
  */
+
 package org.onap.music.conductor.conditionals;
 
 import java.io.Serializable;
@@ -32,58 +33,58 @@ import io.swagger.annotations.ApiModel;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class JsonConditional implements Serializable {
 
-	private String primaryKey;
-	private String primaryKeyValue;
-	private String casscadeColumnName;
-	private transient Map<String,Object> tableValues;
-	private transient Map<String,Object> casscadeColumnData;
-	private Map<String,Map<String,String>> conditions;
-	
-	public Map<String, Object> getTableValues() {
-		return tableValues;
-	}
-	public void setTableValues(Map<String, Object> tableValues) {
-		this.tableValues = tableValues;
-	}
-	
-	public String getPrimaryKey() {
-		return primaryKey;
-	}
-	public String getPrimaryKeyValue() {
-		return primaryKeyValue;
-	}
-	public String getCasscadeColumnName() {
-		return casscadeColumnName;
-	}
+    private String primaryKey;
+    private String primaryKeyValue;
+    private String casscadeColumnName;
+    private Map<String,Object> tableValues;
+    private Map<String,Object> casscadeColumnData;
+    private Map<String,Map<String,String>> conditions;
+    
+    public Map<String, Object> getTableValues() {
+        return tableValues;
+    }
+    public void setTableValues(Map<String, Object> tableValues) {
+        this.tableValues = tableValues;
+    }
+    
+    public String getPrimaryKey() {
+        return primaryKey;
+    }
+    public String getPrimaryKeyValue() {
+        return primaryKeyValue;
+    }
+    public String getCasscadeColumnName() {
+        return casscadeColumnName;
+    }
 
-	public Map<String, Object> getCasscadeColumnData() {
-		return casscadeColumnData;
-	}
+    public Map<String, Object> getCasscadeColumnData() {
+        return casscadeColumnData;
+    }
 
-	
-	
-	public void setPrimaryKey(String primaryKey) {
-		this.primaryKey = primaryKey;
-	}
-	public void setPrimaryKeyValue(String primaryKeyValue) {
-		this.primaryKeyValue = primaryKeyValue;
-	}
-	public Map<String, Map<String, String>> getConditions() {
-		return conditions;
-	}
-	public void setConditions(Map<String, Map<String, String>> conditions) {
-		this.conditions = conditions;
-	}
-	public void setCasscadeColumnName(String casscadeColumnName) {
-		this.casscadeColumnName = casscadeColumnName;
-	}
+    
+    
+    public void setPrimaryKey(String primaryKey) {
+        this.primaryKey = primaryKey;
+    }
+    public void setPrimaryKeyValue(String primaryKeyValue) {
+        this.primaryKeyValue = primaryKeyValue;
+    }
+    public Map<String, Map<String, String>> getConditions() {
+        return conditions;
+    }
+    public void setConditions(Map<String, Map<String, String>> conditions) {
+        this.conditions = conditions;
+    }
+    public void setCasscadeColumnName(String casscadeColumnName) {
+        this.casscadeColumnName = casscadeColumnName;
+    }
 
-	public void setCasscadeColumnData(Map<String, Object> casscadeColumnData) {
-		this.casscadeColumnData = casscadeColumnData;
-	}
+    public void setCasscadeColumnData(Map<String, Object> casscadeColumnData) {
+        this.casscadeColumnData = casscadeColumnData;
+    }
 
-	
-	
-	
-	
+    
+    
+    
+    
 }
\ No newline at end of file
-- 
cgit