\r
package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import java.io.InvalidObjectException;\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
import java.util.Collection;\r
import java.util.Date;\r
import java.util.List;\r
-import java.util.Objects;\r
import java.util.Properties;\r
-import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
+\r
/**\r
* The representation of a Subscription. Subscriptions can be retrieved from the DB, or stored/updated in the DB.\r
*\r
private static final String GROUPID_KEY = "groupid";\r
private static final String LAST_MOD_KEY = "last_mod";\r
private static final String CREATED_DATE = "created_date";\r
- private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+ private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
private static int nextSubid = getMaxSubID() + 1;\r
\r
private int subid;\r
private int feedid;\r
private int groupid; //New field is added - Groups feature Rally:US708115 - 1610\r
private SubDelivery delivery;\r
+ private boolean followRedirect;\r
private boolean metadataOnly;\r
private String subscriber;\r
private SubLinks links;\r
private boolean suspended;\r
private Date lastMod;\r
private Date createdDate;\r
+ private boolean privilegedSubscriber;\r
+ private String aafInstance;\r
+ private boolean decompress;\r
\r
public static Subscription getSubscriptionMatching(Subscription sub) {\r
SubDelivery deli = sub.getDelivery();\r
String sql = String.format(\r
- "select * from SUBSCRIPTIONS where FEEDID = %d and DELIVERY_URL = \"%s\" and DELIVERY_USER = \"%s\" and DELIVERY_PASSWORD = \"%s\" and DELIVERY_USE100 = %d and METADATA_ONLY = %d",\r
+ "select * from SUBSCRIPTIONS where FEEDID = %d and DELIVERY_URL = \"%s\" and DELIVERY_USER = \"%s\" and DELIVERY_PASSWORD = \"%s\" and DELIVERY_USE100 = %d and METADATA_ONLY = %d and FOLLOW_REDIRECTS = %d",\r
sub.getFeedid(),\r
deli.getUrl(),\r
deli.getUser(),\r
deli.getPassword(),\r
deli.isUse100() ? 1 : 0,\r
- sub.isMetadataOnly() ? 1 : 0\r
+ sub.isMetadataOnly() ? 1 : 0,\r
+ sub.isFollowRedirect() ? 1 :0\r
);\r
List<Subscription> list = getSubscriptionsForSQL(sql);\r
return !list.isEmpty() ? list.get(0) : null;\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.error(e);\r
+ intlogger.error("PROV0001 getSubscriptionsForSQL: " + e.toString(), e);\r
}\r
return list;\r
}\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.info("getMaxSubID: " + e.getMessage());\r
+ intlogger.info("getMaxSubID: " + e.getMessage(), e);\r
}\r
return max;\r
}\r
DB db = new DB();\r
@SuppressWarnings("resource")\r
Connection conn = db.getConnection();\r
-\r
try (PreparedStatement stmt = conn.prepareStatement(sql)) {\r
stmt.setString(1, String.valueOf(feedid));\r
try (ResultSet rs = stmt.executeQuery()) {\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.error(SQLEXCEPTION + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
return list;\r
}\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());\r
+ intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage(), e);\r
}\r
return count;\r
}\r
this.groupid = -1; //New field is added - Groups feature Rally:US708115 - 1610\r
this.delivery = new SubDelivery(url, user, password, false);\r
this.metadataOnly = false;\r
+ this.followRedirect = false;\r
this.subscriber = "";\r
this.links = new SubLinks();\r
this.suspended = false;\r
this.lastMod = new Date();\r
this.createdDate = new Date();\r
+ this.privilegedSubscriber = false;\r
+ this.aafInstance = "";\r
+ this.decompress = false;\r
}\r
\r
public Subscription(ResultSet rs) throws SQLException {\r
this.groupid = rs.getInt("GROUPID"); //New field is added - Groups feature Rally:US708115 - 1610\r
this.delivery = new SubDelivery(rs);\r
this.metadataOnly = rs.getBoolean("METADATA_ONLY");\r
+ this.followRedirect = rs.getBoolean("FOLLOW_REDIRECTS");\r
this.subscriber = rs.getString("SUBSCRIBER");\r
- this.links = new SubLinks(rs.getString("SELF_LINK"), URLUtilities.generateFeedURL(feedid),\r
- rs.getString("LOG_LINK"));\r
+ this.links = new SubLinks(rs.getString("SELF_LINK"), URLUtilities.generateFeedURL(feedid), rs.getString("LOG_LINK"));\r
this.suspended = rs.getBoolean("SUSPENDED");\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
public Subscription(JSONObject jo) throws InvalidObjectException {\r
this("", "", "");\r
try {\r
- // The JSONObject is assumed to contain a vnd.att-dr.subscription representation\r
+ // The JSONObject is assumed to contain a vnd.dmaap-dr.subscription representation\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
-\r
+ this.aafInstance = jo.optString("aaf_instance", "legacy");\r
+ if(!(aafInstance.equalsIgnoreCase("legacy"))){\r
+ if (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
if (url.length() > 256) {\r
throw new InvalidObjectException("delivery url field is too long");\r
}\r
- if (user.length() > 20) {\r
+ if (user.length() > 60) {\r
throw new InvalidObjectException("delivery user field is too long");\r
}\r
if (password.length() > 32) {\r
throw new InvalidObjectException("delivery password field is too long");\r
}\r
this.delivery = new SubDelivery(url, user, password, use100);\r
-\r
this.metadataOnly = jo.getBoolean("metadataOnly");\r
+ this.followRedirect = jo.optBoolean("follow_redirect", false);\r
this.suspended = jo.optBoolean("suspend", false);\r
-\r
+ this.privilegedSubscriber = jo.optBoolean("privilegedSubscriber", false);\r
+ this.decompress = jo.optBoolean("decompress", false);\r
this.subscriber = jo.optString("subscriber", "");\r
JSONObject jol = jo.optJSONObject("links");\r
this.links = (jol == null) ? (new SubLinks()) : (new SubLinks(jol));\r
} catch (InvalidObjectException e) {\r
throw e;\r
} catch (Exception e) {\r
- throw new InvalidObjectException("invalid JSON: " + e.getMessage());\r
+ intlogger.warn("Invalid JSON: " + e.getMessage(), e);\r
+ throw new InvalidObjectException("Invalid JSON: " + e.getMessage());\r
}\r
}\r
\r
SubLinks sl = getLinks();\r
sl.setFeed(URLUtilities.generateFeedURL(feedid));\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
this.metadataOnly = metadataOnly;\r
}\r
\r
- public boolean isSuspended() {\r
+ private boolean isFollowRedirect() {\r
+ return followRedirect;\r
+ }\r
+ public void setFollowRedirect(boolean followRedirect) {\r
+ this.followRedirect = followRedirect;\r
+ }\r
+\r
+ boolean isSuspended() {\r
return suspended;\r
}\r
\r
this.suspended = suspended;\r
}\r
\r
+ public boolean isPrivilegedSubscriber() {\r
+ return privilegedSubscriber;\r
+ }\r
+\r
+ public void setPrivilegedSubscriber(boolean privilegedSubscriber) {\r
+ this.privilegedSubscriber = privilegedSubscriber;\r
+ }\r
+\r
public String getSubscriber() {\r
return subscriber;\r
}\r
return links;\r
}\r
\r
- public void setLinks(SubLinks links) {\r
+ void setLinks(SubLinks links) {\r
this.links = links;\r
}\r
\r
+ public boolean isDecompress() {\r
+ return decompress;\r
+ }\r
+\r
+ public void setDecompress(boolean decompress) {\r
+ this.decompress = decompress;\r
+ }\r
+\r
@Override\r
public JSONObject asJSONObject() {\r
JSONObject jo = new JSONObject();\r
jo.put(GROUPID_KEY, groupid); //New field is added - Groups feature Rally:US708115 - 1610\r
jo.put("delivery", delivery.asJSONObject());\r
jo.put("metadataOnly", metadataOnly);\r
+ jo.put("follow_redirect", followRedirect);\r
jo.put("subscriber", subscriber);\r
jo.put("links", links.asJSONObject());\r
jo.put("suspend", suspended);\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
\r
}\r
\r
// Create the SUBSCRIPTIONS row\r
- String sql = "insert into SUBSCRIPTIONS (SUBID, FEEDID, DELIVERY_URL, DELIVERY_USER, DELIVERY_PASSWORD, DELIVERY_USE100, METADATA_ONLY, SUBSCRIBER, SUSPENDED, GROUPID) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";\r
+ String sql = "insert into SUBSCRIPTIONS (SUBID, FEEDID, DELIVERY_URL, DELIVERY_USER, DELIVERY_PASSWORD, DELIVERY_USE100, METADATA_ONLY, SUBSCRIBER, SUSPENDED, GROUPID, PRIVILEGED_SUBSCRIBER, FOLLOW_REDIRECTS, DECOMPRESS, AAF_INSTANCE) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";\r
ps = c.prepareStatement(sql, new String[]{SUBID_COL});\r
ps.setInt(1, subid);\r
ps.setInt(2, feedid);\r
ps.setString(8, getSubscriber());\r
ps.setBoolean(9, isSuspended());\r
ps.setInt(10, groupid); //New field is added - Groups feature Rally:US708115 - 1610\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
ps.close();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
+ intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e);\r
} finally {\r
try {\r
if (ps != null) {\r
ps.close();\r
}\r
} catch (SQLException e) {\r
- intlogger.error(SQLEXCEPTION + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r
boolean rv = true;\r
PreparedStatement ps = null;\r
try {\r
- String sql = "update SUBSCRIPTIONS set DELIVERY_URL = ?, DELIVERY_USER = ?, DELIVERY_PASSWORD = ?, DELIVERY_USE100 = ?, METADATA_ONLY = ?, SUSPENDED = ?, GROUPID = ? where SUBID = ?";\r
+ String sql = "update SUBSCRIPTIONS set DELIVERY_URL = ?, DELIVERY_USER = ?, DELIVERY_PASSWORD = ?, DELIVERY_USE100 = ?, METADATA_ONLY = ?, SUSPENDED = ?, GROUPID = ?, PRIVILEGED_SUBSCRIBER = ?, FOLLOW_REDIRECTS = ?, DECOMPRESS = ? where SUBID = ?";\r
ps = c.prepareStatement(sql);\r
ps.setString(1, delivery.getUrl());\r
ps.setString(2, delivery.getUser());\r
ps.setInt(5, isMetadataOnly() ? 1 : 0);\r
ps.setInt(6, suspended ? 1 : 0);\r
ps.setInt(7, groupid); //New field is added - Groups feature Rally:US708115 - 1610\r
- ps.setInt(8, subid);\r
+ ps.setInt(8, privilegedSubscriber ? 1 : 0);\r
+ ps.setInt(9, isFollowRedirect() ? 1 : 0);\r
+ ps.setInt(10, isDecompress() ? 1 : 0);\r
+ ps.setInt(11, subid);\r
ps.executeUpdate();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
+ intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e);\r
} finally {\r
try {\r
if (ps != null) {\r
ps.close();\r
}\r
} catch (SQLException e) {\r
- intlogger.error(SQLEXCEPTION + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r
ps.close();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
+ intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e);\r
} finally {\r
try {\r
if (ps != null) {\r
ps.close();\r
}\r
} catch (SQLException e) {\r
- intlogger.error(SQLEXCEPTION + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r
ps.execute();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
+ intlogger.warn("PROV0007 doDelete: " + e.getMessage(), e);\r
} finally {\r
try {\r
if (ps != null) {\r
ps.close();\r
}\r
} catch (SQLException e) {\r
- intlogger.error(SQLEXCEPTION + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r
if (feedid != os.feedid) {\r
return false;\r
}\r
- if (groupid != os.groupid) //New field is added - Groups feature Rally:US708115 - 1610\r
- {\r
+ if (groupid != os.groupid) {\r
+ //New field is added - Groups feature Rally:US708115 - 1610\r
return false;\r
}\r
if (!delivery.equals(os.delivery)) {\r
if (metadataOnly != os.metadataOnly) {\r
return false;\r
}\r
+ if (followRedirect != os.followRedirect) {\r
+ return false;\r
+ }\r
if (!subscriber.equals(os.subscriber)) {\r
return false;\r
}\r
if (!links.equals(os.links)) {\r
return false;\r
}\r
- return suspended == os.suspended;\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
@Override\r
public int hashCode() {\r
- return Objects.hash(subid, feedid, groupid, delivery, metadataOnly, subscriber, links, suspended, lastMod,\r
- createdDate);\r
+ return super.hashCode();\r
}\r
\r
@Override\r
Code Review / dmaap / datarouter.git / blobdiff