Promote NotificationQueryParams

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / rests / services / impl / RestconfStreamsSubscriptionServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java
index 35cdea9e8792007fc006950f3a98b3988d40bcb6..a6d5dca51d09ceceaffef65adf3059fe72324103 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java
@@ -10,19 +10,14 @@ package org.opendaylight.restconf.nb.rfc8040.rests.services.impl;
 import static com.google.common.base.Preconditions.checkState;
 
 import java.net.URI;
-import java.util.List;
-import java.util.Map.Entry;
 import java.util.Optional;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.UriInfo;
-import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
-import org.opendaylight.restconf.nb.rfc8040.FilterParameter;
-import org.opendaylight.restconf.nb.rfc8040.StartTimeParameter;
-import org.opendaylight.restconf.nb.rfc8040.StopTimeParameter;
+import org.opendaylight.restconf.nb.rfc8040.NotificationQueryParams;
 import org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler;
 import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload;
 import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfStreamsSubscriptionService;
@@ -153,123 +148,4 @@ public class RestconfStreamsSubscriptionServiceImpl implements RestconfStreamsSu
             return schemaHandler;
         }
     }
-
-    /**
-     * Parser and holder of query paramteres from uriInfo for notifications.
-     */
-    public static final class NotificationQueryParams {
-        private final StartTimeParameter startTime;
-        private final StopTimeParameter stopTime;
-        private final FilterParameter filter;
-        private final boolean skipNotificationData;
-
-        private NotificationQueryParams(final StartTimeParameter startTime, final StopTimeParameter stopTime,
-                final FilterParameter filter, final boolean skipNotificationData) {
-            this.startTime = startTime;
-            this.stopTime = stopTime;
-            this.filter = filter;
-            this.skipNotificationData = skipNotificationData;
-        }
-
-        static NotificationQueryParams fromUriInfo(final UriInfo uriInfo) {
-            StartTimeParameter startTime = null;
-            StopTimeParameter stopTime = null;
-            FilterParameter filter = null;
-            boolean skipNotificationData = false;
-
-            for (final Entry<String, List<String>> entry : uriInfo.getQueryParameters().entrySet()) {
-                final String paramName = entry.getKey();
-                final List<String> paramValues = entry.getValue();
-                if (paramName.equals(StartTimeParameter.uriName())) {
-                    switch (paramValues.size()) {
-                        case 0:
-                            break;
-                        case 1:
-                            final String str = paramValues.get(0);
-                            try {
-                                startTime = StartTimeParameter.forUriValue(str);
-                            } catch (IllegalArgumentException e) {
-                                throw new RestconfDocumentedException("Invalid start-time date: " + str, e);
-                            }
-                            break;
-                        default:
-                            throw new RestconfDocumentedException("Start-time parameter can be used only once.");
-                    }
-                } else if (paramName.equals(StopTimeParameter.uriName())) {
-                    switch (paramValues.size()) {
-                        case 0:
-                            break;
-                        case 1:
-                            final String str = paramValues.get(0);
-                            try {
-                                stopTime = StopTimeParameter.forUriValue(str);
-                            } catch (IllegalArgumentException e) {
-                                throw new RestconfDocumentedException("Invalid stop-time date: " + str, e);
-                            }
-                            break;
-                        default:
-                            throw new RestconfDocumentedException("Stop-time parameter can be used only once.");
-                    }
-                } else if (paramName.equals(FilterParameter.uriName())) {
-                    if (!paramValues.isEmpty()) {
-                        filter = FilterParameter.forUriValue(paramValues.get(0));
-                    }
-                } else if (paramName.equals("odl-skip-notification-data")) {
-                    switch (paramValues.size()) {
-                        case 0:
-                            break;
-                        case 1:
-                            skipNotificationData = Boolean.parseBoolean(paramValues.get(0));
-                            break;
-                        default:
-                            throw new RestconfDocumentedException(
-                                "Odl-skip-notification-data parameter can be used only once.");
-                    }
-                } else {
-                    throw new RestconfDocumentedException("Bad parameter used with notifications: " + paramName);
-                }
-            }
-            if (startTime == null && stopTime != null) {
-                throw new RestconfDocumentedException("Stop-time parameter has to be used with start-time parameter.");
-            }
-
-            return new NotificationQueryParams(startTime, stopTime, filter, skipNotificationData);
-        }
-
-        /**
-         * Get start-time query parameter.
-         *
-         * @return start-time
-         */
-        public @Nullable StartTimeParameter startTime() {
-            return startTime;
-        }
-
-        /**
-         * Get stop-time query parameter.
-         *
-         * @return stop-time
-         */
-        public @Nullable StopTimeParameter stopTime() {
-            return stopTime;
-        }
-
-        /**
-         * Get filter query parameter.
-         *
-         * @return filter
-         */
-        public @Nullable FilterParameter filter() {
-            return filter;
-        }
-
-        /**
-         * Check whether this query should notify changes without data.
-         *
-         * @return true if this query should notify about changes with  data
-         */
-        public boolean isSkipNotificationData() {
-            return skipNotificationData;
-        }
-    }
 }