From e3c31cee916480b2d9d169c1f5afb1c42efaabe1 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Fri, 29 Jul 2016 16:27:12 +0200 Subject: HONEYCOMB-130: Rename infra packages(remove vpp/v3po) Change-Id: Ic5b90e397e3743623d01b206bc60bc5c7df6b981 Signed-off-by: Maros Marsalek --- .../notification/ManagedNotificationProducer.java | 38 ++++++++++++++++++++++ .../notification/NotificationCollector.java | 35 ++++++++++++++++++++ .../notification/NotificationProducer.java | 37 +++++++++++++++++++++ .../notification/ManagedNotificationProducer.java | 38 ---------------------- .../v3po/notification/NotificationCollector.java | 35 -------------------- .../v3po/notification/NotificationProducer.java | 37 --------------------- .../api/src/main/yang/notification-api.yang | 4 +-- 7 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java create mode 100644 infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java create mode 100644 infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java delete mode 100644 infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java delete mode 100644 infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java delete mode 100644 infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java (limited to 'infra/notification/api') diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java new file mode 100644 index 000000000..433512164 --- /dev/null +++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fd.honeycomb.notification; + +import com.google.common.annotations.Beta; +import javax.annotation.Nonnull; + +/** + * Special notification producer that is capable of starting and stopping the notification stream + */ +@Beta +public interface ManagedNotificationProducer extends NotificationProducer { + + /** + * Start notification stream managed by this producer. + * + * @param collector Notification collector expected to collect produced notifications + */ + void start(@Nonnull NotificationCollector collector); + + /** + * Stop notification stream managed by this producer. + */ + void stop(); +} diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java new file mode 100644 index 000000000..e40b874d5 --- /dev/null +++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fd.honeycomb.notification; + +import com.google.common.annotations.Beta; +import javax.annotation.Nonnull; +import org.opendaylight.yangtools.yang.binding.Notification; + +/** + * Notification collector. Collects all the notifications, which are further + * propagated to all wired northbound interfaces. + */ +@Beta +public interface NotificationCollector extends AutoCloseable, NotificationProducer { + + /** + * Publish a single notification. + * + * @param notification notification to be published + */ + void onNotification(@Nonnull Notification notification); +} diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java new file mode 100644 index 000000000..665318d0e --- /dev/null +++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fd.honeycomb.notification; + +import com.google.common.annotations.Beta; +import java.util.Collection; +import javax.annotation.Nonnull; +import org.opendaylight.yangtools.yang.binding.Notification; + +/** + * Produces notification of exposed notification types + */ +@Beta +public interface NotificationProducer extends AutoCloseable { + + /** + * Return collection of notification types that will be emitted by this producer. + * Other types of notifications should not be emitted, since they can be rejected. + * + * @return collection of all notification types emitted by this producer + */ + @Nonnull + Collection> getNotificationTypes(); +} diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java b/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java deleted file mode 100644 index 0f5e28cde..000000000 --- a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.fd.honeycomb.v3po.notification; - -import com.google.common.annotations.Beta; -import javax.annotation.Nonnull; - -/** - * Special notification producer that is capable of starting and stopping the notification stream - */ -@Beta -public interface ManagedNotificationProducer extends NotificationProducer { - - /** - * Start notification stream managed by this producer. - * - * @param collector Notification collector expected to collect produced notifications - */ - void start(@Nonnull NotificationCollector collector); - - /** - * Stop notification stream managed by this producer. - */ - void stop(); -} diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java b/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java deleted file mode 100644 index 406ab03d2..000000000 --- a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.fd.honeycomb.v3po.notification; - -import com.google.common.annotations.Beta; -import javax.annotation.Nonnull; -import org.opendaylight.yangtools.yang.binding.Notification; - -/** - * Notification collector. Collects all the notifications, which are further - * propagated to all wired northbound interfaces. - */ -@Beta -public interface NotificationCollector extends AutoCloseable, NotificationProducer { - - /** - * Publish a single notification. - * - * @param notification notification to be published - */ - void onNotification(@Nonnull Notification notification); -} diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java b/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java deleted file mode 100644 index dab773c45..000000000 --- a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.fd.honeycomb.v3po.notification; - -import com.google.common.annotations.Beta; -import java.util.Collection; -import javax.annotation.Nonnull; -import org.opendaylight.yangtools.yang.binding.Notification; - -/** - * Produces notification of exposed notification types - */ -@Beta -public interface NotificationProducer extends AutoCloseable { - - /** - * Return collection of notification types that will be emitted by this producer. - * Other types of notifications should not be emitted, since they can be rejected. - * - * @return collection of all notification types emitted by this producer - */ - @Nonnull - Collection> getNotificationTypes(); -} diff --git a/infra/notification/api/src/main/yang/notification-api.yang b/infra/notification/api/src/main/yang/notification-api.yang index 4e6eb98ae..f0331bc07 100644 --- a/infra/notification/api/src/main/yang/notification-api.yang +++ b/infra/notification/api/src/main/yang/notification-api.yang @@ -15,7 +15,7 @@ module notification-api { identity honeycomb-notification-collector { base "config:service-type"; - config:java-class io.fd.honeycomb.v3po.notification.NotificationCollector; + config:java-class io.fd.honeycomb.notification.NotificationCollector; } identity dom-notification-service { @@ -25,7 +25,7 @@ module notification-api { identity honeycomb-notification-producer { base "config:service-type"; - config:java-class io.fd.honeycomb.v3po.notification.ManagedNotificationProducer; + config:java-class io.fd.honeycomb.notification.ManagedNotificationProducer; } } -- cgit 1.2.3-korg