Fix reference to DR_Sub

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / resources / FeedResource.java

diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java
index eead1de..97336c1 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java
@@ -100,7 +100,8 @@ public class FeedResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        public Response addFeed( 
-                       @WebParam(name = "feed") Feed feed 
+                       @WebParam(name = "feed") Feed feed,
+                       @QueryParam("useExisting") String useExisting
                        ) {
 
                ApiService resp = new ApiService();
@@ -115,6 +116,7 @@ public class FeedResource extends BaseLoggingClass {
                        return resp.error();    
                }
                
+               
                FeedService feedService = new FeedService();
                Feed nfeed =  feedService.getFeedByName( feed.getFeedName(), feed.getFeedVersion(), resp.getErr() );
                if ( nfeed == null ) {
@@ -127,7 +129,8 @@ public class FeedResource extends BaseLoggingClass {
                                return resp.error();                    
                        }
                } else if ( nfeed.getStatus() == DmaapObject_Status.DELETED ) {
-                       nfeed =  feedService.updateFeed(nfeed, resp.getErr());
+                       feed.setFeedId( nfeed.getFeedId());
+                       nfeed =  feedService.updateFeed(feed, resp.getErr());
                        if ( nfeed != null ) {
                                return resp.success(nfeed);
                        } else {
@@ -135,6 +138,8 @@ public class FeedResource extends BaseLoggingClass {
 
                                return resp.error();    
                        }
+               } else if ( (useExisting != null) && ("true".compareToIgnoreCase( useExisting ) == 0)) {
+                       return resp.success(nfeed);
                }
 
                resp.setCode(Status.CONFLICT.getStatusCode());