X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FFeed.java;h=ac1f70af78fc4be7f792dd373bb70499512f6199;hp=a8be6b3f36326af9ca188c2acd8c1cacf09b55b1;hb=68a9ca240970fceaf12bbe91b7bad8e1d98ecd93;hpb=bc1df610cddfb558cf6bde90c269b4af59768648 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 a8be6b3f..ac1f70af 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 @@ -42,8 +42,8 @@ import java.util.Set; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities; +import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils; import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; @@ -57,8 +57,12 @@ import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; public class Feed extends Syncable { private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog"); - private static int next_feedid = getMaxFeedID() + 1; - private static final String SQLEXCEPTION = "SQLException: "; + private static int nextFeedID = getMaxFeedID() + 1; + private static final String FEED_ID_SQL = "FEEDID"; + private static final String FEED_ID = "feedid"; + private static final String DEL = "deleted"; + private static final String LAST_MOD = "last_mod"; + private static final String CREATED_DATE = "created_date"; private int feedid; private int groupid; //New field is added - Groups feature Rally:US708115 - 1610 @@ -75,6 +79,143 @@ public class Feed extends Syncable { private Date createdDate; private String aafInstance; + public Feed() { + this("", "", "", ""); + } + + /** + * Feed constructor. + * @param name feed name + * @param version feed version + * @param desc feed description + * @param businessDescription feed business description + */ + public Feed(String name, String version, String desc, String businessDescription) { + this.feedid = -1; + this.groupid = -1; //New field is added - Groups feature Rally:US708115 - 1610 + this.name = name; + this.version = version; + this.description = desc; + this.businessDescription = businessDescription; // New field is added - Groups feature Rally:US708102 - 1610 + this.authorization = new FeedAuthorization(); + this.publisher = ""; + this.links = new FeedLinks(); + this.deleted = false; + this.suspended = false; + this.lastMod = new Date(); + this.createdDate = new Date(); + this.aafInstance = ""; + } + + /** + * Feed Constructor from ResultSet. + * @param rs ResultSet + * @throws SQLException in case of SQL statement error + */ + public Feed(ResultSet rs) throws SQLException { + this.feedid = rs.getInt(FEED_ID_SQL); + //New field is added - Groups feature Rally:US708115 - 1610 + this.groupid = rs.getInt("GROUPID"); + this.name = rs.getString("NAME"); + this.version = rs.getString("VERSION"); + this.description = rs.getString("DESCRIPTION"); + // New field is added - Groups feature Rally:US708102 - 1610 + this.businessDescription = rs.getString("BUSINESS_DESCRIPTION"); + this.authorization = new FeedAuthorization(); + this.authorization.setClassification(rs.getString("AUTH_CLASS")); + this.publisher = rs.getString("PUBLISHER"); + this.links = new FeedLinks(); + this.links.setSelf(rs.getString("SELF_LINK")); + this.links.setPublish(rs.getString("PUBLISH_LINK")); + this.links.setSubscribe(rs.getString("SUBSCRIBE_LINK")); + this.links.setLog(rs.getString("LOG_LINK")); + this.deleted = rs.getBoolean("DELETED"); + this.suspended = rs.getBoolean("SUSPENDED"); + this.lastMod = rs.getDate("LAST_MOD"); + this.createdDate = rs.getTimestamp("CREATED_DATE"); + this.aafInstance = rs.getString("AAF_INSTANCE"); + } + + /** + * Feed constructor from JSONObject. + * @param jo JSONObject + * @throws InvalidObjectException in case of JSON error + */ + public Feed(JSONObject jo) throws InvalidObjectException { + this("", "", "", ""); + try { + // The JSONObject is assumed to contain a vnd.dmaap-dr.feed representation + 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"); + } + try { + this.version = jo.getString("version"); + } catch (JSONException e) { + intlogger.warn("PROV0023 Feed.Feed: " + e.getMessage(), e); + this.version = null; + } + if (version != null && version.length() > 20) { + throw new InvalidObjectException("version field is too long"); + } + this.description = jo.optString("description"); + this.businessDescription = jo.optString("business_description"); + if (description.length() > 1000) { + throw new InvalidObjectException("technical description field is too long"); + } + if (businessDescription.length() > 1000) { + throw new InvalidObjectException("business description field is too long"); + } + this.authorization = new FeedAuthorization(); + JSONObject jauth = jo.getJSONObject("authorization"); + this.authorization.setClassification(jauth.getString("classification")); + if (this.authorization.getClassification().length() > 32) { + throw new InvalidObjectException("classification field is too long"); + } + JSONArray endPointIds = jauth.getJSONArray("endpoint_ids"); + for (int i = 0; i < endPointIds.length(); i++) { + JSONObject id = endPointIds.getJSONObject(i); + FeedEndpointID fid = new FeedEndpointID(id.getString("id"), id.getString("password")); + if (fid.getId().length() > 60) { + throw new InvalidObjectException("id field is too long (" + fid.getId() + ")"); + } + if (fid.getPassword().length() > 32) { + //Fortify scan fixes - Privacy Violation + throw new InvalidObjectException("password field is too long (" + fid.getPassword() + ")"); + } + this.authorization.getEndpointIDS().add(fid); + } + if (this.authorization.getEndpointIDS().isEmpty()) { + throw new InvalidObjectException("need to specify at least one endpoint_id"); + } + endPointIds = jauth.getJSONArray("endpoint_addrs"); + for (int i = 0; i < endPointIds.length(); i++) { + String addr = endPointIds.getString(i); + if (!JSONUtilities.validIPAddrOrSubnet(addr)) { + throw new InvalidObjectException("bad IP addr or subnet mask: " + addr); + } + this.authorization.getEndpointAddrs().add(addr); + } + + this.publisher = jo.optString("publisher", ""); + this.deleted = jo.optBoolean(DEL, false); + this.suspended = jo.optBoolean("suspend", false); + JSONObject jol = jo.optJSONObject("links"); + this.links = (jol == null) ? (new FeedLinks()) : (new FeedLinks(jol)); + } catch (InvalidObjectException e) { + throw e; + } catch (Exception e) { + intlogger.warn("Invalid JSON: " + e.getMessage(), e); + throw new InvalidObjectException("Invalid JSON: " + e.getMessage()); + } + } + /** * Check if a feed ID is valid. * @@ -82,20 +223,17 @@ public class Feed extends Syncable { * @return true if it is valid */ @SuppressWarnings("resource") - public static boolean isFeedValid(int id) { + static boolean isFeedValid(int id) { int count = 0; - try { - DB db = new DB(); - Connection conn = db.getConnection(); - try (PreparedStatement stmt = conn.prepareStatement("select COUNT(*) from FEEDS where FEEDID = ?")) { - stmt.setInt(1, id); - try (ResultSet rs = stmt.executeQuery()) { - if (rs.next()) { - count = rs.getInt(1); - } + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement( + "select COUNT(*) from FEEDS where FEEDID = ?")) { + ps.setInt(1, id); + try (ResultSet rs = ps.executeQuery()) { + if (rs.next()) { + count = rs.getInt(1); } } - db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0024 Feed.isFeedValid: " + e.getMessage(), e); } @@ -134,17 +272,14 @@ public class Feed extends Syncable { */ public static int countActiveFeeds() { int count = 0; - try { - DB db = new DB(); - @SuppressWarnings("resource") Connection conn = db.getConnection(); - try (Statement stmt = conn.createStatement()) { - try (ResultSet rs = stmt.executeQuery("select count(*) from FEEDS where DELETED = 0")) { - if (rs.next()) { - count = rs.getInt(1); - } + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement( + "select count(*) from FEEDS where DELETED = 0")) { + try (ResultSet rs = ps.executeQuery()) { + if (rs.next()) { + count = rs.getInt(1); } } - db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0025 Feed.countActiveFeeds: " + e.getMessage(), e); } @@ -157,18 +292,14 @@ public class Feed extends Syncable { */ public static int getMaxFeedID() { int max = 0; - try { - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - try (Statement stmt = conn.createStatement()) { - try (ResultSet rs = stmt.executeQuery("select MAX(feedid) from FEEDS")) { - if (rs.next()) { - max = rs.getInt(1); - } + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement( + "select MAX(feedid) from FEEDS")) { + try (ResultSet rs = ps.executeQuery()) { + if (rs.next()) { + max = rs.getInt(1); } } - db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0026 Feed.getMaxFeedID: " + e.getMessage(), e); } @@ -181,44 +312,37 @@ public class Feed extends Syncable { */ public static Collection getAllFeeds() { Map map = new HashMap<>(); - try { - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - try (Statement stmt = conn.createStatement()) { - try (ResultSet rs = stmt.executeQuery("select * from FEEDS")) { - while (rs.next()) { - Feed feed = new Feed(rs); - map.put(feed.getFeedid(), feed); - } + try (Connection conn = ProvDbUtils.getInstance().getConnection()) { + try (PreparedStatement ps = conn.prepareStatement("select * from FEEDS"); + ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + Feed feed = new Feed(rs); + map.put(feed.getFeedid(), feed); } - - String sql = "select * from FEED_ENDPOINT_IDS"; - try (ResultSet rs = stmt.executeQuery(sql)) { - while (rs.next()) { - int id = rs.getInt("FEEDID"); - Feed feed = map.get(id); - if (feed != null) { - FeedEndpointID epi = new FeedEndpointID(rs); - Collection ecoll = feed.getAuthorization().getEndpoint_ids(); - ecoll.add(epi); - } + } + try (PreparedStatement ps = conn.prepareStatement("select * from FEED_ENDPOINT_IDS"); + ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + int id = rs.getInt(FEED_ID_SQL); + Feed feed = map.get(id); + if (feed != null) { + FeedEndpointID epi = new FeedEndpointID(rs); + Collection ecoll = feed.getAuthorization().getEndpointIDS(); + ecoll.add(epi); } } - - sql = "select * from FEED_ENDPOINT_ADDRS"; - try (ResultSet rs = stmt.executeQuery(sql)) { - while (rs.next()) { - int id = rs.getInt("FEEDID"); - Feed feed = map.get(id); - if (feed != null) { - Collection acoll = feed.getAuthorization().getEndpoint_addrs(); - acoll.add(rs.getString("ADDR")); - } + } + try (PreparedStatement ps = conn.prepareStatement("select * from FEED_ENDPOINT_ADDRS"); + ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + int id = rs.getInt(FEED_ID_SQL); + Feed feed = map.get(id); + if (feed != null) { + Collection acoll = feed.getAuthorization().getEndpointAddrs(); + acoll.add(rs.getString("ADDR")); } } } - db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0027 Feed.getAllFeeds: " + e.getMessage(), e); } @@ -240,26 +364,21 @@ public class Feed extends Syncable { sql += " and PUBLISHER = ?"; } else if (name.equals("subs")) { sql = "select distinct FEEDS.SELF_LINK from FEEDS, SUBSCRIPTIONS " - + "where DELETED = 0 " - + "and FEEDS.FEEDID = SUBSCRIPTIONS.FEEDID " - + "and SUBSCRIPTIONS.SUBSCRIBER = ?"; + + "where DELETED = 0 " + + "and FEEDS.FEEDID = SUBSCRIPTIONS.FEEDID " + + "and SUBSCRIPTIONS.SUBSCRIBER = ?"; } - try { - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - try (PreparedStatement ps = conn.prepareStatement(sql)) { - if (sql.indexOf('?') >= 0) { - ps.setString(1, val); - } - try (ResultSet rs = ps.executeQuery()) { - while (rs.next()) { - String str = rs.getString(1); - list.add(str.trim()); - } + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement(sql)) { + if (sql.indexOf('?') >= 0) { + ps.setString(1, val); + } + try (ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + String str = rs.getString(1); + list.add(str.trim()); } } - db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: " + e.getMessage(), e); } @@ -269,9 +388,7 @@ public class Feed extends Syncable { @SuppressWarnings("resource") private static Feed getFeedBySQL(String sql) { Feed feed = null; - try { - DB db = new DB(); - Connection conn = db.getConnection(); + try (Connection conn = ProvDbUtils.getInstance().getConnection()) { try (Statement stmt = conn.createStatement()) { try (ResultSet rs = stmt.executeQuery(sql)) { if (rs.next()) { @@ -281,7 +398,7 @@ public class Feed extends Syncable { if (feed != null) { sql = "select * from FEED_ENDPOINT_IDS where FEEDID = " + feed.feedid; try (ResultSet rs = stmt.executeQuery(sql)) { - Collection ecoll = feed.getAuthorization().getEndpoint_ids(); + Collection ecoll = feed.getAuthorization().getEndpointIDS(); while (rs.next()) { FeedEndpointID epi = new FeedEndpointID(rs); ecoll.add(epi); @@ -289,156 +406,20 @@ public class Feed extends Syncable { } sql = "select * from FEED_ENDPOINT_ADDRS where FEEDID = " + feed.feedid; try (ResultSet rs = stmt.executeQuery(sql)) { - Collection acoll = feed.getAuthorization().getEndpoint_addrs(); + Collection acoll = feed.getAuthorization().getEndpointAddrs(); while (rs.next()) { acoll.add(rs.getString("ADDR")); } } } } - db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0029 Feed.getFeedBySQL: " + e.getMessage(), e); } return feed; } - public Feed() { - this("", "", "", ""); - } - - /** - * Feed constructor. - * @param name feed name - * @param version feed version - * @param desc feed description - * @param businessDescription feed business description - */ - public Feed(String name, String version, String desc, String businessDescription) { - this.feedid = -1; - this.groupid = -1; //New field is added - Groups feature Rally:US708115 - 1610 - this.name = name; - this.version = version; - this.description = desc; - this.businessDescription = businessDescription; // New field is added - Groups feature Rally:US708102 - 1610 - this.authorization = new FeedAuthorization(); - this.publisher = ""; - this.links = new FeedLinks(); - this.deleted = false; - this.suspended = false; - this.lastMod = new Date(); - this.createdDate = new Date(); - this.aafInstance = ""; - } - - /** - * Feed Constructor from ResultSet. - * @param rs ResultSet - * @throws SQLException in case of SQL statement error - */ - public Feed(ResultSet rs) throws SQLException { - this.feedid = rs.getInt("FEEDID"); - //New field is added - Groups feature Rally:US708115 - 1610 - this.groupid = rs.getInt("GROUPID"); - this.name = rs.getString("NAME"); - this.version = rs.getString("VERSION"); - this.description = rs.getString("DESCRIPTION"); - // New field is added - Groups feature Rally:US708102 - 1610 - this.businessDescription = rs.getString("BUSINESS_DESCRIPTION"); - this.authorization = new FeedAuthorization(); - this.authorization.setClassification(rs.getString("AUTH_CLASS")); - this.publisher = rs.getString("PUBLISHER"); - this.links = new FeedLinks(); - this.links.setSelf(rs.getString("SELF_LINK")); - this.links.setPublish(rs.getString("PUBLISH_LINK")); - this.links.setSubscribe(rs.getString("SUBSCRIBE_LINK")); - this.links.setLog(rs.getString("LOG_LINK")); - this.deleted = rs.getBoolean("DELETED"); - this.suspended = rs.getBoolean("SUSPENDED"); - this.lastMod = rs.getDate("LAST_MOD"); - this.createdDate = rs.getTimestamp("CREATED_DATE"); - this.aafInstance = rs.getString("AAF_INSTANCE"); - } - /** - * Feed constructor from JSONObject. - * @param jo JSONObject - * @throws InvalidObjectException in case of JSON error - */ - public Feed(JSONObject jo) throws InvalidObjectException { - this("", "", "", ""); - try { - // The JSONObject is assumed to contain a vnd.dmaap-dr.feed representation - this.feedid = jo.optInt("feedid", -1); - this.groupid = jo.optInt("groupid"); - this.name = jo.getString("name"); - this.aafInstance = jo.optString("aaf_instance", "legacy"); - if (!(aafInstance.equalsIgnoreCase("legacy")) && aafInstance.length() > 255) { - throw new InvalidObjectException("aaf_instance field is too long"); - } - if (name.length() > 255) { - throw new InvalidObjectException("name field is too long"); - } - try { - this.version = jo.getString("version"); - } catch (JSONException e) { - intlogger.warn("PROV0023 Feed.Feed: " + e.getMessage(), e); - this.version = null; - } - if (version != null && version.length() > 20) { - throw new InvalidObjectException("version field is too long"); - } - this.description = jo.optString("description"); - this.businessDescription = jo.optString("business_description"); - if (description.length() > 1000) { - throw new InvalidObjectException("technical description field is too long"); - } - if (businessDescription.length() > 1000) { - throw new InvalidObjectException("business description field is too long"); - } - this.authorization = new FeedAuthorization(); - JSONObject jauth = jo.getJSONObject("authorization"); - this.authorization.setClassification(jauth.getString("classification")); - if (this.authorization.getClassification().length() > 32) { - throw new InvalidObjectException("classification field is too long"); - } - JSONArray endPointIds = jauth.getJSONArray("endpoint_ids"); - for (int i = 0; i < endPointIds.length(); i++) { - JSONObject id = endPointIds.getJSONObject(i); - FeedEndpointID fid = new FeedEndpointID(id.getString("id"), id.getString("password")); - if (fid.getId().length() > 60) { - throw new InvalidObjectException("id field is too long (" + fid.getId() + ")"); - } - if (fid.getPassword().length() > 32) { - //Fortify scan fixes - Privacy Violation - throw new InvalidObjectException("password field is too long (" + fid.getPassword() + ")"); - } - this.authorization.getEndpoint_ids().add(fid); - } - if (this.authorization.getEndpoint_ids().isEmpty()) { - throw new InvalidObjectException("need to specify at least one endpoint_id"); - } - endPointIds = jauth.getJSONArray("endpoint_addrs"); - for (int i = 0; i < endPointIds.length(); i++) { - String addr = endPointIds.getString(i); - if (!JSONUtilities.validIPAddrOrSubnet(addr)) { - throw new InvalidObjectException("bad IP addr or subnet mask: " + addr); - } - this.authorization.getEndpoint_addrs().add(addr); - } - - this.publisher = jo.optString("publisher", ""); - this.deleted = jo.optBoolean("deleted", false); - this.suspended = jo.optBoolean("suspend", false); - JSONObject jol = jo.optJSONObject("links"); - this.links = (jol == null) ? (new FeedLinks()) : (new FeedLinks(jol)); - } catch (InvalidObjectException e) { - throw e; - } catch (Exception e) { - intlogger.warn("Invalid JSON: " + e.getMessage(), e); - throw new InvalidObjectException("Invalid JSON: " + e.getMessage()); - } - } public int getFeedid() { return feedid; @@ -446,7 +427,7 @@ public class Feed extends Syncable { /** * Set feedid with FeedLinks. - * @param feedid Feedid to set to + * @param feedid Feedid to set to */ public void setFeedid(int feedid) { this.feedid = feedid; @@ -463,10 +444,6 @@ public class Feed extends Syncable { return aafInstance; } - public void setAaf_instance(String aafInstance) { - this.aafInstance = aafInstance; - } - //new getter setters for groups- Rally:US708115 - 1610 public int getGroupid() { return groupid; @@ -501,11 +478,11 @@ public class Feed extends Syncable { } // New field is added - Groups feature Rally:US708102 - 1610 - public String getBusiness_description() { + String getBusinessDescription() { return businessDescription; } - public void setBusiness_description(String businessDescription) { + void setBusinessDescription(String businessDescription) { this.businessDescription = businessDescription; } @@ -538,7 +515,7 @@ public class Feed extends Syncable { return links; } - public void setLinks(FeedLinks links) { + void setLinks(FeedLinks links) { this.links = links; } @@ -550,18 +527,18 @@ public class Feed extends Syncable { this.deleted = deleted; } - public boolean isSuspended() { + boolean isSuspended() { return suspended; } - public void setSuspended(boolean suspended) { + void setSuspended(boolean suspended) { this.suspended = suspended; } @Override public JSONObject asJSONObject() { JSONObject jo = new JSONObject(); - jo.put("feedid", feedid); + jo.put(FEED_ID, feedid); //New field is added - Groups feature Rally:US708115 - 1610 jo.put("groupid", groupid); jo.put("name", name); @@ -572,10 +549,10 @@ public class Feed extends Syncable { jo.put("authorization", authorization.asJSONObject()); jo.put("publisher", publisher); jo.put("links", links.asJSONObject()); - jo.put("deleted", deleted); + jo.put(DEL, deleted); jo.put("suspend", suspended); - jo.put("last_mod", lastMod.getTime()); - jo.put("created_date", createdDate.getTime()); + jo.put(LAST_MOD, lastMod.getTime()); + jo.put(CREATED_DATE, createdDate.getTime()); jo.put("aaf_instance", aafInstance); return jo; } @@ -588,10 +565,10 @@ public class Feed extends Syncable { public JSONObject asJSONObject(boolean hidepasswords) { JSONObject jo = asJSONObject(); if (hidepasswords) { - jo.remove("feedid"); // we no longer hide passwords, however we do hide these - jo.remove("deleted"); - jo.remove("last_mod"); - jo.remove("created_date"); + jo.remove(FEED_ID); // we no longer hide passwords, however we do hide these + jo.remove(DEL); + jo.remove(LAST_MOD); + jo.remove(CREATED_DATE); } return jo; } @@ -602,10 +579,10 @@ public class Feed extends Syncable { */ public JSONObject asLimitedJSONObject() { JSONObject jo = asJSONObject(); - jo.remove("deleted"); - jo.remove("feedid"); - jo.remove("last_mod"); - jo.remove("created_date"); + jo.remove(DEL); + jo.remove(FEED_ID); + jo.remove(LAST_MOD); + jo.remove(CREATED_DATE); return jo; } @@ -614,23 +591,12 @@ public class Feed extends Syncable { @Override public boolean doDelete(Connection conn) { boolean rv = true; - PreparedStatement ps = null; - try { - String sql = "delete from FEEDS where FEEDID = ?"; - ps = conn.prepareStatement(sql); + try (PreparedStatement ps = conn.prepareStatement("delete from FEEDS where FEEDID = ?")) { ps.setInt(1, feedid); ps.execute(); } catch (SQLException e) { rv = false; intlogger.error("PROV0007 doDelete: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; } @@ -640,57 +606,52 @@ public class Feed extends Syncable { boolean rv = true; try { if (feedid == -1) { - setFeedid(next_feedid++); + setFeedid(nextFeedID++); } // In case we insert a feed from synchronization - if (feedid > next_feedid) { - next_feedid = feedid + 1; + if (feedid > nextFeedID) { + nextFeedID = feedid + 1; } - // Create FEED_ENDPOINT_IDS rows FeedAuthorization auth = getAuthorization(); - String sql = "insert into FEED_ENDPOINT_IDS values (?, ?, ?)"; - try (PreparedStatement ps2 = conn.prepareStatement(sql)) { - for (FeedEndpointID fid : auth.getEndpoint_ids()) { - ps2.setInt(1, feedid); - ps2.setString(2, fid.getId()); - ps2.setString(3, fid.getPassword()); - ps2.executeUpdate(); + try (PreparedStatement ps = conn.prepareStatement("insert into FEED_ENDPOINT_IDS values (?, ?, ?)")) { + for (FeedEndpointID fid : auth.getEndpointIDS()) { + ps.setInt(1, feedid); + ps.setString(2, fid.getId()); + ps.setString(3, fid.getPassword()); + ps.executeUpdate(); } } - // Create FEED_ENDPOINT_ADDRS rows - sql = "insert into FEED_ENDPOINT_ADDRS values (?, ?)"; - try (PreparedStatement ps2 = conn.prepareStatement(sql)) { - for (String t : auth.getEndpoint_addrs()) { - ps2.setInt(1, feedid); - ps2.setString(2, t); - ps2.executeUpdate(); + try (PreparedStatement ps = conn.prepareStatement("insert into FEED_ENDPOINT_ADDRS values (?, ?)")) { + for (String t : auth.getEndpointAddrs()) { + ps.setInt(1, feedid); + ps.setString(2, t); + ps.executeUpdate(); } } - // Finally, create the FEEDS row - sql = "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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; - try (PreparedStatement ps2 = conn.prepareStatement(sql)) { - ps2.setInt(1, feedid); - ps2.setString(2, getName()); - ps2.setString(3, getVersion()); - ps2.setString(4, getDescription()); - ps2.setString(5, getAuthorization().getClassification()); - ps2.setString(6, getPublisher()); - ps2.setString(7, getLinks().getSelf()); - ps2.setString(8, getLinks().getPublish()); - ps2.setString(9, getLinks().getSubscribe()); - ps2.setString(10, getLinks().getLog()); - ps2.setBoolean(11, isDeleted()); - ps2.setBoolean(12, isSuspended()); - ps2.setString(13, getBusiness_description()); - ps2.setInt(14, groupid); - ps2.setString(15, getAafInstance()); - ps2.executeUpdate(); + 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) { + ps.setInt(1, feedid); + ps.setString(2, getName()); + ps.setString(3, getVersion()); + ps.setString(4, getDescription()); + ps.setString(5, getAuthorization().getClassification()); + ps.setString(6, getPublisher()); + ps.setString(7, getLinks().getSelf()); + ps.setString(8, getLinks().getPublish()); + ps.setString(9, getLinks().getSubscribe()); + ps.setString(10, getLinks().getLog()); + ps.setBoolean(11, isDeleted()); + ps.setBoolean(12, isSuspended()); + ps.setString(13, getBusinessDescription()); + ps.setInt(14, groupid); + ps.setString(15, getAafInstance()); + ps.executeUpdate(); } } catch (SQLException e) { rv = false; @@ -702,88 +663,72 @@ public class Feed extends Syncable { @Override public boolean doUpdate(Connection conn) { boolean rv = true; - Feed oldobj = getFeedById(feedid); - PreparedStatement ps = null; try { - Set newset = getAuthorization().getEndpoint_ids(); - Set oldset = oldobj.getAuthorization().getEndpoint_ids(); - - // Insert new FEED_ENDPOINT_IDS rows - String sql = "insert into FEED_ENDPOINT_IDS values (?, ?, ?)"; - ps = conn.prepareStatement(sql); - for (FeedEndpointID fid : newset) { - if (!oldset.contains(fid)) { - ps.setInt(1, feedid); - ps.setString(2, fid.getId()); - ps.setString(3, fid.getPassword()); - ps.executeUpdate(); + Feed oldobj = getFeedById(feedid); + Set newset = getAuthorization().getEndpointIDS(); + Set oldset = oldobj.getAuthorization().getEndpointIDS(); + try (PreparedStatement ps = conn.prepareStatement("insert into FEED_ENDPOINT_IDS values (?, ?, ?)")) { + // Insert new FEED_ENDPOINT_IDS rows + for (FeedEndpointID fid : newset) { + if (!oldset.contains(fid)) { + ps.setInt(1, feedid); + ps.setString(2, fid.getId()); + ps.setString(3, fid.getPassword()); + ps.executeUpdate(); + } } } - ps.close(); - // Delete old FEED_ENDPOINT_IDS rows - sql = "delete from FEED_ENDPOINT_IDS where FEEDID = ? AND USERID = ? AND PASSWORD = ?"; - ps = conn.prepareStatement(sql); - for (FeedEndpointID fid : oldset) { - if (!newset.contains(fid)) { - ps.setInt(1, feedid); - ps.setString(2, fid.getId()); - ps.setString(3, fid.getPassword()); - ps.executeUpdate(); + try (PreparedStatement ps = conn.prepareStatement( + "delete from FEED_ENDPOINT_IDS where FEEDID = ? AND USERID = ? AND PASSWORD = ?")) { + for (FeedEndpointID fid : oldset) { + if (!newset.contains(fid)) { + ps.setInt(1, feedid); + ps.setString(2, fid.getId()); + ps.setString(3, fid.getPassword()); + ps.executeUpdate(); + } } } - ps.close(); - + Set newset2 = getAuthorization().getEndpointAddrs(); + Set oldset2 = oldobj.getAuthorization().getEndpointAddrs(); // Insert new FEED_ENDPOINT_ADDRS rows - Set newset2 = getAuthorization().getEndpoint_addrs(); - Set oldset2 = oldobj.getAuthorization().getEndpoint_addrs(); - sql = "insert into FEED_ENDPOINT_ADDRS values (?, ?)"; - ps = conn.prepareStatement(sql); - for (String t : newset2) { - if (!oldset2.contains(t)) { - ps.setInt(1, feedid); - ps.setString(2, t); - ps.executeUpdate(); + try (PreparedStatement ps = conn.prepareStatement("insert into FEED_ENDPOINT_ADDRS values (?, ?)")) { + for (String t : newset2) { + if (!oldset2.contains(t)) { + ps.setInt(1, feedid); + ps.setString(2, t); + ps.executeUpdate(); + } } } - ps.close(); - // Delete old FEED_ENDPOINT_ADDRS rows - sql = "delete from FEED_ENDPOINT_ADDRS where FEEDID = ? AND ADDR = ?"; - ps = conn.prepareStatement(sql); - for (String t : oldset2) { - if (!newset2.contains(t)) { - ps.setInt(1, feedid); - ps.setString(2, t); - ps.executeUpdate(); + try (PreparedStatement ps = conn.prepareStatement( + "delete from FEED_ENDPOINT_ADDRS where FEEDID = ? AND ADDR = ?")) { + for (String t : oldset2) { + if (!newset2.contains(t)) { + ps.setInt(1, feedid); + ps.setString(2, t); + ps.executeUpdate(); + } } } - ps.close(); - - // Finally, update the FEEDS row - sql = "update FEEDS set DESCRIPTION = ?, AUTH_CLASS = ?, DELETED = ?, SUSPENDED = ?, " - + "BUSINESS_DESCRIPTION=?, GROUPID=? where FEEDID = ?"; - ps = conn.prepareStatement(sql); - ps.setString(1, getDescription()); - ps.setString(2, getAuthorization().getClassification()); - ps.setInt(3, deleted ? 1 : 0); - ps.setInt(4, suspended ? 1 : 0); - ps.setString(5, getBusiness_description()); - ps.setInt(6, groupid); - ps.setInt(7, feedid); - ps.executeUpdate(); - ps.close(); + try (PreparedStatement ps = conn.prepareStatement( + "update FEEDS set DESCRIPTION = ?, AUTH_CLASS = ?, DELETED = ?, SUSPENDED = ?, " + + "BUSINESS_DESCRIPTION=?, GROUPID=? where FEEDID = ?")) { + // Finally, update the FEEDS row + ps.setString(1, getDescription()); + ps.setString(2, getAuthorization().getClassification()); + ps.setInt(3, deleted ? 1 : 0); + ps.setInt(4, suspended ? 1 : 0); + ps.setString(5, getBusinessDescription()); + ps.setInt(6, groupid); + ps.setInt(7, feedid); + ps.executeUpdate(); + } } catch (SQLException e) { rv = false; intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; } @@ -794,29 +739,15 @@ public class Feed extends Syncable { */ public boolean changeOwnerShip() { boolean rv = true; - PreparedStatement ps = null; - try { - - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - String sql = "update FEEDS set PUBLISHER = ? where FEEDID = ?"; - ps = conn.prepareStatement(sql); + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement( + "update FEEDS set PUBLISHER = ? where FEEDID = ?")) { ps.setString(1, this.publisher); ps.setInt(2, feedid); ps.execute(); - ps.close(); } catch (SQLException e) { rv = false; intlogger.warn("PROV0008 changeOwnerShip: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; }