private Date lastMod;\r
private Date createdDate;\r
private boolean privilegedSubscriber;\r
- private String aafInstance;\r
private boolean decompress;\r
\r
public Subscription() {\r
this.lastMod = new Date();\r
this.createdDate = new Date();\r
this.privilegedSubscriber = false;\r
- this.aafInstance = "";\r
this.decompress = false;\r
}\r
\r
this.lastMod = rs.getDate("LAST_MOD");\r
this.createdDate = rs.getDate("CREATED_DATE");\r
this.privilegedSubscriber = rs.getBoolean("PRIVILEGED_SUBSCRIBER");\r
- this.aafInstance = rs.getString("AAF_INSTANCE");\r
this.decompress = rs.getBoolean("DECOMPRESS");\r
}\r
\r
this.subid = jo.optInt(SUBID_KEY, -1);\r
this.feedid = jo.optInt(FEEDID_KEY, -1);\r
this.groupid = jo.optInt(GROUPID_KEY, -1); //New field is added - Groups feature Rally:US708115 - 1610\r
- this.aafInstance = jo.optString("aaf_instance", "legacy");\r
- if (!(aafInstance.equalsIgnoreCase("legacy")) && aafInstance.length() > 255) {\r
- throw new InvalidObjectException("aaf_instance field is too long");\r
- }\r
JSONObject jdeli = jo.getJSONObject("delivery");\r
String url = jdeli.getString("url");\r
String user = jdeli.getString("user");\r
sl.setFeed(URLUtilities.generateFeedURL(feedid));\r
}\r
\r
- public String getAafInstance() {\r
- return aafInstance;\r
- }\r
-\r
- public void setAafInstance(String aafInstance) {\r
- this.aafInstance = aafInstance;\r
- }\r
-\r
//New getter setters for Groups feature Rally:US708115 - 1610\r
public int getGroupid() {\r
return groupid;\r
jo.put(LAST_MOD_KEY, lastMod.getTime());\r
jo.put(CREATED_DATE, createdDate.getTime());\r
jo.put("privilegedSubscriber", privilegedSubscriber);\r
- jo.put("aaf_instance", aafInstance);\r
jo.put("decompress", decompress);\r
return jo;\r
}\r
// Create the SUBSCRIPTIONS row\r
String sql = "insert into SUBSCRIPTIONS (SUBID, FEEDID, DELIVERY_URL, DELIVERY_USER, DELIVERY_PASSWORD, "\r
+ "DELIVERY_USE100, METADATA_ONLY, SUBSCRIBER, SUSPENDED, GROUPID, "\r
- + "PRIVILEGED_SUBSCRIBER, FOLLOW_REDIRECTS, DECOMPRESS, AAF_INSTANCE) "\r
- + "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";\r
+ + "PRIVILEGED_SUBSCRIBER, FOLLOW_REDIRECTS, DECOMPRESS) "\r
+ + "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";\r
ps = conn.prepareStatement(sql, new String[]{SUBID_COL});\r
ps.setInt(1, subid);\r
ps.setInt(2, feedid);\r
ps.setBoolean(11, isPrivilegedSubscriber());\r
ps.setInt(12, isFollowRedirect() ? 1 : 0);\r
ps.setBoolean(13, isDecompress());\r
- ps.setString(14, getAafInstance());\r
ps.execute();\r
ps.close();\r
// Update the row to set the URLs\r
if (suspended != os.suspended) {\r
return false;\r
}\r
- if (!aafInstance.equals(os.aafInstance)) {\r
- return false;\r
- }\r
return true;\r
}\r
\r