Merge "MrProvConnection.java - Remove unused imports"

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / model / Feed.java

diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/Feed.java b/src/main/java/org/onap/dmaap/dbcapi/model/Feed.java
index 9f7b3fc..b78377b 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/model/Feed.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/model/Feed.java
@@ -3,6 +3,8 @@
  * org.onap.dmaap
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +98,6 @@ public class Feed extends DmaapObject {
                public Feed ( String json ) {
                        JSONParser parser = new JSONParser();
                        JSONObject jsonObj;
-                       
                        try {
                                jsonObj = (JSONObject) parser.parse( json );
                        } catch ( ParseException pe ) {
@@ -106,7 +107,6 @@ public class Feed extends DmaapObject {
                }
                        this.setFeedName( (String) jsonObj.get("name"));
 
-
                        this.setFeedVersion( (String) jsonObj.get("version"));
                        this.setFeedDescription( (String) jsonObj.get("description"));
                        this.setOwner( (String) jsonObj.get("publisher"));
@@ -264,8 +264,7 @@ public class Feed extends DmaapObject {
                }
                
                public static String getSubProvURL( String feedId ) {
-                       String ret = new String();
-                       ret = new DmaapService().getDmaap().getDrProvUrl() + "/subscribe/" + feedId ;
+                       String ret = new DmaapService().getDmaap().getDrProvUrl() + "/subscribe/" + feedId ;
                        return ret;
                }