Merge "[DMAAP-DR-PROV] Remove aaf & cadi"

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / Feed.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
index c634430..af6b357 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
@@ -77,7 +77,6 @@ public class Feed extends Syncable {
     private boolean suspended;\r
     private Date lastMod;\r
     private Date createdDate;\r
-    private String aafInstance;\r
 \r
     public Feed() {\r
         this("", "", "", "");\r
@@ -104,7 +103,6 @@ public class Feed extends Syncable {
         this.suspended = false;\r
         this.lastMod = new Date();\r
         this.createdDate = new Date();\r
-        this.aafInstance = "";\r
     }\r
 \r
     /**\r
@@ -133,7 +131,6 @@ public class Feed extends Syncable {
         this.suspended = rs.getBoolean("SUSPENDED");\r
         this.lastMod = rs.getDate("LAST_MOD");\r
         this.createdDate = rs.getTimestamp("CREATED_DATE");\r
-        this.aafInstance = rs.getString("AAF_INSTANCE");\r
     }\r
 \r
     /**\r
@@ -148,10 +145,6 @@ public class Feed extends Syncable {
             this.feedid = jo.optInt(FEED_ID, -1);\r
             this.groupid = jo.optInt("groupid");\r
             this.name = jo.getString("name");\r
-            this.aafInstance = jo.optString("aaf_instance", "legacy");\r
-            if (!("legacy".equalsIgnoreCase(aafInstance)) && aafInstance.length() > 255) {\r
-                throw new InvalidObjectException("aaf_instance field is too long");\r
-            }\r
             if (name.length() > 255) {\r
                 throw new InvalidObjectException("name field is too long");\r
             }\r
@@ -440,10 +433,6 @@ public class Feed extends Syncable {
         fl.setLog(URLUtilities.generateFeedLogURL(feedid));\r
     }\r
 \r
-    public String getAafInstance() {\r
-        return aafInstance;\r
-    }\r
-\r
     //new getter setters for groups- Rally:US708115 - 1610\r
     public int getGroupid() {\r
         return groupid;\r
@@ -553,7 +542,6 @@ public class Feed extends Syncable {
         jo.put("suspend", suspended);\r
         jo.put(LAST_MOD, lastMod.getTime());\r
         jo.put(CREATED_DATE, createdDate.getTime());\r
-        jo.put("aaf_instance", aafInstance);\r
         return jo;\r
     }\r
 \r
@@ -634,8 +622,8 @@ public class Feed extends Syncable {
             try (PreparedStatement ps = conn.prepareStatement(\r
                 "insert into FEEDS (FEEDID, NAME, VERSION, DESCRIPTION, AUTH_CLASS, PUBLISHER, SELF_LINK, "\r
                     + "PUBLISH_LINK, SUBSCRIBE_LINK, LOG_LINK, DELETED, SUSPENDED,"\r
-                    + "BUSINESS_DESCRIPTION, GROUPID, AAF_INSTANCE) "\r
-                    + "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {\r
+                    + "BUSINESS_DESCRIPTION, GROUPID) "\r
+                    + "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {\r
                 ps.setInt(1, feedid);\r
                 ps.setString(2, getName());\r
                 ps.setString(3, getVersion());\r
@@ -650,7 +638,6 @@ public class Feed extends Syncable {
                 ps.setBoolean(12, isSuspended());\r
                 ps.setString(13, getBusinessDescription());\r
                 ps.setInt(14, groupid);\r
-                ps.setString(15, getAafInstance());\r
                 ps.executeUpdate();\r
             }\r
         } catch (SQLException e) {\r
@@ -799,9 +786,6 @@ public class Feed extends Syncable {
         if (suspended != of.suspended) {\r
             return false;\r
         }\r
-        if (!aafInstance.equals(of.aafInstance)) {\r
-            return false;\r
-        }\r
         return true;\r
     }\r
 \r