X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FFeedService.java;h=d36adc4553627a5a8ac6d963cd10845dbfe410fa;hb=refs%2Fchanges%2F25%2F25825%2F1;hp=f5ea4df8cc07879c5b0c95b26cd463f5481a5611;hpb=6349f10fcf1902c1f41ec58c26e57dd11ea3b78f;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java b/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java
index f5ea4df..d36adc4 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java
@@ -63,11 +63,43 @@ public class FeedService  extends BaseLoggingClass {
 		f.setSubs(subs);	
 	}
 		
-	public List<Feed> getAllFeeds() {
+	public List<Feed> getAllFeeds( String name, String ver, String match ) {
+		logger.info( "getAllFeeds: name=" + name + " ver=" + ver + " match=" + match);
 		ArrayList<Feed> fatFeeds = new ArrayList<Feed>();
 		for( Feed f:  feeds.values() ) {
-			getSubObjects(f);
-			fatFeeds.add(f);
+			boolean keep = true;
+			if ( name != null ) {
+				if ( match != null && match.equals("startsWith") ) {
+					if ( ! f.getFeedName().startsWith( name ) ) {
+						logger.info( "getAllFeeds: feedName=" + f.getFeedName() + " doesn't start with=" + name);
+						keep = false;
+					}
+				} else if ( match != null && match.equals("contains") ) {
+					if ( ! f.getFeedName().contains( name ) ) {
+						logger.info( "getAllFeeds: feedName=" + f.getFeedName() + " doesn't contain=" + name);
+						keep = false;
+					}
+				} else {
+					if ( ! f.getFeedName().equals( name ) ) {
+						logger.info( "getAllFeeds: feedName=" + f.getFeedName() + " doesn't equal=" + name);
+						keep = false;
+					}
+				}
+
+			}
+			if ( keep && ver != null ) {
+				if ( ! f.getFeedVersion().equals(ver)) {
+					logger.info( "getAllFeeds: feedVersion=" + f.getFeedName() + " doesn't match " + ver);
+					keep = false;
+				} else {
+					logger.info( "getAllFeeds: feedVersion=" + f.getFeedName() + " matches " + ver);
+				}
+			}
+					
+			if (keep){
+				getSubObjects(f);
+				fatFeeds.add(f);
+			}
 		}
 		return fatFeeds;
 	}