\r
package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import java.io.InvalidObjectException;\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
import java.util.Date;\r
import java.util.List;\r
import java.util.Properties;\r
-\r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
import org.json.JSONObject;\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
this.feedid = jo.optInt(FEEDID_KEY, -1);\r
this.groupid = jo.optInt(GROUPID_KEY, -1); //New field is added - Groups feature Rally:US708115 - 1610\r
this.aafInstance = jo.optString("aaf_instance", "legacy");\r
- if(!(aafInstance.equalsIgnoreCase("legacy"))){\r
- if (aafInstance.length() > 255)\r
+ if(!(aafInstance.equalsIgnoreCase("legacy")) && aafInstance.length() > 255) {\r
throw new InvalidObjectException("aaf_instance field is too long");\r
}\r
JSONObject jdeli = jo.getJSONObject("delivery");\r
if (feedid != os.feedid) {\r
return false;\r
}\r
- if (groupid != os.groupid) //New field is added - Groups feature Rally:US708115 - 1610\r
- {\r
+ if (groupid != os.groupid) {\r
+ //New field is added - Groups feature Rally:US708115 - 1610\r
return false;\r
}\r
if (!delivery.equals(os.delivery)) {\r