From: Ram Koya Date: Fri, 7 Sep 2018 15:14:49 +0000 (+0000) Subject: Merge "Use images from nexus release in docker-compose" X-Git-Tag: 1.0.1~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6d2aa55b167dcd2055eb9796241c4f319ef169e6;hp=89a157bfdbe0930f2cf5e400c75c1f9cd0d3d9ad;p=dmaap%2Fdatarouter.git Merge "Use images from nexus release in docker-compose" --- diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 18743db8..5edffa66 100755 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -69,13 +69,13 @@ ch.qos.logback logback-classic - 1.2.0 + ${qos.logback.version} compile ch.qos.logback logback-core - 1.2.0 + ${qos.logback.version} compile diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 76137578..9ccbb55c 100755 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -45,13 +45,13 @@ ch.qos.logback logback-classic - 1.2.0 + ${qos.logback.version} compile ch.qos.logback logback-core - 1.2.0 + ${qos.logback.version} compile diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java index 33bf3a35..4917402c 100755 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java @@ -180,39 +180,8 @@ public class StatisticsServlet extends BaseServlet { outputType = req.getParameter("output_type"); } - try { - - String filterQuery = this.queryGeneretor(map); - eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery); - - ResultSet rs = this.getRecordsForSQL(filterQuery); + this.getRecordsForSQL(map, outputType, out, resp); - if (outputType.equals("csv")) { - resp.setContentType("application/octet-stream"); - Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss"); - resp.setHeader("Content-Disposition", - "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\""); - eventlogger.info("Generating CSV file from Statistics resultset"); - - rsToCSV(rs, out); - } else { - eventlogger.info("Generating JSON for Statistics resultset"); - this.rsToJson(rs, out); - } - } catch (IOException e) { - eventlogger.error("IOException - Generating JSON/CSV:" + e); - e.printStackTrace(); - } catch (JSONException e) { - eventlogger.error("JSONException - executing SQL query:" + e); - e.printStackTrace(); - } catch (SQLException e) { - eventlogger.error("SQLException - executing SQL query:" + e); - e.printStackTrace(); - } catch (ParseException e) { - eventlogger.error("ParseException - executing SQL query:" + e); - e.printStackTrace(); - } } @@ -565,21 +534,47 @@ public class StatisticsServlet extends BaseServlet { intlogger.info("Error parsing time=" + s); return -1; } - private ResultSet getRecordsForSQL(String sql) { - intlogger.debug(sql); + + private void getRecordsForSQL(Map map, String outputType, ServletOutputStream out, HttpServletResponse resp) { + try { + + String filterQuery = this.queryGeneretor(map); + eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery); + intlogger.debug(filterQuery); long start = System.currentTimeMillis(); DB db = new DB(); ResultSet rs = null; - try ( - Connection conn = db.getConnection()){ - try(PreparedStatement pst = conn.prepareStatement(sql)){ - rs = pst.executeQuery(); + try (Connection conn = db.getConnection()) { + try (PreparedStatement pst = conn.prepareStatement(filterQuery)) { + rs = pst.executeQuery(); + if (outputType.equals("csv")) { + resp.setContentType("application/octet-stream"); + Date date = new Date(); + SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss"); + resp.setHeader("Content-Disposition", + "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\""); + eventlogger.info("Generating CSV file from Statistics resultset"); + + rsToCSV(rs, out); + } else { + eventlogger.info("Generating JSON for Statistics resultset"); + this.rsToJson(rs, out); } + } } catch (SQLException e) { - e.printStackTrace(); - } - intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms"); - return rs; + e.printStackTrace(); } + intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms"); + } catch (IOException e) { + eventlogger.error("IOException - Generating JSON/CSV:" + e); + e.printStackTrace(); + } catch (JSONException e) { + eventlogger.error("JSONException - executing SQL query:" + e); + e.printStackTrace(); + } catch (ParseException e) { + eventlogger.error("ParseException - executing SQL query:" + e); + e.printStackTrace(); + } } +} 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 852321a9..c08bce57 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 @@ -24,20 +24,6 @@ package org.onap.dmaap.datarouter.provisioning.beans; -import java.io.InvalidObjectException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; @@ -45,6 +31,11 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities; import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; +import java.io.InvalidObjectException; +import java.sql.*; +import java.util.*; +import java.util.Date; + /** * The representation of a Feed. Feeds can be retrieved from the DB, or stored/updated in the DB. * @@ -81,13 +72,13 @@ public class Feed extends Syncable { try { DB db = new DB(); Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select COUNT(*) from FEEDS where FEEDID = " + id); - if (rs.next()) { - count = rs.getInt(1); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery("select COUNT(*) from FEEDS where FEEDID = " + id)) { + if (rs.next()) { + count = rs.getInt(1); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -131,13 +122,13 @@ public class Feed extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select count(*) from FEEDS where DELETED = 0"); - if (rs.next()) { - count = rs.getInt(1); + try(Statement stmt = conn.createStatement()) { + try (ResultSet rs = stmt.executeQuery("select count(*) from FEEDS where DELETED = 0")) { + if (rs.next()) { + count = rs.getInt(1); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { intlogger.info("countActiveFeeds: " + e.getMessage()); @@ -152,13 +143,13 @@ public class Feed extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select MAX(feedid) from FEEDS"); - if (rs.next()) { - max = rs.getInt(1); + try(Statement stmt = conn.createStatement()) { + try (ResultSet rs = stmt.executeQuery("select MAX(feedid) from FEEDS")) { + if (rs.next()) { + max = rs.getInt(1); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { intlogger.info("getMaxFeedID: " + e.getMessage()); @@ -173,40 +164,39 @@ public class Feed extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select * from FEEDS"); - while (rs.next()) { - Feed feed = new Feed(rs); - map.put(feed.getFeedid(), feed); - } - rs.close(); + 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); + } + } - String sql = "select * from FEED_ENDPOINT_IDS"; - 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); + 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); + } + } } - } - rs.close(); - sql = "select * from FEED_ENDPOINT_ADDRS"; - 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")); + 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")); + } + } } } - rs.close(); - - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -231,16 +221,16 @@ public class Feed extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - PreparedStatement ps = conn.prepareStatement(sql); - if (sql.indexOf('?') >= 0) - ps.setString(1, val); - ResultSet rs = ps.executeQuery(); - while (rs.next()) { - String t = rs.getString(1); - list.add(t.trim()); + try(PreparedStatement ps = conn.prepareStatement(sql)) { + if (sql.indexOf('?') >= 0) + ps.setString(1, val); + try(ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + String t = rs.getString(1); + list.add(t.trim()); + } + } } - rs.close(); - ps.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -254,30 +244,30 @@ public class Feed extends Syncable { try { DB db = new DB(); Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql); - if (rs.next()) { - feed = new Feed(rs); - rs.close(); - - sql = "select * from FEED_ENDPOINT_IDS where FEEDID = " + feed.feedid; - rs = stmt.executeQuery(sql); - Collection ecoll = feed.getAuthorization().getEndpoint_ids(); - while (rs.next()) { - FeedEndpointID epi = new FeedEndpointID(rs); - ecoll.add(epi); + try (Statement stmt = conn.createStatement()) { + try (ResultSet rs = stmt.executeQuery(sql)) { + if (rs.next()) { + feed = new Feed(rs); + } } - rs.close(); - - sql = "select * from FEED_ENDPOINT_ADDRS where FEEDID = " + feed.feedid; - rs = stmt.executeQuery(sql); - Collection acoll = feed.getAuthorization().getEndpoint_addrs(); - while (rs.next()) { - acoll.add(rs.getString("ADDR")); + 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(); + while (rs.next()) { + FeedEndpointID epi = new FeedEndpointID(rs); + ecoll.add(epi); + } + } + sql = "select * from FEED_ENDPOINT_ADDRS where FEEDID = " + feed.feedid; + try (ResultSet rs = stmt.executeQuery(sql)) { + Collection acoll = feed.getAuthorization().getEndpoint_addrs(); + while (rs.next()) { + acoll.add(rs.getString("ADDR")); + } + } } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -546,7 +536,9 @@ public class Feed extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -557,17 +549,8 @@ public class Feed extends Syncable { @Override public synchronized boolean doInsert(Connection c) { boolean rv = true; -// PreparedStatement ps = null; try { if (feedid == -1) { -// // Get the next feedid -// String sql = "insert into FEEDS_UNIQUEID (FEEDID) values (0)"; -// ps = c.prepareStatement(sql, new String[] { "FEEDID" }); -// ps.execute(); -// ResultSet rs = ps.getGeneratedKeys(); -// rs.first(); -// setFeedid(rs.getInt(1)); - // No feed ID assigned yet, so assign the next available one setFeedid(next_feedid++); } // In case we insert a feed from synchronization @@ -577,54 +560,48 @@ public class Feed extends Syncable { // Create FEED_ENDPOINT_IDS rows FeedAuthorization auth = getAuthorization(); String sql = "insert into FEED_ENDPOINT_IDS values (?, ?, ?)"; - PreparedStatement ps2 = c.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 ps2 = c.prepareStatement(sql)) { + for (FeedEndpointID fid : auth.getEndpoint_ids()) { + ps2.setInt(1, feedid); + ps2.setString(2, fid.getId()); + ps2.setString(3, fid.getPassword()); + ps2.executeUpdate(); + } } - ps2.close(); // Create FEED_ENDPOINT_ADDRS rows sql = "insert into FEED_ENDPOINT_ADDRS values (?, ?)"; - ps2 = c.prepareStatement(sql); - for (String t : auth.getEndpoint_addrs()) { - ps2.setInt(1, feedid); - ps2.setString(2, t); - ps2.executeUpdate(); + try(PreparedStatement ps2 = c.prepareStatement(sql)) { + for (String t : auth.getEndpoint_addrs()) { + ps2.setInt(1, feedid); + ps2.setString(2, t); + ps2.executeUpdate(); + } } - ps2.close(); // 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) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?)"; - ps2 = c.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()); // New field is added - Groups feature Rally:US708102 - 1610 - ps2.setInt(14, groupid); //New field is added - Groups feature Rally:US708115 - 1610 - ps2.executeUpdate(); - ps2.close(); + try(PreparedStatement ps2 = c.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()); // New field is added - Groups feature Rally:US708102 - 1610 + ps2.setInt(14, groupid); //New field is added - Groups feature Rally:US708115 - 1610 + ps2.executeUpdate(); + } } catch (SQLException e) { rv = false; intlogger.warn("PROV0005 doInsert: " + e.getMessage()); e.printStackTrace(); -// } finally { -// try { -// ps.close(); -// } catch (SQLException e) { -// e.printStackTrace(); -// } } return rv; } @@ -741,7 +718,9 @@ public class Feed extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -789,4 +768,9 @@ public class Feed extends Syncable { public String toString() { return "FEED: feedid=" + feedid + ", name=" + name + ", version=" + version; } + + @Override + public int hashCode() { + return Objects.hash(feedid, groupid, name, version, description, business_description, authorization, publisher, links, deleted, suspended, last_mod, created_date); + } } diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java index a021a60e..a460d647 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java @@ -29,10 +29,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; +import java.util.*; import org.apache.log4j.Logger; import org.json.JSONObject; @@ -99,14 +96,14 @@ public class Group extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - Group group = new Group(rs); - list.add(group); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery(sql)) { + while (rs.next()) { + Group group = new Group(rs); + list.add(group); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -120,13 +117,13 @@ public class Group extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select MAX(groupid) from GROUPS"); - if (rs.next()) { - max = rs.getInt(1); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery("select MAX(groupid) from GROUPS")) { + if (rs.next()) { + max = rs.getInt(1); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { intlogger.info("getMaxSubID: " + e.getMessage()); @@ -142,14 +139,14 @@ public class Group extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - int groupid = rs.getInt("groupid"); - //list.add(URLUtilities.generateSubscriptionURL(groupid)); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery(sql)) { + while (rs.next()) { + int groupid = rs.getInt("groupid"); + + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -168,13 +165,13 @@ public class Group extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select count(*) from SUBSCRIPTIONS"); - if (rs.next()) { - count = rs.getInt(1); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery("select count(*) from SUBSCRIPTIONS")) { + if (rs.next()) { + count = rs.getInt(1); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage()); @@ -351,7 +348,9 @@ public class Group extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -379,7 +378,9 @@ public class Group extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -402,7 +403,9 @@ public class Group extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -440,4 +443,9 @@ public class Group extends Syncable { public String toString() { return "GROUP: groupid=" + groupid; } + + @Override + public int hashCode() { + return Objects.hash(groupid, authid, name, description, classification, members, last_mod); + } } diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java index 0de57df2..a4ed60a2 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java @@ -85,18 +85,18 @@ public class IngressRoute extends NodeClass implements Comparable DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - int seq = rs.getInt("SEQUENCE"); - int feedid = rs.getInt("FEEDID"); - String user = rs.getString("USERID"); - String subnet = rs.getString("SUBNET"); - int nodeset = rs.getInt("NODESET"); - set.add(new IngressRoute(seq, feedid, user, subnet, nodeset)); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery(sql)) { + while (rs.next()) { + int seq = rs.getInt("SEQUENCE"); + int feedid = rs.getInt("FEEDID"); + String user = rs.getString("USERID"); + String subnet = rs.getString("SUBNET"); + int nodeset = rs.getInt("NODESET"); + set.add(new IngressRoute(seq, feedid, user, subnet, nodeset)); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -128,13 +128,13 @@ public class IngressRoute extends NodeClass implements Comparable DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql); - if (rs.next()) { - rv = rs.getInt("MAX"); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery(sql)) { + if (rs.next()) { + rv = rs.getInt("MAX"); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -162,20 +162,22 @@ public class IngressRoute extends NodeClass implements Comparable ps.setInt(1, feedid); ps.setString(2, user); ps.setString(3, subnet); - ResultSet rs = ps.executeQuery(); - if (rs.next()) { - int seq = rs.getInt("SEQUENCE"); - int nodeset = rs.getInt("NODESET"); - v = new IngressRoute(seq, feedid, user, subnet, nodeset); + try(ResultSet rs = ps.executeQuery()) { + if (rs.next()) { + int seq = rs.getInt("SEQUENCE"); + int nodeset = rs.getInt("NODESET"); + v = new IngressRoute(seq, feedid, user, subnet, nodeset); + } } - rs.close(); ps.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -191,33 +193,26 @@ public class IngressRoute extends NodeClass implements Comparable */ public static Collection getIngressRoute(int seq) { Collection rv = new ArrayList(); - PreparedStatement ps = null; try { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); String sql = "select FEEDID, USERID, SUBNET, NODESET from INGRESS_ROUTES where SEQUENCE = ?"; - ps = conn.prepareStatement(sql); - ps.setInt(1, seq); - ResultSet rs = ps.executeQuery(); - while (rs.next()) { - int feedid = rs.getInt("FEEDID"); - String user = rs.getString("USERID"); - String subnet = rs.getString("SUBNET"); - int nodeset = rs.getInt("NODESET"); - rv.add(new IngressRoute(seq, feedid, user, subnet, nodeset)); + try(PreparedStatement ps = conn.prepareStatement(sql)) { + ps.setInt(1, seq); + try(ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + int feedid = rs.getInt("FEEDID"); + String user = rs.getString("USERID"); + String subnet = rs.getString("SUBNET"); + int nodeset = rs.getInt("NODESET"); + rv.add(new IngressRoute(seq, feedid, user, subnet, nodeset)); + } + } } - rs.close(); - ps.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); - } finally { - try { - ps.close(); - } catch (SQLException e) { - e.printStackTrace(); - } } return rv; } @@ -386,31 +381,23 @@ public class IngressRoute extends NodeClass implements Comparable private Collection readNodes() { Collection set = new TreeSet(); - PreparedStatement ps = null; try { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); String sql = "select NODEID from NODESETS where SETID = ?"; - ps = conn.prepareStatement(sql); - ps.setInt(1, nodelist); - ResultSet rs = ps.executeQuery(); - while (rs.next()) { - int id = rs.getInt("NODEID"); - set.add(lookupNodeID(id)); + try(PreparedStatement ps = conn.prepareStatement(sql)) { + ps.setInt(1, nodelist); + try(ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + int id = rs.getInt("NODEID"); + set.add(lookupNodeID(id)); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); - } finally { - try { - ps.close(); - } catch (SQLException e) { - e.printStackTrace(); - } } return set; } @@ -441,7 +428,9 @@ public class IngressRoute extends NodeClass implements Comparable e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -482,7 +471,9 @@ public class IngressRoute extends NodeClass implements Comparable e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java index f50043a8..00eb6a26 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java @@ -29,6 +29,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.Objects; import java.util.SortedSet; import java.util.TreeSet; @@ -60,16 +61,16 @@ public class NetworkRoute extends NodeClass implements Comparable DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES"); - while (rs.next()) { - int fromnode = rs.getInt("FROMNODE"); - int tonode = rs.getInt("TONODE"); - int vianode = rs.getInt("VIANODE"); - set.add(new NetworkRoute(fromnode, tonode, vianode)); + try(Statement stmt = conn.createStatement()) { + try(ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) { + while (rs.next()) { + int fromnode = rs.getInt("FROMNODE"); + int tonode = rs.getInt("TONODE"); + int vianode = rs.getInt("VIANODE"); + set.add(new NetworkRoute(fromnode, tonode, vianode)); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -129,7 +130,9 @@ public class NetworkRoute extends NodeClass implements Comparable e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -157,7 +160,9 @@ public class NetworkRoute extends NodeClass implements Comparable e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -183,7 +188,9 @@ public class NetworkRoute extends NodeClass implements Comparable e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -213,6 +220,11 @@ public class NetworkRoute extends NodeClass implements Comparable return (fromnode == on.fromnode) && (tonode == on.tonode) && (vianode == on.vianode); } + @Override + public int hashCode() { + return Objects.hash(fromnode, tonode, vianode); + } + @Override public int compareTo(NetworkRoute o) { if (this.fromnode == o.fromnode) { diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java index 8e9d5bfd..3e8c90b4 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java @@ -28,10 +28,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import org.apache.log4j.Logger; import org.json.JSONObject; @@ -93,15 +90,15 @@ public class Parameters extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - String sql = "select * from PARAMETERS"; - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - Parameters p = new Parameters(rs); - coll.add(p); + try(Statement stmt = conn.createStatement()) { + String sql = "select * from PARAMETERS"; + try(ResultSet rs = stmt.executeQuery(sql)) { + while (rs.next()) { + Parameters p = new Parameters(rs); + coll.add(p); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -121,14 +118,14 @@ public class Parameters extends Syncable { DB db = new DB(); @SuppressWarnings("resource") Connection conn = db.getConnection(); - Statement stmt = conn.createStatement(); - String sql = "select KEYNAME, VALUE from PARAMETERS where KEYNAME = '" + k + "'"; - ResultSet rs = stmt.executeQuery(sql); - if (rs.next()) { - v = new Parameters(rs); + try(Statement stmt = conn.createStatement()) { + String sql = "select KEYNAME, VALUE from PARAMETERS where KEYNAME = '" + k + "'"; + try(ResultSet rs = stmt.executeQuery(sql)) { + if (rs.next()) { + v = new Parameters(rs); + } + } } - rs.close(); - stmt.close(); db.release(conn); } catch (SQLException e) { e.printStackTrace(); @@ -191,7 +188,9 @@ public class Parameters extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -216,7 +215,9 @@ public class Parameters extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -240,7 +241,9 @@ public class Parameters extends Syncable { e.printStackTrace(); } finally { try { - ps.close(); + if(ps!=null) { + ps.close(); + } } catch (SQLException e) { e.printStackTrace(); } @@ -265,6 +268,11 @@ public class Parameters extends Syncable { return true; } + @Override + public int hashCode() { + return Objects.hash(keyname, value); + } + @Override public String toString() { return "PARAM: keyname=" + keyname + ", value=" + value; diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/FeedServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/FeedServletTest.java index cb8a28da..78ac0939 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/FeedServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/FeedServletTest.java @@ -26,7 +26,9 @@ import org.apache.commons.lang3.reflect.FieldUtils; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONObject; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -34,14 +36,17 @@ import org.onap.dmaap.datarouter.authz.AuthorizationResponse; import org.onap.dmaap.datarouter.authz.Authorizer; import org.onap.dmaap.datarouter.provisioning.beans.Feed; import org.onap.dmaap.datarouter.provisioning.beans.Updateable; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; +import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.powermock.modules.junit4.PowerMockRunner; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.sql.SQLException; import java.util.HashSet; import java.util.Set; @@ -51,7 +56,6 @@ import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER; @RunWith(PowerMockRunner.class) -@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.provisioning.beans.Feed") public class FeedServletTest extends DrServletTestBase { private static FeedServlet feedServlet; @@ -61,12 +65,31 @@ public class FeedServletTest extends DrServletTestBase { @Mock private HttpServletResponse response; + private static EntityManagerFactory emf; + private static EntityManager em; + private DB db; + + @BeforeClass + public static void init() { + emf = Persistence.createEntityManagerFactory("dr-unit-tests"); + em = emf.createEntityManager(); + System.setProperty( + "org.onap.dmaap.datarouter.provserver.properties", + "src/test/resources/h2Database.properties"); + } + + @AfterClass + public static void tearDownClass() { + em.clear(); + em.close(); + emf.close(); + } + @Before public void setUp() throws Exception { - super.setUp(); feedServlet = new FeedServlet(); + db = new DB(); setAuthoriserToReturnRequestIsAuthorized(); - setPokerToNotCreateTimersWhenDeleteFeedIsCalled(); setUpValidAuthorisedRequest(); setUpValidSecurityOnHttpRequest(); setUpValidContentHeadersAndJSONOnHttpRequest(); @@ -76,7 +99,6 @@ public class FeedServletTest extends DrServletTestBase { public void Given_Request_Is_HTTP_DELETE_And_Is_Not_Secure_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception { when(request.isSecure()).thenReturn(false); - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); feedServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @@ -103,7 +125,7 @@ public class FeedServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_And_Feed_Id_Is_Invalid_Then_Not_Found_Response_Is_Generated() throws Exception { - setFeedToReturnInvalidFeedIdSupplied(); + when(request.getPathInfo()).thenReturn("/123"); feedServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -135,20 +157,15 @@ public class FeedServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_And_Delete_On_Database_Succeeds_A_NO_CONTENT_Response_Is_Generated() throws Exception { - FeedServlet feedServlet = new FeedServlet() { - protected boolean doUpdate(Updateable bean) { - return true; - } - }; feedServlet.doDelete(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_NO_CONTENT)); + reinsertFeedIntoDb(); } @Test public void Given_Request_Is_HTTP_GET_And_Is_Not_Secure_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception { when(request.isSecure()).thenReturn(false); - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); feedServlet.doGet(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @@ -174,7 +191,7 @@ public class FeedServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_GET_And_Feed_Id_Is_Invalid_Then_Not_Found_Response_Is_Generated() throws Exception { - setFeedToReturnInvalidFeedIdSupplied(); + when(request.getPathInfo()).thenReturn("/123"); feedServlet.doGet(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -202,7 +219,6 @@ public class FeedServletTest extends DrServletTestBase { public void Given_Request_Is_HTTP_PUT_And_Is_Not_Secure_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception { when(request.isSecure()).thenReturn(false); - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); feedServlet.doPut(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @@ -228,7 +244,7 @@ public class FeedServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_PUT_And_Feed_Id_Is_Invalid_Then_Not_Found_Response_Is_Generated() throws Exception { - setFeedToReturnInvalidFeedIdSupplied(); + when(request.getPathInfo()).thenReturn("/123"); feedServlet.doPut(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -319,8 +335,8 @@ public class FeedServletTest extends DrServletTestBase { FeedServlet feedServlet = new FeedServlet() { protected JSONObject getJSONfromInput(HttpServletRequest req) { JSONObject jo = new JSONObject(); - jo.put("name", "stub_name"); - jo.put("version", "1.0"); + jo.put("name", "Feed1"); + jo.put("version", "v0.1"); jo.put("authorization", JSObject); return jo; } @@ -331,7 +347,7 @@ public class FeedServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_PUT_And_Change_On_Feeds_Fails_A_STATUS_OK_Response_Is_Generated() throws Exception { + public void Given_Request_Is_HTTP_PUT_And_Change_On_Feeds_Fails_An_Internal_Server_Error_Response_Is_Generated() throws Exception { ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); @@ -339,8 +355,8 @@ public class FeedServletTest extends DrServletTestBase { FeedServlet feedServlet = new FeedServlet() { protected JSONObject getJSONfromInput(HttpServletRequest req) { JSONObject jo = new JSONObject(); - jo.put("name", "stub_name"); - jo.put("version", "1.0"); + jo.put("name", "Feed1"); + jo.put("version", "v0.1"); jo.put("authorization", JSObject); return jo; } @@ -362,16 +378,12 @@ public class FeedServletTest extends DrServletTestBase { FeedServlet feedServlet = new FeedServlet() { protected JSONObject getJSONfromInput(HttpServletRequest req) { JSONObject jo = new JSONObject(); - jo.put("name", "stub_name"); - jo.put("version", "1.0"); + jo.put("name", "Feed1"); + jo.put("version", "v0.1"); jo.put("authorization", JSObject); return jo; } - @Override - protected boolean doUpdate(Updateable bean) { - return true; - } }; feedServlet.doPut(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); @@ -416,24 +428,7 @@ public class FeedServletTest extends DrServletTestBase { } private void setValidPathInfoInHttpHeader() { - when(request.getPathInfo()).thenReturn("/123"); - } - - private void setFeedToReturnInvalidFeedIdSupplied() { - PowerMockito.mockStatic(Feed.class); - PowerMockito.when(Feed.getFeedById(anyInt())).thenReturn(null); - } - - private void setFeedToReturnValidFeedForSuppliedId() { - PowerMockito.mockStatic(Feed.class); - Feed feed = mock(Feed.class); - PowerMockito.when(Feed.getFeedById(anyInt())).thenReturn(feed); - when(feed.isDeleted()).thenReturn(false); - when(feed.asJSONObject(true)).thenReturn(mock(JSONObject.class)); - when(feed.getPublisher()).thenReturn("Stub_Value"); - when(feed.getName()).thenReturn("stub_name"); - when(feed.getVersion()).thenReturn("1.0"); - when(feed.asLimitedJSONObject()).thenReturn(mock(JSONObject.class)); + when(request.getPathInfo()).thenReturn("/1"); } private void setAuthoriserToReturnRequestNotAuthorized() throws IllegalAccessException { @@ -452,20 +447,22 @@ public class FeedServletTest extends DrServletTestBase { when(authResponse.isAuthorized()).thenReturn(true); } - private void setPokerToNotCreateTimersWhenDeleteFeedIsCalled() throws Exception { - Poker poker = mock(Poker.class); - FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true); - } - private void setUpValidAuthorisedRequest() throws Exception { setUpValidSecurityOnHttpRequest(); setBehalfHeader("Stub_Value"); setValidPathInfoInHttpHeader(); - setFeedToReturnValidFeedForSuppliedId(); } private void setUpValidContentHeadersAndJSONOnHttpRequest() { when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.feed; version=1.0"); when(request.getHeader("X-ATT-DR-ON-BEHALF-OF-GROUP")).thenReturn("stub_subjectGroup"); } + + private void reinsertFeedIntoDb() throws SQLException { + Feed feed = new Feed("Feed1","v0.1", "First Feed for testing", "First Feed for testing"); + feed.setFeedid(1); + feed.setGroupid(1); + feed.setDeleted(false); + feed.doUpdate(db.getConnection()); + } } \ No newline at end of file diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java index 5f6b7ae3..591dcc3d 100644 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java @@ -33,43 +33,35 @@ import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER; import java.io.File; import java.net.InetAddress; -import java.util.HashMap; -import java.util.Map; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.BeforeClass; +import org.junit.AfterClass; import org.mockito.Mock; -import org.onap.dmaap.datarouter.authz.AuthorizationResponse; -import org.onap.dmaap.datarouter.authz.Authorizer; + import org.onap.dmaap.datarouter.provisioning.beans.Deleteable; -import org.onap.dmaap.datarouter.provisioning.beans.Feed; import org.onap.dmaap.datarouter.provisioning.beans.Insertable; import org.onap.dmaap.datarouter.provisioning.beans.LogRecord; -import org.onap.dmaap.datarouter.provisioning.beans.NodeClass; -import org.onap.dmaap.datarouter.provisioning.beans.Parameters; -import org.onap.dmaap.datarouter.provisioning.beans.Subscription; import org.onap.dmaap.datarouter.provisioning.beans.Updateable; -import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader; -import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) @PrepareForTest(LogRecord.class) -@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.provisioning.beans.Feed", - "org.onap.dmaap.datarouter.provisioning.beans.Parameters", - "org.onap.dmaap.datarouter.provisioning.beans.NodeClass", - "org.onap.dmaap.datarouter.provisioning.beans.Subscription", - "org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader"}) public class InternalServletTest extends DrServletTestBase { - + private static EntityManagerFactory emf; + private static EntityManager em; private InternalServlet internalServlet; @Mock @@ -78,11 +70,25 @@ public class InternalServletTest extends DrServletTestBase { @Mock private HttpServletResponse response; + @BeforeClass + public static void init() { + emf = Persistence.createEntityManagerFactory("dr-unit-tests"); + em = emf.createEntityManager(); + System.setProperty( + "org.onap.dmaap.datarouter.provserver.properties", + "src/test/resources/h2Database.properties"); + } + + @AfterClass + public static void tearDownClass() { + em.clear(); + em.close(); + emf.close(); + } + @Before public void setUp() throws Exception { - super.setUp(); internalServlet = new InternalServlet(); - setAuthoriserToReturnRequestIsAuthorized(); setUpValidAuthorisedRequest(); } @@ -90,8 +96,6 @@ public class InternalServletTest extends DrServletTestBase { public void Given_Request_Is_HTTP_GET_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception { when(request.getRemoteAddr()).thenReturn("127.100.0.3"); - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); - internalServlet.doGet(request, response); verify(response) .sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); @@ -108,7 +112,7 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_With_Halt_In_Endpoint_Request_Succeeds() throws Exception { + public void Given_Request_Is_HTTP_GET_With_Halt_In_Endpoint_Then_Request_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/halt"); when(request.isSecure()).thenReturn(false); when(request.getRemoteAddr()).thenReturn("127.0.0.1"); @@ -117,7 +121,7 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_With_FetchProv_In_Endpoint_Request_Succeeds() + public void Given_Request_Is_HTTP_GET_With_FetchProv_In_Endpoint_Then_Request_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/fetchProv"); when(request.isSecure()).thenReturn(false); @@ -126,7 +130,7 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_With_Prov_In_Endpoint_Request_Succeeds() throws Exception { + public void Given_Request_Is_HTTP_GET_With_Prov_In_Endpoint_Then_Request_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/prov"); when(request.getQueryString()).thenReturn(null); setPokerToNotCreateTimers(); @@ -137,7 +141,7 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_With_Logs_In_Endpoint_Request_Succeeds() throws Exception { + public void Given_Request_Is_HTTP_GET_With_Logs_In_Endpoint_Then_Request_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/logs/"); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); @@ -146,7 +150,7 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_Starts_With_Logs_In_Endpoint_Request_Succeeds() + public void Given_Request_Is_HTTP_GET_Starts_With_Logs_In_Endpoint_Then_Request_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/logs/TestFile"); internalServlet.doGet(request, response); @@ -168,9 +172,8 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_With_Api_In_Endpoint_Request_Succeeds() throws Exception { - when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(false); + public void Given_Request_Is_HTTP_GET_With_Api_In_Endpoint_Then_Request_Succeeds() throws Exception { + when(request.getPathInfo()).thenReturn("/api/DELIVERY_MAX_RETRY_INTERVAL"); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); internalServlet.doGet(request, response); @@ -178,10 +181,9 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_With_Drlogs_In_Endpoint_Request_Succeeds() + public void Given_Request_Is_HTTP_GET_With_Drlogs_In_Endpoint_Then_Request_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/drlogs/"); - mockLogfileLoader(); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); internalServlet.doGet(request, response); @@ -189,7 +191,7 @@ public class InternalServletTest extends DrServletTestBase { } @Test - public void Given_Request_Is_HTTP_GET_Incorrect_Endpoint_Then_No_Content_Response_Is_Generated() + public void Given_Request_Is_HTTP_GET_With_Incorrect_Endpoint_Then_No_Content_Response_Is_Generated() throws Exception { when(request.getPathInfo()).thenReturn("/incorrect/"); internalServlet.doGet(request, response); @@ -209,13 +211,11 @@ public class InternalServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_PUT_With_Api_In_Endpoint_Request_Succeeds() throws Exception { - when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(false); + when(request.getPathInfo()).thenReturn("/api/NODES"); String[] values = {"V", "a", "l", "u", "e", "s"}; when(request.getParameterValues(anyString())).thenReturn(values); internalServlet = internalServerSuccess(); setPokerToNotCreateTimers(); - mockProvisioningParametersChanged(); internalServlet.doPut(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -223,8 +223,7 @@ public class InternalServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_PUT_With_Api_In_Endpoint_And_Update_Fails_Then_Internal_Server_Error_Is_Generated() throws Exception { - when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(false); + when(request.getPathInfo()).thenReturn("/api/NODES"); String[] values = {"V", "a", "l", "u", "e", "s"}; when(request.getParameterValues(anyString())).thenReturn(values); internalServlet = internalServerFailure(); @@ -255,13 +254,11 @@ public class InternalServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_With_Api_In_Endpoint_Request_Succeeds() throws Exception { - when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(false); + when(request.getPathInfo()).thenReturn("/api/NODES"); String[] values = {"V", "a", "l", "u", "e", "s"}; when(request.getParameterValues(anyString())).thenReturn(values); internalServlet = internalServerSuccess(); setPokerToNotCreateTimers(); - mockProvisioningParametersChanged(); internalServlet.doDelete(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -269,8 +266,7 @@ public class InternalServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_DELETE_With_Api_In_Endpoint_And_Delete_Fails_Then_Internal_Server_Error_Is_Generated() throws Exception { - when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(false); + when(request.getPathInfo()).thenReturn("/api/NODES"); String[] values = {"V", "a", "l", "u", "e", "s"}; when(request.getParameterValues(anyString())).thenReturn(values); internalServlet = internalServerFailure(); @@ -293,20 +289,17 @@ public class InternalServletTest extends DrServletTestBase { throws Exception { when(request.getRemoteAddr()).thenReturn("127.100.0.3"); internalServlet.doPost(request, response); - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); verify(response) .sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @Test public void Given_Request_Is_HTTP_POST_With_Api_In_Endpoint_Request_Succeeds() throws Exception { - when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(true); + when(request.getPathInfo()).thenReturn("/api/key"); String[] values = {"V", "a", "l", "u", "e", "s"}; when(request.getParameterValues(anyString())).thenReturn(values); internalServlet = internalServerSuccess(); setPokerToNotCreateTimers(); - mockProvisioningParametersChanged(); internalServlet.doPost(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -315,7 +308,6 @@ public class InternalServletTest extends DrServletTestBase { public void Given_Request_Is_HTTP_POST_With_Api_In_Endpoint_And_Insert_Fails_Then_Internal_Server_Error_Is_Generated() throws Exception { when(request.getPathInfo()).thenReturn("/api/Key"); - setParametersToNotContactDb(true); String[] values = {"V", "a", "l", "u", "e", "s"}; when(request.getParameterValues(anyString())).thenReturn(values); internalServlet = internalServerFailure(); @@ -352,7 +344,6 @@ public class InternalServletTest extends DrServletTestBase { File testDir = new File("unit-test-logs/spool"); testDir.mkdirs(); testDir.deleteOnExit(); - mockLogfileLoader(); internalServlet.doPost(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_CREATED)); } @@ -386,14 +377,6 @@ public class InternalServletTest extends DrServletTestBase { .sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } - private void setAuthoriserToReturnRequestIsAuthorized() throws IllegalAccessException { - AuthorizationResponse authResponse = mock(AuthorizationResponse.class); - Authorizer authorizer = mock(Authorizer.class); - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "authz", authorizer, true); - when(authorizer.decide(request)).thenReturn(authResponse); - when(authResponse.isAuthorized()).thenReturn(true); - } - private void setUpValidAuthorisedRequest() throws Exception { setUpValidSecurityOnHttpRequest(); setBehalfHeader("Stub_Value"); @@ -424,16 +407,6 @@ public class InternalServletTest extends DrServletTestBase { FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true); } - private void setParametersToNotContactDb(boolean isPost) { - PowerMockito.mockStatic(Parameters.class); - Parameters parameters = mock(Parameters.class); - if (isPost) { - PowerMockito.when(Parameters.getParameter(anyString())).thenReturn(null); - } else { - PowerMockito.when(Parameters.getParameter(anyString())).thenReturn(parameters); - } - } - private InternalServlet internalServerSuccess() { InternalServlet internalServlet = new InternalServlet() { @@ -469,20 +442,4 @@ public class InternalServletTest extends DrServletTestBase { }; return internalServlet; } - - private void mockProvisioningParametersChanged() throws IllegalAccessException { - PowerMockito.mockStatic(Feed.class); - PowerMockito.mockStatic(Subscription.class); - PowerMockito.when(Feed.countActiveFeeds()).thenReturn(0); - PowerMockito.when(Subscription.countActiveSubscriptions()).thenReturn(0); - Map map = new HashMap<>(); - FieldUtils.writeDeclaredStaticField(NodeClass.class, "map", map, true); - } - - private void mockLogfileLoader() { - PowerMockito.mockStatic(LogfileLoader.class); - LogfileLoader logfileLoader = mock(LogfileLoader.class); - when(logfileLoader.getBitSet()).thenReturn(new RLEBitSet()); - PowerMockito.when(LogfileLoader.getLoader()).thenReturn(logfileLoader); - } } diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java index 0babdc47..64d13e94 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java @@ -23,32 +23,35 @@ package org.onap.dmaap.datarouter.provisioning; import static org.hamcrest.Matchers.notNullValue; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doCallRealMethod; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; +import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.powermock.modules.junit4.PowerMockRunner; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + @RunWith(PowerMockRunner.class) -@PrepareForTest(StatisticsServlet.class) -public class StatisticsServletTest extends DrServletTestBase { +public class StatisticsServletTest { private StatisticsServlet statisticsServlet; @@ -58,10 +61,31 @@ public class StatisticsServletTest extends DrServletTestBase { @Mock private HttpServletResponse response; + private DB db; + + private static EntityManagerFactory emf; + private static EntityManager em; + + @BeforeClass + public static void init() { + emf = Persistence.createEntityManagerFactory("dr-unit-tests"); + em = emf.createEntityManager(); + System.setProperty( + "org.onap.dmaap.datarouter.provserver.properties", + "src/test/resources/h2Database.properties"); + } + + @AfterClass + public static void tearDownClass() { + em.clear(); + em.close(); + emf.close(); + } + @Before public void setUp() throws Exception { - super.setUp(); statisticsServlet = new StatisticsServlet(); + db = new DB(); buildRequestParameters(); } @@ -101,15 +125,9 @@ public class StatisticsServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_GET_With_GroupId_But_No_FeedId_Parameters_Then_Request_Succeeds() throws Exception { + addAliasForSubstringIndex(); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); - statisticsServlet = PowerMockito.mock(StatisticsServlet.class); - PowerMockito.doReturn(null).when(statisticsServlet, "getRecordsForSQL", anyString()); - PowerMockito.doCallRealMethod().when(statisticsServlet, "buildMapFromRequest", anyObject()); - PowerMockito.doCallRealMethod().when(statisticsServlet, "getTimeFromParam", anyString()); - doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject()); - doCallRealMethod().when(statisticsServlet).doGet(request, response); - when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1")); statisticsServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -117,18 +135,11 @@ public class StatisticsServletTest extends DrServletTestBase { @Test public void Given_Request_Is_HTTP_GET_With_GroupId_And_FeedId_Parameters_Then_Request_Succeeds() throws Exception { + addAliasForSubstringIndex(); when(request.getParameter("feedid")).thenReturn("1"); when(request.getParameter("statusCode")).thenReturn("500"); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); - statisticsServlet = PowerMockito.mock(StatisticsServlet.class); - PowerMockito.doReturn(null).when(statisticsServlet, "getRecordsForSQL", anyString()); - PowerMockito.doCallRealMethod().when(statisticsServlet, "buildMapFromRequest", anyObject()); - PowerMockito.doCallRealMethod().when(statisticsServlet, "getTimeFromParam", anyString()); - doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject()); - doCallRealMethod().when(statisticsServlet).doGet(request, response); - doCallRealMethod().when(statisticsServlet).queryGeneretor(anyObject()); - when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1")); statisticsServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -147,4 +158,10 @@ public class StatisticsServletTest extends DrServletTestBase { when(request.getParameter("groupid")).thenReturn("1"); when(request.getParameter("subid")).thenReturn("1"); } + private void addAliasForSubstringIndex() throws SQLException { + String sql = "CREATE ALIAS IF NOT EXISTS `SUBSTRING_INDEX`AS $$ String Function(String one, String two, String three){ return \"url\"; }$$;"; + Connection conn = db.getConnection(); + PreparedStatement pst = conn.prepareStatement(sql); + pst.execute(); + } } diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java index d2e3ccc0..472be512 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java @@ -62,6 +62,9 @@ public class SubscriptionServletTest { private static EntityManager em; private SubscriptionServlet subscriptionServlet; private DB db; + private final String URL= "https://172.100.0.5"; + private final String USER = "user1"; + private final String PASSWORD="password1"; @Mock private HttpServletRequest request; @@ -324,6 +327,7 @@ public class SubscriptionServletTest { }; subscriptionServlet.doPut(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); + changeSubscriptionBackToNormal(); } @Test @@ -475,15 +479,29 @@ public class SubscriptionServletTest { } private void insertSubscriptionIntoDb() throws SQLException { - Subscription subscription = new Subscription("https://172.100.0.5", "user1", "password1"); + Subscription subscription = new Subscription(URL, USER, PASSWORD); subscription.setSubid(1); subscription.setSubscriber("user1"); subscription.setFeedid(1); - SubDelivery subDelivery = new SubDelivery("https://172.100.0.5:8080", "user1", "password1", true); + SubDelivery subDelivery = new SubDelivery(URL, USER, PASSWORD, true); subscription.setDelivery(subDelivery); subscription.setGroupid(1); subscription.setMetadataOnly(false); subscription.setSuspended(false); subscription.doInsert(db.getConnection()); } + + private void changeSubscriptionBackToNormal() throws SQLException { + Subscription subscription = new Subscription("https://172.100.0.5", "user1", "password1"); + subscription.setSubid(1); + subscription.setSubscriber("user1"); + subscription.setFeedid(1); + SubDelivery subDelivery = new SubDelivery(URL, USER, PASSWORD, true); + subscription.setDelivery(subDelivery); + subscription.setGroupid(1); + subscription.setMetadataOnly(false); + subscription.setSuspended(false); + subscription.changeOwnerShip(); + subscription.doUpdate(db.getConnection()); + } } \ No newline at end of file diff --git a/datarouter-prov/src/test/resources/create.sql b/datarouter-prov/src/test/resources/create.sql index c72c42a1..2f9d3d9c 100755 --- a/datarouter-prov/src/test/resources/create.sql +++ b/datarouter-prov/src/test/resources/create.sql @@ -151,6 +151,9 @@ VALUES (1, 1, 'https://172.100.0.5:8080', 'user1', 'password1', true, false, 'us INSERT INTO SUBSCRIPTIONS(SUBID, FEEDID, DELIVERY_URL, DELIVERY_USER, DELIVERY_PASSWORD, SUBSCRIBER, SELF_LINK, LOG_LINK) VALUES (23, 1, 'http://delivery_url', 'user1', 'somepassword', 'sub123', 'selflink', 'loglink'); +INSERT INTO FEED_ENDPOINT_IDS(FEEDID, USERID, PASSWORD) +VALUES (1, 'USER', 'PASSWORD'); + INSERT INTO FEEDS(FEEDID, GROUPID, NAME, VERSION, DESCRIPTION, BUSINESS_DESCRIPTION, AUTH_CLASS, PUBLISHER, SELF_LINK, PUBLISH_LINK, SUBSCRIBE_LINK, LOG_LINK) VALUES (1, 1,'Feed1','v0.1', 'First Feed for testing', 'First Feed for testing', 'auth_class', 'pub','self_link','publish_link','subscribe_link','log_link'); @@ -161,4 +164,13 @@ insert into INGRESS_ROUTES(SEQUENCE, FEEDID , USERID, SUBNET, NODESET) VALUES (2,1,'user',null,2); insert into NODESETS(SETID, NODEID) -VALUES (2,0); \ No newline at end of file +VALUES (2,0); + +insert into LOG_RECORDS(RECORD_ID,TYPE,EVENT_TIME,PUBLISH_ID,FEEDID,REQURI,METHOD,CONTENT_TYPE,CONTENT_LENGTH,FEED_FILEID,REMOTE_ADDR,USER,STATUS,DELIVERY_SUBID,DELIVERY_FILEID,RESULT,ATTEMPTS,REASON) +VALUES(1,'pub',2536159564422,'ID',1,'URL','GET','application/vnd.att-dr.log-list; version=1.0',100,1,'172.0.0.8','user',204,1,1,204,0,'other'); + +CREATE ALIAS IF NOT EXISTS `SUBSTRING_INDEX` AS $$ + String Function(String one, String two, String three){ + return "url"; + } +$$; \ No newline at end of file diff --git a/datarouter-prov/src/test/resources/h2Database.properties b/datarouter-prov/src/test/resources/h2Database.properties index 11f13810..336af0e2 100755 --- a/datarouter-prov/src/test/resources/h2Database.properties +++ b/datarouter-prov/src/test/resources/h2Database.properties @@ -25,4 +25,6 @@ org.onap.dmaap.datarouter.db.driver = org.h2.Driver org.onap.dmaap.datarouter.db.url = jdbc:h2:mem:test;DB_CLOSE_DELAY=-1 org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true -org.onap.dmaap.datarouter.provserver.https.relaxation = false \ No newline at end of file +org.onap.dmaap.datarouter.provserver.https.relaxation = false +org.onap.dmaap.datarouter.provserver.accesslog.dir = unit-test-logs +org.onap.dmaap.datarouter.provserver.spooldir = unit-test-logs/spool \ No newline at end of file diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml index 52cb25c7..8138f9a1 100755 --- a/datarouter-subscriber/pom.xml +++ b/datarouter-subscriber/pom.xml @@ -91,6 +91,23 @@ jetty-io ${jetty.version} + + com.thoughtworks.xstream + xstream + ${thoughtworks.version} + + + ch.qos.logback + logback-classic + ${qos.logback.version} + compile + + + ch.qos.logback + logback-core + ${qos.logback.version} + compile + org.apache.httpcomponents httpclient @@ -119,6 +136,11 @@ 1.2.17 compile + + org.apache.commons + commons-io + 1.3.2 + @@ -210,7 +232,7 @@ true - org.onap.dmaap.datarouter.subscriber.Subscriber + org.onap.dmaap.datarouter.subscriber.SubscriberMain diff --git a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java new file mode 100644 index 00000000..58bc4c40 --- /dev/null +++ b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java @@ -0,0 +1,190 @@ +/******************************************************************************* + * ============LICENSE_START================================================== + * * org.onap.dmaap + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * + ******************************************************************************/ +package org.onap.dmaap.datarouter.subscriber; + +import org.apache.commons.codec.binary.Base64; +import org.apache.log4j.Logger; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +public class SampleSubscriberServlet extends HttpServlet { + + private static Logger logger = + Logger.getLogger("org.onap.dmaap.datarouter.subscriber.SampleSubscriberServlet"); + private String outputDirectory; + private String basicAuth; + + /** + * Configure the SampleSubscriberServlet. + * + *
    + *
  • Login - The login expected in the Authorization header (default "LOGIN"). + *
  • Password - The password expected in the Authorization header (default "PASSWORD"). + *
  • outputDirectory - The directory where files are placed (default + * "/opt/app/subscriber/delivery"). + *
+ */ + @Override + public void init() { + SubscriberProps props = SubscriberProps.getInstance(); + String login = props.getValue("org.onap.dmaap.datarouter.subscriber.auth.user", "LOGIN"); + String password = + props.getValue("org.onap.dmaap.datarouter.subscriber.auth.password", "PASSWORD"); + outputDirectory = + props.getValue( + "org.onap.dmaap.datarouter.subscriber.delivery.dir", "/opt/app/subscriber/delivery"); + try { + Files.createDirectory(Paths.get(outputDirectory)); + } catch (IOException e) { + logger.info("SubServlet: Failed to create delivery dir: " + e.getMessage()); + } + basicAuth = "Basic " + Base64.encodeBase64String((login + ":" + password).getBytes()); + } + + @Override + protected void doPut(HttpServletRequest req, HttpServletResponse resp) { + try { + common(req, resp, false); + } catch (IOException e) { + logger.info( + "SampleSubServlet: Failed to doPut: " + req.getRemoteAddr() + " : " + req.getPathInfo(), + e); + } + } + + @Override + protected void doDelete(HttpServletRequest req, HttpServletResponse resp) { + try { + common(req, resp, true); + } catch (IOException e) { + logger.info( + "SampleSubServlet: Failed to doDelete: " + + req.getRemoteAddr() + + " : " + + req.getPathInfo(), + e); + } + } + /** + * Process a PUT or DELETE request. + * + *
    + *
  1. Verify that the request contains an Authorization header or else UNAUTHORIZED. + *
  2. Verify that the Authorization header matches the configured Login and Password or else + * FORBIDDEN. + *
  3. If the request is PUT, store the message body as a file in the configured outputDirectory + * directory protecting against evil characters in the received FileID. The file is created + * initially with its name prefixed with a ".", and once it is complete, it is renamed to + * remove the leading "." character. + *
  4. If the request is DELETE, instead delete the file (if it exists) from the configured + * outputDirectory directory. + *
  5. Respond with NO_CONTENT. + *
+ */ + private void common(HttpServletRequest req, HttpServletResponse resp, boolean isdelete) + throws IOException { + String authHeader = req.getHeader("Authorization"); + if (authHeader == null) { + logger.info( + "SampleSubServlet: Rejecting request with no Authorization header from " + + req.getRemoteAddr() + + ": " + + req.getPathInfo()); + resp.sendError(HttpServletResponse.SC_UNAUTHORIZED); + return; + } + if (!basicAuth.equals(authHeader)) { + logger.info( + "SampleSubServlet: Rejecting request with incorrect Authorization header from " + + req.getRemoteAddr() + + ": " + + req.getPathInfo()); + resp.sendError(HttpServletResponse.SC_FORBIDDEN); + return; + } + String fileid = req.getPathInfo(); + fileid = fileid.substring(fileid.lastIndexOf('/') + 1); + String queryString = req.getQueryString(); + if (queryString != null) { + fileid = fileid + "?" + queryString; + } + String publishid = req.getHeader("X-ATT-DR-PUBLISH-ID"); + String filename = + URLEncoder.encode(fileid, "UTF-8").replaceAll("^\\.", "%2E").replaceAll("\\*", "%2A"); + String fullPath = outputDirectory + "/" + filename; + String tmpPath = outputDirectory + "/." + filename; + try { + if (isdelete) { + Files.deleteIfExists(Paths.get(fullPath)); + logger.info( + "SampleSubServlet: Received delete for file id " + + fileid + + " from " + + req.getRemoteAddr() + + " publish id " + + publishid + + " as " + + fullPath); + } else { + new File(tmpPath).createNewFile(); + try (InputStream is = req.getInputStream(); + OutputStream os = new FileOutputStream(tmpPath)) { + byte[] buf = new byte[65536]; + int i; + while ((i = is.read(buf)) > 0) { + os.write(buf, 0, i); + } + } + Files.move(Paths.get(tmpPath), Paths.get(fullPath), StandardCopyOption.REPLACE_EXISTING); + logger.info( + "SampleSubServlet: Received file id " + + fileid + + " from " + + req.getRemoteAddr() + + " publish id " + + publishid + + " as " + + fullPath); + resp.setStatus(HttpServletResponse.SC_NO_CONTENT); + } + resp.setStatus(HttpServletResponse.SC_NO_CONTENT); + } catch (IOException ioe) { + Files.deleteIfExists(Paths.get(tmpPath)); + logger.info( + "SampleSubServlet: Failed to process file " + + fullPath + + " from " + + req.getRemoteAddr() + + ": " + + req.getPathInfo()); + throw ioe; + } + } +} diff --git a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/Subscriber.java b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java similarity index 70% rename from datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/Subscriber.java rename to datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java index b6edb670..bbe5e325 100644 --- a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/Subscriber.java +++ b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberMain.java @@ -24,45 +24,23 @@ package org.onap.dmaap.datarouter.subscriber; import org.apache.log4j.Logger; -import org.eclipse.jetty.servlet.*; -import org.eclipse.jetty.util.ssl.*; -import org.eclipse.jetty.server.*; import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.server.*; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.util.ssl.SslContextFactory; -import java.io.FileInputStream; -import java.io.IOException; import java.util.Arrays; -import java.util.Properties; - -public class Subscriber { - private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.subscriber.Subscriber"); +public class SubscriberMain { - private static final String CONTEXT_PATH = "/"; - private static final String URL_PATTERN = "/*"; - - static Properties props; - - private static void loadProps() { - if (props == null) { - props = new Properties(); - try { - props.load(new FileInputStream(System.getProperty( - "org.onap.dmaap.datarouter.subscriber.properties", - "/opt/app/subscriber/etc/subscriber.properties"))); - } catch (IOException e) { - logger.fatal("SubServlet: Exception opening properties: " + e.getMessage()); - System.exit(1); - } - } - } + private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.subscriber.SubscriberMain"); public static void main(String[] args) throws Exception { - //Load the properties - loadProps(); - - int httpsPort = Integer.parseInt(props.getProperty("org.onap.dmaap.datarouter.subscriber.https.port", "8443")); - int httpPort = Integer.parseInt(props.getProperty("org.onap.dmaap.datarouter.subscriber.http.port", "8080")); + SubscriberProps props = SubscriberProps.getInstance( + System.getProperty("org.onap.dmaap.datarouter.subscriber.properties", "subscriber.properties")); + int httpsPort = Integer.parseInt(props.getValue("org.onap.dmaap.datarouter.subscriber.https.port", "8443")); + int httpPort = Integer.parseInt(props.getValue("org.onap.dmaap.datarouter.subscriber.http.port", "8080")); Server server = new Server(); HttpConfiguration httpConfig = new HttpConfiguration(); @@ -91,7 +69,7 @@ public class Subscriber { /*Skip SSLv3 Fixes*/ sslContextFactory.addExcludeProtocols("SSLv3"); - logger.info("Excluded protocols for Subscriber:" + Arrays.toString(sslContextFactory.getExcludeProtocols())); + logger.info("Excluded protocols for SubscriberMain:" + Arrays.toString(sslContextFactory.getExcludeProtocols())); /*End of SSLv3 Fixes*/ // HTTPS Configuration @@ -104,17 +82,17 @@ public class Subscriber { server.setConnectors(new Connector[]{ httpServerConnector }); } ctxt = new ServletContextHandler(0); - ctxt.setContextPath(CONTEXT_PATH); + ctxt.setContextPath("/"); server.setHandler(ctxt); - ctxt.addServlet(new ServletHolder(new SubscriberServlet()), URL_PATTERN); + ctxt.addServlet(new ServletHolder(new SampleSubscriberServlet()), "/*"); try { server.start(); } catch ( Exception e ) { logger.info("Jetty failed to start. Reporting will be unavailable-"+e); } server.join(); - logger.info("org.onap.dmaap.datarouter.subscriber.Subscriber started-"+ server.getState()); + logger.info("org.onap.dmaap.datarouter.subscriber.SubscriberMain started-"+ server.getState()); } } \ No newline at end of file diff --git a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberProps.java b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberProps.java new file mode 100644 index 00000000..39ab166b --- /dev/null +++ b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberProps.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * ============LICENSE_START================================================== + * * org.onap.dmaap + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * + ******************************************************************************/ + +package org.onap.dmaap.datarouter.subscriber; + +import java.io.IOException; +import java.util.Properties; + +public class SubscriberProps { + + private static SubscriberProps instance = null; + private Properties properties; + + private SubscriberProps(String propsPath) throws IOException{ + properties = new Properties(); + properties.load(getClass().getClassLoader().getResourceAsStream(propsPath)); + + } + + public static SubscriberProps getInstance(String propsPath) { + if(instance == null) { + try { + instance = new SubscriberProps(propsPath); + } catch (IOException ioe) { + ioe.printStackTrace(); + } + } + return instance; + } + + public static SubscriberProps getInstance() { + return instance; + } + + public String getValue(String key) { + return properties.getProperty(key); + } + + public String getValue(String key, String defaultValue) { + return properties.getProperty(key, defaultValue); + } + +} \ No newline at end of file diff --git a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberServlet.java b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberServlet.java deleted file mode 100644 index 72afcf06..00000000 --- a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SubscriberServlet.java +++ /dev/null @@ -1,168 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START================================================== - * * org.onap.dmaap - * * =========================================================================== - * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * * =========================================================================== - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * * ============LICENSE_END==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ - -package org.onap.dmaap.datarouter.subscriber; - -import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; - -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.PosixFilePermissions; - -import static org.onap.dmaap.datarouter.subscriber.Subscriber.props; - -public class SubscriberServlet extends HttpServlet { - - private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.subscriber.SubscriberServlet"); - private String outputDirectory; - private String basicAuth; - - /** - * Configure this subscriberservlet. Configuration parameters from config.getInitParameter() are: - *
    - *
  • Login - The login expected in the Authorization header (default "LOGIN"). - *
  • Password - The password expected in the Authorization header (default "PASSWORD"). - *
  • outputDirectory - The directory where files are placed (default "tmp"). - *
- */ - @Override - public void init(ServletConfig config) { - String login = props.getProperty("org.onap.dmaap.datarouter.subscriber.auth.user", "LOGIN"); - String password = props.getProperty("org.onap.dmaap.datarouter.subscriber.auth.password", "PASSWORD"); - outputDirectory = props.getProperty("org.onap.dmaap.datarouter.subscriber.delivery.dir", "/tmp"); - try { - Files.createDirectory(Paths.get(outputDirectory), PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxrwxrwx"))); - } catch (IOException e) { - logger.info("SubServlet: Failed to create delivery dir: " + e.getMessage()); - e.printStackTrace(); - } - basicAuth = "Basic " + Base64.encodeBase64String((login + ":" + password).getBytes()); - } - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { - File filesPath = new File(outputDirectory); - File[] filesArr = filesPath.listFiles(); - assert filesArr != null; - for (File file: filesArr) { - try (BufferedReader in = new BufferedReader(new FileReader(file))) { - String line = in.readLine(); - while (line != null) { - line = in.readLine(); - } - } - } - } - /** - * Invoke common(req, resp, false). - */ - @Override - protected void doPut(HttpServletRequest req, HttpServletResponse resp) { - try { - common(req, resp, false); - } catch (IOException e) { - logger.info("SubServlet: Failed to doPut: " + req.getRemoteAddr() + " : " + req.getPathInfo(), e); - } - } - /** - * Invoke common(req, resp, true). - */ - @Override - protected void doDelete(HttpServletRequest req, HttpServletResponse resp) { - try { - common(req, resp, true); - } catch (IOException e) { - logger.info("SubServlet: Failed to doDelete: " + req.getRemoteAddr() + " : " + req.getPathInfo(), e); - } - } - /** - * Process a PUT or DELETE request. - *
    - *
  1. Verify that the request contains an Authorization header - * or else UNAUTHORIZED. - *
  2. Verify that the Authorization header matches the configured - * Login and Password or else FORBIDDEN. - *
  3. If the request is PUT, store the message body as a file - * in the configured outputDirectory directory protecting against - * evil characters in the received FileID. The file is created - * initially with its name prefixed with a ".", and once it is complete, it is - * renamed to remove the leading "." character. - *
  4. If the request is DELETE, instead delete the file (if it exists) from the configured outputDirectory directory. - *
  5. Respond with NO_CONTENT. - *
- */ - private void common(HttpServletRequest req, HttpServletResponse resp, boolean isdelete) throws IOException { - String authHeader = req.getHeader("Authorization"); - if (authHeader == null) { - logger.info("Rejecting request with no Authorization header from " + req.getRemoteAddr() + ": " + req.getPathInfo()); - resp.sendError(HttpServletResponse.SC_UNAUTHORIZED); - return; - } - if (!basicAuth.equals(authHeader)) { - logger.info("Rejecting request with incorrect Authorization header from " + req.getRemoteAddr() + ": " + req.getPathInfo()); - resp.sendError(HttpServletResponse.SC_FORBIDDEN); - return; - } - String fileid = req.getPathInfo(); - fileid = fileid.substring(fileid.lastIndexOf('/') + 1); - String queryString = req.getQueryString(); - if (queryString != null) { - fileid = fileid + "?" + queryString; - } - String publishid = req.getHeader("X-ATT-DR-PUBLISH-ID"); - String filename = URLEncoder.encode(fileid, "UTF-8").replaceAll("^\\.", "%2E").replaceAll("\\*", "%2A"); - String fullPath = outputDirectory + "/" + filename; - String tmpPath = outputDirectory + "/." + filename; - try { - if (isdelete) { - Files.deleteIfExists(Paths.get(fullPath)); - logger.info("Received delete for file id " + fileid + " from " + req.getRemoteAddr() + " publish id " + publishid + " as " + fullPath); - } else { - new File(tmpPath).createNewFile(); - try (InputStream is = req.getInputStream(); OutputStream os = new FileOutputStream(tmpPath)) { - byte[] buf = new byte[65536]; - int i; - while ((i = is.read(buf)) > 0) { - os.write(buf, 0, i); - } - } - Files.move(Paths.get(tmpPath), Paths.get(fullPath), StandardCopyOption.REPLACE_EXISTING); - logger.info("Received file id " + fileid + " from " + req.getRemoteAddr() + " publish id " + publishid + " as " + fullPath); - resp.setStatus(HttpServletResponse.SC_NO_CONTENT); - } - resp.setStatus(HttpServletResponse.SC_NO_CONTENT); - } catch (IOException ioe) { - Files.deleteIfExists(Paths.get(tmpPath)); - logger.info("Failed to process file " + fullPath + " from " + req.getRemoteAddr() + ": " + req.getPathInfo()); - throw ioe; - } - } -} diff --git a/datarouter-subscriber/src/main/resources/docker/startup.sh b/datarouter-subscriber/src/main/resources/docker/startup.sh index 53b1053d..fb5610d7 100644 --- a/datarouter-subscriber/src/main/resources/docker/startup.sh +++ b/datarouter-subscriber/src/main/resources/docker/startup.sh @@ -5,7 +5,7 @@ CLASSPATH=$ETC for FILE in `find $LIB -name *.jar`; do CLASSPATH=$CLASSPATH:$FILE done -java -classpath $CLASSPATH org.onap.dmaap.datarouter.subscriber.Subscriber +java -classpath $CLASSPATH org.onap.dmaap.datarouter.subscriber.SubscriberMain runner_file="$LIB/subscriber-jar-with-dependencies.jar" echo "Starting using" $runner_file diff --git a/datarouter-subscriber/src/main/resources/subscriber.properties b/datarouter-subscriber/src/main/resources/subscriber.properties index 771fdd34..ed3237b4 100644 --- a/datarouter-subscriber/src/main/resources/subscriber.properties +++ b/datarouter-subscriber/src/main/resources/subscriber.properties @@ -21,7 +21,7 @@ # * #------------------------------------------------------------------------------- -#Subscriber properties +#SubscriberMain properties org.onap.dmaap.datarouter.subscriber.http.port = 7070 org.onap.dmaap.datarouter.subscriber.https.port = 7443 org.onap.dmaap.datarouter.subscriber.auth.user = LOGIN diff --git a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java new file mode 100755 index 00000000..e31b3473 --- /dev/null +++ b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java @@ -0,0 +1,107 @@ +/******************************************************************************* + * ============LICENSE_START================================================== + * * org.onap.dmaap + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * + ******************************************************************************/ +package org.onap.dmaap.datarouter.subscriber; + +import org.apache.commons.io.FileUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.powermock.modules.junit4.PowerMockRunner; + +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; + +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.*; + +@RunWith(PowerMockRunner.class) +public class SampleSubscriberServletTest { + + private SampleSubscriberServlet sampleSubServlet; + private SubscriberProps props = SubscriberProps.getInstance(); + + @Mock private HttpServletRequest request; + @Mock private HttpServletResponse response; + + @Before + public void setUp() { + props = + SubscriberProps.getInstance( + System.getProperty( + "org.onap.dmaap.datarouter.subscriber.properties", "testsubscriber.properties")); + sampleSubServlet = new SampleSubscriberServlet(); + sampleSubServlet.init(); + } + + @After + public void tearDown() throws Exception { + FileUtils.deleteDirectory( + new File(props.getValue("org.onap.dmaap.datarouter.subscriber.delivery.dir"))); + } + + @Test + public void + Given_Request_Is_HTTP_PUT_And_Request_Header_Is_Null_Then_Unathorized_Response_Is_Generated() + throws Exception { + when(request.getHeader("Authorization")).thenReturn(null); + sampleSubServlet.doPut(request, response); + verify(response).sendError(eq(HttpServletResponse.SC_UNAUTHORIZED)); + } + + @Test + public void + Given_Request_Is_HTTP_PUT_And_Request_Header_Is_Not_Authorized_Then_Forbidden_Response_Is_Generated() + throws Exception { + when(request.getHeader("Authorization")).thenReturn("Invalid Header"); + sampleSubServlet.doPut(request, response); + verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN)); + } + + @Test + public void Given_Request_Is_HTTP_PUT_Then_Request_Succeeds() throws Exception { + setUpSuccessfulFlow(); + sampleSubServlet.doPut(request, response); + verify(response, times(2)).setStatus(eq(HttpServletResponse.SC_NO_CONTENT)); + } + + @Test + public void Given_Request_Is_HTTP_DELETE_Then_Request_Succeeds() throws Exception { + setUpSuccessfulFlow(); + sampleSubServlet.doDelete(request, response); + verify(response).setStatus(eq(HttpServletResponse.SC_NO_CONTENT)); + } + + private void setUpSuccessfulFlow() throws IOException { + when(request.getHeader("Authorization")).thenReturn("Basic TE9HSU46UEFTU1dPUkQ="); + when(request.getPathInfo()).thenReturn("/publish/1/testfile"); + when(request.getHeader("X-ATT-DR-PUBLISH-ID")).thenReturn("1"); + when(request.getQueryString()).thenReturn(null); + ServletInputStream inStream = mock(ServletInputStream.class); + when(request.getInputStream()).thenReturn(inStream); + } +} diff --git a/datarouter-subscriber/src/test/resources/log4j.properties b/datarouter-subscriber/src/test/resources/log4j.properties new file mode 100644 index 00000000..b8d349e6 --- /dev/null +++ b/datarouter-subscriber/src/test/resources/log4j.properties @@ -0,0 +1,31 @@ +#------------------------------------------------------------------------------- +# ============LICENSE_START================================================== +# * org.onap.dmaap +# * =========================================================================== +# * Copyright � 2017 AT&T Intellectual Property. All rights reserved. +# * =========================================================================== +# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, software +# * distributed under the License is distributed on an "AS IS" BASIS, +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# * See the License for the specific language governing permissions and +# * limitations under the License. +# * ============LICENSE_END==================================================== +# * +# * ECOMP is a trademark and service mark of AT&T Intellectual Property. +# * +#------------------------------------------------------------------------------- + +log4j.rootLogger=info,Root + +log4j.appender.Root=org.apache.log4j.DailyRollingFileAppender +log4j.appender.Root.file=./logs/subscriber.log +log4j.appender.Root.datePattern='.'yyyyMMdd +log4j.appender.Root.append=true +log4j.appender.Root.layout=org.apache.log4j.PatternLayout +log4j.appender.Root.layout.ConversionPattern=%d %p %t %m%n diff --git a/datarouter-subscriber/src/test/resources/testsubscriber.properties b/datarouter-subscriber/src/test/resources/testsubscriber.properties new file mode 100644 index 00000000..2bdd3629 --- /dev/null +++ b/datarouter-subscriber/src/test/resources/testsubscriber.properties @@ -0,0 +1,31 @@ +#------------------------------------------------------------------------------- +# ============LICENSE_START================================================== +# * org.onap.dmaap +# * =========================================================================== +# * Copyright � 2017 AT&T Intellectual Property. All rights reserved. +# * =========================================================================== +# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, software +# * distributed under the License is distributed on an "AS IS" BASIS, +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# * See the License for the specific language governing permissions and +# * limitations under the License. +# * ============LICENSE_END==================================================== +# * +# * ECOMP is a trademark and service mark of AT&T Intellectual Property. +# * +#------------------------------------------------------------------------------- + +#SubscriberMain test properties +org.onap.dmaap.datarouter.subscriber.http.port = 7070 +org.onap.dmaap.datarouter.subscriber.https.port = 7443 +org.onap.dmaap.datarouter.subscriber.auth.user = LOGIN +org.onap.dmaap.datarouter.subscriber.auth.password = PASSWORD +org.onap.dmaap.datarouter.subscriber.delivery.dir = tmp + + diff --git a/pom.xml b/pom.xml index 43aeca21..2781ab0c 100755 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ 9.3.8.RC0 8.2.0.v20160908 1.4.10 + 1.2.3 /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/