X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FFeed.java;fp=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FFeed.java;h=af6b357570b3c04e2fd16351ce0064ebf15ff524;hb=495ebf460ae2ca936981e4ed28a11224de69b64e;hp=c63443015e9276752c81d9f45c25e787c53c8dbb;hpb=63b13a0cddf45b4cfd1691dd5b95a205af355898;p=dmaap%2Fdatarouter.git

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