Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Check time expiry before attempting to format notification
[netconf.git]
/
restconf
/
restconf-nb-bierman02
/
src
/
main
/
java
/
org
/
opendaylight
/
netconf
/
sal
/
streams
/
listeners
/
AbstractQueryParams.java
diff --git
a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java
b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java
index 618bf4de91ac475bf676456655a54b39a23ae1d2..40770f2732f5a08467e3158b91bcd1c1eea88f40 100644
(file)
--- a/
restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java
+++ b/
restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java
@@
-89,20
+89,11
@@
abstract class AbstractQueryParams extends AbstractNotificationsData {
return leafNodesOnly;
}
return leafNodesOnly;
}
- /**
- * Checking query parameters on specific notification.
- *
- * @param xml data of notification
- * @param listener listener of notification
- * @return true if notification meets the requirements of query parameters,
- * false otherwise
- */
@SuppressWarnings("checkstyle:IllegalCatch")
@SuppressWarnings("checkstyle:IllegalCatch")
- protected <T extends BaseListenerInterface> boolean checkQueryParams(final String xml, final T listener) {
- final Instant now = Instant.now();
+ <T extends BaseListenerInterface> boolean checkStartStop(final Instant now, final T listener) {
if (this.stop != null) {
if (this.stop != null) {
- if (
(this.start.compareTo(now) < 0) && (this.stop.compareTo(now) > 0)
) {
- return
checkFilter(xml)
;
+ if (
this.start.compareTo(now) < 0 && this.stop.compareTo(now) > 0
) {
+ return
true
;
}
if (this.stop.compareTo(now) < 0) {
try {
}
if (this.stop.compareTo(now) < 0) {
try {
@@
-114,10
+105,10
@@
abstract class AbstractQueryParams extends AbstractNotificationsData {
} else if (this.start != null) {
if (this.start.compareTo(now) < 0) {
this.start = null;
} else if (this.start != null) {
if (this.start.compareTo(now) < 0) {
this.start = null;
- return
checkFilter(xml)
;
+ return
true
;
}
} else {
}
} else {
- return
checkFilter(xml)
;
+ return
true
;
}
return false;
}
}
return false;
}
@@
-128,7
+119,7
@@
abstract class AbstractQueryParams extends AbstractNotificationsData {
* @param xml data of notification
*/
@SuppressWarnings("checkstyle:IllegalCatch")
* @param xml data of notification
*/
@SuppressWarnings("checkstyle:IllegalCatch")
-
private
boolean checkFilter(final String xml) {
+ boolean checkFilter(final String xml) {
if (this.filter == null) {
return true;
}
if (this.filter == null) {
return true;
}