\r
package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
-import org.apache.log4j.Level;\r
-import org.apache.log4j.Logger;\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import org.json.JSONArray;\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
-import org.onap.dmaap.datarouter.provisioning.utils.PasswordProcessor;\r
import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
import java.io.InvalidObjectException;\r
-import java.security.GeneralSecurityException;\r
import java.sql.*;\r
import java.util.Date;\r
import java.util.*;\r
* @version $Id: Feed.java,v 1.13 2013/10/28 18:06:52 eby Exp $\r
*/\r
public class Feed extends Syncable {\r
- private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+ private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
private static int next_feedid = getMaxFeedID() + 1;\r
+ private static final String SQLEXCEPTION = "SQLException: ";\r
\r
private int feedid;\r
private int groupid; //New field is added - Groups feature Rally:US708115 - 1610\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.log(Level.WARN, "PROV0024 Feed.isFeedValid: ", e);\r
+ intlogger.warn("PROV0024 Feed.isFeedValid: " + e.getMessage(), e);\r
}\r
return count != 0;\r
}\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.info("PROV0025 Feed.countActiveFeeds: " + e.getMessage());\r
- intlogger.log(Level.WARN, "PROV0025 Feed.countActiveFeeds: ", e);\r
+ intlogger.warn("PROV0025 Feed.countActiveFeeds: " + e.getMessage(), e);\r
}\r
return count;\r
}\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.info("PROV0026 Feed.getMaxFeedID: "+e.getMessage());\r
- intlogger.log(Level.WARN, "PROV0026 Feed.getMaxFeedID: ", e);\r
+ intlogger.warn("PROV0026 Feed.getMaxFeedID: " + e.getMessage(), e);\r
}\r
return max;\r
}\r
\r
public static Collection<Feed> getAllFeeds() {\r
- Map<Integer, Feed> map = new HashMap<Integer, Feed>();\r
+ Map<Integer, Feed> map = new HashMap<>();\r
try {\r
DB db = new DB();\r
@SuppressWarnings("resource")\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.log(Level.WARN, "PROV0027 Feed.getAllFeeds: ", e);\r
+ intlogger.warn("PROV0027 Feed.getAllFeeds: " + e.getMessage(), e);\r
}\r
return map.values();\r
}\r
\r
public static List<String> getFilteredFeedUrlList(final String name, final String val) {\r
- List<String> list = new ArrayList<String>();\r
+ List<String> list = new ArrayList<>();\r
String sql = "select SELF_LINK from FEEDS where DELETED = 0";\r
if (name.equals("name")) {\r
sql += " and NAME = ?";\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.log(Level.WARN, "PROV0028 Feed.getFilteredFeedUrlList: ", e);\r
+ intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: " + e.getMessage(), e);\r
}\r
return list;\r
}\r
}\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.log(Level.WARN, "PROV0029 Feed.getFeedBySQL: ", e);\r
+ intlogger.warn("PROV0029 Feed.getFeedBySQL: " + e.getMessage(), e);\r
}\r
return feed;\r
}\r
this.groupid = jo.optInt("groupid");\r
this.name = jo.getString("name");\r
this.aaf_instance = jo.optString("aaf_instance", "legacy");\r
- if(!(aaf_instance.equalsIgnoreCase("legacy"))){\r
- if (aaf_instance.length() > 255){\r
+ if(!(aaf_instance.equalsIgnoreCase("legacy")) && aaf_instance.length() > 255){\r
throw new InvalidObjectException("aaf_instance field is too long");\r
- }\r
}\r
if (name.length() > 255)\r
throw new InvalidObjectException("name field is too long");\r
try {\r
this.version = jo.getString("version");\r
} catch (JSONException e) {\r
+ intlogger.warn("PROV0023 Feed.Feed: " + e.getMessage(), e);\r
this.version = null;\r
}\r
if(version != null && version.length() > 20)\r
throw new InvalidObjectException("password field is too long ("+ fid.getPassword()+")"); //Fortify scan fixes - Privacy Violation\r
this.authorization.getEndpoint_ids().add(fid);\r
}\r
- if (this.authorization.getEndpoint_ids().size() < 1)\r
+ if (this.authorization.getEndpoint_ids().isEmpty())\r
throw new InvalidObjectException("need to specify at least one endpoint_id");\r
endPointIds = jauth.getJSONArray("endpoint_addrs");\r
for (int i = 0; i < endPointIds.length(); i++) {\r
JSONObject jol = jo.optJSONObject("links");\r
this.links = (jol == null) ? (new FeedLinks()) : (new FeedLinks(jol));\r
} catch (InvalidObjectException e) {\r
- intlogger.log(Level.WARN, "PROV0030 Feed.Feed: ", e);\r
throw e;\r
} catch (Exception e) {\r
- intlogger.error("PROV0031 Feed.Feed: invalid JSON: "+e);\r
- throw new InvalidObjectException("invalid JSON: " + e.getMessage());\r
+ intlogger.warn("Invalid JSON: " + e.getMessage(), e);\r
+ throw new InvalidObjectException("Invalid JSON: " + e.getMessage());\r
}\r
}\r
\r
this.suspended = suspended;\r
}\r
\r
- public Date getLast_mod() {\r
- return last_mod;\r
- }\r
-\r
- public Date getCreated_date() {\r
- return created_date;\r
- }\r
-\r
@Override\r
public JSONObject asJSONObject() {\r
JSONObject jo = new JSONObject();\r
ps.execute();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
- intlogger.error("SQLException " + e.getMessage());\r
+ intlogger.error("PROV0007 doDelete: " + e.getMessage(), e);\r
} finally {\r
try {\r
if(ps!=null) {\r
ps.close();\r
}\r
} catch (SQLException e) {\r
- intlogger.error("SQLException " + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r
}\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
- intlogger.error("SQLException " + e.getMessage());\r
+ intlogger.error("PROV0005 doInsert: " + e.getMessage(), e);\r
}\r
return rv;\r
}\r
ps.close();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
+ intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e);\r
} finally {\r
try {\r
if (ps != null)\r
ps.close();\r
} catch (SQLException e) {\r
- intlogger.error("SQLException " + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r
ps.close();\r
} catch (SQLException e) {\r
rv = false;\r
- intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
+ intlogger.warn("PROV0008 changeOwnerShip: " + e.getMessage(), e);\r
} finally {\r
try {\r
if(ps!=null) {\r
ps.close();\r
}\r
} catch (SQLException e) {\r
- intlogger.error("SQLException " + e.getMessage());\r
+ intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
}\r
return rv;\r