}
@Test
- public void Given_Event_with_invalid_jetty_string_and_valid_logger_then_jetty_Filter_DENY() {
+ public void Given_Event_with_invalid_jetty_string_and_valid_logger_then_jetty_Filter_ACCEPT() {
+ final JettyFilter filter = new JettyFilter();
+ filter.start();
+ final LoggingEvent event = new LoggingEvent();
+ event.setMessage("org.invalid.jetty");
+ event.setLoggerName("org.eclipse.jetty");
+ assertEquals(FilterReply.ACCEPT, filter.decide(event));
+ }
+
+ @Test
+ public void Given_Event_with_invalid_jetty_string_and_invalid_logger_then_jetty_Filter_DENY() {
final JettyFilter filter = new JettyFilter();
filter.start();
final LoggingEvent event = new LoggingEvent();
return;
}
// US DSCDR-19 for DCAE if version is not null, version can't be changed
- if ((oldFeed.getVersion() != null) && (feed.getVersion() != null)) {
- if (!oldFeed.getVersion().equals(feed.getVersion())) {
+ if ((oldFeed.getVersion() != null) && (feed.getVersion() != null) && !oldFeed.getVersion().equals(feed.getVersion())) {
message = "The version of the feed may not be updated.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
eventlogger.error(elr.toString());
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
- }
}
/*
\r
\r
public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
- LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<String, Object>();\r
+ LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();\r
\r
logrecordObj.put("statusCode", jo.get("statusCode"));\r
logrecordObj.put("deliveryId", jo.get("deliveryId"));\r
logrecordObj.put("contentLength", jo.get("contentLength"));\r
\r
\r
- LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
- return newjo;\r
+ return new LOGJSONObject(logrecordObj);\r
}\r
\r
@Override\r
jo.put("deliveryId", user);\r
jo.put("statusCode", result);\r
\r
- LOGJSONObject newjo = this.reOrderObject(jo);\r
- return newjo;\r
+ return this.reOrderObject(jo);\r
}\r
\r
@Override\r
}\r
\r
public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
- LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<String, Object>();\r
+ LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();\r
\r
logrecordObj.put("expiryReason", jo.get("expiryReason"));\r
logrecordObj.put("publishId", jo.get("publishId"));\r
logrecordObj.put("date", jo.get("date"));\r
logrecordObj.put("contentLength", jo.get("contentLength"));\r
\r
- LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
- return newjo;\r
+ return new LOGJSONObject(logrecordObj);\r
}\r
\r
@Override\r
jo.put("expiryReason", reason);\r
jo.put("attempts", attempts);\r
\r
- LOGJSONObject newjo = this.reOrderObject(jo);\r
- return newjo;\r
+ return this.reOrderObject(jo);\r
}\r
\r
@Override\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
\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
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
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
\r
public FeedAuthorization() {\r
this.classification = "";\r
- this.endpoint_ids = new HashSet<FeedEndpointID>();\r
- this.endpoint_addrs = new HashSet<String>();\r
+ this.endpoint_ids = new HashSet<>();\r
+ this.endpoint_addrs = new HashSet<>();\r
}\r
\r
public String getClassification() {\r
self = publish = subscribe = log = null;\r
}\r
\r
- public FeedLinks(JSONObject jo) throws InvalidObjectException {\r
+ public FeedLinks(JSONObject jo) {\r
this();\r
self = jo.getString("self");\r
publish = jo.getString("publish");\r
gup.getName()\r
);\r
List<Group> list = getGroupsForSQL(sql);\r
- return list.size() > 0 ? list.get(0) : null;\r
+ return !list.isEmpty() ? list.get(0) : null;\r
}\r
\r
public static Group getGroupMatching(Group gup, int groupid) {\r
gup.getGroupid()\r
);\r
List<Group> list = getGroupsForSQL(sql);\r
- return list.size() > 0 ? list.get(0) : null;\r
+ return !list.isEmpty() ? list.get(0) : null;\r
}\r
\r
public static Group getGroupById(int id) {\r
String sql = "select * from GROUPS where GROUPID = " + id;\r
List<Group> list = getGroupsForSQL(sql);\r
- return list.size() > 0 ? list.get(0) : null;\r
+ return !list.isEmpty() ? list.get(0) : null;\r
}\r
\r
static Group getGroupByAuthId(String id) {\r
String sql = "select * from GROUPS where AUTHID = '" + id + "'";\r
List<Group> list = getGroupsForSQL(sql);\r
- return list.size() > 0 ? list.get(0) : null;\r
+ return !list.isEmpty() ? list.get(0) : null;\r
}\r
\r
public static Collection<Group> getAllgroups() {\r
\r
\r
public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
- LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<String, Object>();\r
+ LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();\r
\r
\r
logrecordObj.put("statusCode", jo.get("statusCode"));\r
logrecordObj.put("contentLength", jo.get("contentLength"));\r
logrecordObj.put("fileName", jo.get("fileName"));\r
\r
- LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
- return newjo;\r
+ return new LOGJSONObject(logrecordObj);\r
}\r
\r
@Override\r
jo.put("statusCode", status);\r
jo.put("fileName", fileName);\r
\r
- LOGJSONObject newjo = this.reOrderObject(jo);\r
-\r
- return newjo;\r
+ return this.reOrderObject(jo);\r
}\r
\r
@Override\r
self = feed = log = null;\r
}\r
\r
- public SubLinks(JSONObject jo) throws InvalidObjectException {\r
+ public SubLinks(JSONObject jo) {\r
this();\r
self = jo.getString("self");\r
feed = jo.getString("feed");\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
* Creates a new bit set. All bits are initially <code>false</code>.\r
*/\r
public RLEBitSet() {\r
- bitsets = new TreeSet<RLE>();\r
+ bitsets = new TreeSet<>();\r
}\r
\r
/**\r
* @param s the initialization String\r
*/\r
public RLEBitSet(String s) {\r
- bitsets = new TreeSet<RLE>();\r
+ bitsets = new TreeSet<>();\r
set(s);\r
}\r
\r
* @throws NumberFormatException - if a number is incorrectly formatted\r
* @throws IndexOutOfBoundsException - if an index is negative\r
*/\r
- public void set(String s) throws NumberFormatException {\r
+ public void set(String s) {\r
s = s.trim();\r
if (!s.isEmpty()) {\r
for (String s2 : s.split("[, \n]+")) {\r
public void clear(long from, long to) {\r
checkRange(from, to);\r
RLE newbits = new RLE(from, to - from);\r
- List<RLE> newranges = new ArrayList<RLE>();\r
+ List<RLE> newranges = new ArrayList<>();\r
synchronized (bitsets) {\r
for (RLE bs : bitsets) {\r
if (bs.intersects(newbits)) {\r
private static int action = ACTION_DROP; // action to take (throttle or drop)\r
\r
private static EELFLogger logger = EELFManager.getInstance().getLogger("InternalLog");\r
- private static Map<String, Counter> map = new HashMap<String, Counter>();\r
+ private static Map<String, Counter> map = new HashMap<>();\r
private static final Timer rolex = new Timer();\r
\r
@Override\r
}\r
}\r
\r
- private Map<String, List<Continuation>> suspended_requests = new HashMap<String, List<Continuation>>();\r
+ private Map<String, List<Continuation>> suspended_requests = new HashMap<>();\r
\r
private void register(String id, Continuation continuation) {\r
synchronized (suspended_requests) {\r
List<Continuation> list = suspended_requests.get(id);\r
if (list == null) {\r
- list = new ArrayList<Continuation>();\r
+ list = new ArrayList<>();\r
suspended_requests.put(id, list);\r
}\r
list.add(continuation);\r
cnt = new Counter();\r
map.put(key, cnt);\r
}\r
- int n = cnt.getRequestRate();\r
- return n;\r
+ return cnt.getRequestRate();\r
}\r
}\r
\r
public class Counter {\r
- private List<Long> times = new Vector<Long>(); // a record of request times\r
+ private List<Long> times = new Vector<>(); // a record of request times\r
\r
public int prune() {\r
try {\r
if (ix < 0 || ix == path.length() - 1)\r
return -2;\r
try {\r
- int feedid = Integer.parseInt(path.substring(0, ix));\r
- return feedid;\r
+ return Integer.parseInt(path.substring(0, ix));\r
} catch (NumberFormatException e) {\r
return -1;\r
}\r
Code Review / dmaap / datarouter.git / commitdiff