Remove unused OSGi activators

Change-Id: Icea7ed1684c7e891d4529042ddfb909a1bc60f39
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index 0d8c9b31a568f4a7f1a31ab0b05d4d7a95a7247f..bb34840b631d6a8dfea60c2a087a706c9ce0dcc1 100644 (file)
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -47,13 +47,6 @@
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
         </dependency>
-
-        <!-- FIXME: move into bgp-parser-spi-osgi -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-
         <!-- Testing dependencies -->
         <dependency>
                        <groupId>junit</groupId>
@@ -73,11 +66,8 @@
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                                                <Export-Package>
                             org.opendaylight.protocol.bgp.parser.spi,
-                            org.opendaylight.protocol.bgp.parser.spi.osgi,
-                        </Export-Package>
-                        <Private-Package>
                             org.opendaylight.protocol.bgp.parser.spi.pojo,
-                        </Private-Package>
+                        </Export-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/AbstractOSGiBGPExtensionConsumerActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/AbstractOSGiBGPExtensionConsumerActivator.java
deleted file mode 100644 (file)
index 1199ab2..0000000
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/AbstractOSGiBGPExtensionConsumerActivator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.parser.spi.osgi;
-
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerActivator;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import com.google.common.base.Preconditions;
-
-public abstract class AbstractOSGiBGPExtensionConsumerActivator implements BundleActivator, BGPExtensionConsumerActivator {
-       private BGPExtensionConsumerContext consumerContext;
-
-       @Override
-       public final void start(final BundleContext context) throws Exception {
-               Preconditions.checkState(consumerContext == null);
-               final BGPExtensionConsumerContext consumerContext = new OSGiBGPExtensionProviderContext(context);
-               start(consumerContext);
-               this.consumerContext = consumerContext;
-       }
-
-       @Override
-       public final void stop(final BundleContext context) throws Exception {
-               Preconditions.checkState(consumerContext != null);
-               try {
-                       stop();
-               } finally {
-                       consumerContext = null;
-               }
-       }
-}

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/AbstractOSGiBGPExtensionProviderActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/AbstractOSGiBGPExtensionProviderActivator.java
deleted file mode 100644 (file)
index 8fadaff..0000000
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/AbstractOSGiBGPExtensionProviderActivator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.parser.spi.osgi;
-
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import com.google.common.base.Preconditions;
-
-public abstract class AbstractOSGiBGPExtensionProviderActivator implements BundleActivator, BGPExtensionProviderActivator {
-       private BGPExtensionProviderContext providerContext;
-
-       @Override
-       public final void start(final BundleContext context) throws Exception {
-               Preconditions.checkState(providerContext == null);
-               final BGPExtensionProviderContext providerContext = new OSGiBGPExtensionProviderContext(context);
-               start(providerContext);
-               this.providerContext = providerContext;
-       }
-
-       @Override
-       public final void stop(final BundleContext context) throws Exception {
-               Preconditions.checkState(providerContext != null);
-               try {
-                       stop();
-               } finally {
-                       providerContext = null;
-               }
-       }
-}

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/OSGiBGPExtensionConsumerContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/OSGiBGPExtensionConsumerContext.java
deleted file mode 100644 (file)
index 1d34eb8..0000000
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/OSGiBGPExtensionConsumerContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.parser.spi.osgi;
-
-import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.AttributeRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext;
-import org.opendaylight.protocol.bgp.parser.spi.CapabilityRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.NlriRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.ParameterRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
-import org.opendaylight.protocol.concepts.AbstractRegistration;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-import com.google.common.base.Preconditions;
-
-class OSGiBGPExtensionConsumerContext implements BGPExtensionConsumerContext {
-       protected final SimpleBGPExtensionProviderContext providerContext = new SimpleBGPExtensionProviderContext();
-       protected final BundleContext bundleContext;
-
-       OSGiBGPExtensionConsumerContext(final BundleContext context) {
-               this.bundleContext = Preconditions.checkNotNull(context);
-       }
-
-       protected final <T> AutoCloseable register(final Class<T> clazz, final T object) {
-               final ServiceRegistration<T> reg = bundleContext.registerService(clazz, object, null);
-
-               return new AbstractRegistration() {
-                       @Override
-                       protected void removeRegistration() {
-                               reg.unregister();
-                       }
-               };
-       }
-
-       public final BundleContext getBundleContext() {
-               return bundleContext;
-       }
-
-       @Override
-       public final AddressFamilyRegistry getAddressFamilyRegistry() {
-               return providerContext.getAddressFamilyRegistry();
-       }
-
-       @Override
-       public final AttributeRegistry getAttributeRegistry() {
-               return providerContext.getAttributeRegistry();
-       }
-
-       @Override
-       public final CapabilityRegistry getCapabilityRegistry() {
-               return providerContext.getCapabilityRegistry();
-       }
-
-       @Override
-       public final MessageRegistry getMessageRegistry() {
-               return providerContext.getMessageRegistry();
-       }
-
-       @Override
-       public final NlriRegistry getNlriRegistry() {
-               return providerContext.getNlriRegistry();
-       }
-
-       @Override
-       public final ParameterRegistry getParameterRegistry() {
-               return providerContext.getParameterRegistry();
-       }
-
-       @Override
-       public final SubsequentAddressFamilyRegistry getSubsequentAddressFamilyRegistry() {
-               return providerContext.getSubsequentAddressFamilyRegistry();
-       }
-}

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/OSGiBGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/OSGiBGPExtensionProviderContext.java
deleted file mode 100644 (file)
index 4439a34..0000000
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/osgi/OSGiBGPExtensionProviderContext.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.parser.spi.osgi;
-
-import org.opendaylight.protocol.bgp.parser.spi.AttributeParser;
-import org.opendaylight.protocol.bgp.parser.spi.AttributeSerializer;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.protocol.bgp.parser.spi.CapabilityParser;
-import org.opendaylight.protocol.bgp.parser.spi.CapabilitySerializer;
-import org.opendaylight.protocol.bgp.parser.spi.MessageParser;
-import org.opendaylight.protocol.bgp.parser.spi.MessageSerializer;
-import org.opendaylight.protocol.bgp.parser.spi.NlriParser;
-import org.opendaylight.protocol.bgp.parser.spi.NlriSerializer;
-import org.opendaylight.protocol.bgp.parser.spi.ParameterParser;
-import org.opendaylight.protocol.bgp.parser.spi.ParameterSerializer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.BgpParameters;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.bgp.parameters.CParameters;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.SubsequentAddressFamily;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.Notification;
-import org.osgi.framework.BundleContext;
-
-final class OSGiBGPExtensionProviderContext extends OSGiBGPExtensionConsumerContext implements BGPExtensionProviderContext {
-
-       OSGiBGPExtensionProviderContext(final BundleContext context) {
-               super(context);
-       }
-
-       interface ClassRegistration<T> {
-               public int getRegisteredNumber();
-               public Class<? extends T> getRegisteredClass();
-       }
-
-       interface ParserRegistration<PARSER> {
-               public int getRegisteredNumber();
-               public Class<PARSER> getRegisteredParserClass();
-               public PARSER getRegisteredParserObject();
-       }
-
-       interface SerializerRegistration<SERIALIZER> {
-               public Class<?> getRegisteredObjectClass();
-               public Class<SERIALIZER> getRegisteredSerializerClass();
-               public SERIALIZER getRegisteredSerializer();
-       }
-
-       @Override
-       public AutoCloseable registerAddressFamily(final Class<? extends AddressFamily> clazz, final int number) {
-               return register(ClassRegistration.class, new ClassRegistration<AddressFamily>() {
-                       @Override
-                       public int getRegisteredNumber() {
-                               return number;
-                       }
-                       @Override
-                       public Class<? extends AddressFamily> getRegisteredClass() {
-                               return clazz;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerSubsequentAddressFamily(final Class<? extends SubsequentAddressFamily> clazz, final int number) {
-               return register(ClassRegistration.class, new ClassRegistration<SubsequentAddressFamily>() {
-                       @Override
-                       public int getRegisteredNumber() {
-                               return number;
-                       }
-                       @Override
-                       public Class<? extends SubsequentAddressFamily> getRegisteredClass() {
-                               return clazz;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerAttributeParser(final int attributeType, final AttributeParser parser) {
-               return register(ParserRegistration.class, new ParserRegistration<AttributeParser>() {
-                       @Override
-                       public int getRegisteredNumber() {
-                               return attributeType;
-                       }
-
-                       @Override
-                       public Class<AttributeParser> getRegisteredParserClass() {
-                               return AttributeParser.class;
-                       }
-
-                       @Override
-                       public AttributeParser getRegisteredParserObject() {
-                               return parser;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerAttributeSerializer(final Class<? extends DataObject> attributeClass, final AttributeSerializer serializer) {
-               return register(SerializerRegistration.class, new SerializerRegistration<AttributeSerializer>() {
-                       @Override
-                       public Class<?> getRegisteredObjectClass() {
-                               return attributeClass;
-                       }
-
-                       @Override
-                       public Class<AttributeSerializer> getRegisteredSerializerClass() {
-                               return AttributeSerializer.class;
-                       }
-
-                       @Override
-                       public AttributeSerializer getRegisteredSerializer() {
-                               return serializer;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerCapabilityParser(final int capabilityType, final CapabilityParser parser) {
-               return register(ParserRegistration.class, new ParserRegistration<CapabilityParser>() {
-                       @Override
-                       public int getRegisteredNumber() {
-                               return capabilityType;
-                       }
-
-                       @Override
-                       public Class<CapabilityParser> getRegisteredParserClass() {
-                               return CapabilityParser.class;
-                       }
-
-                       @Override
-                       public CapabilityParser getRegisteredParserObject() {
-                               return parser;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerCapabilitySerializer(final Class<? extends CParameters> capabilityClass, final CapabilitySerializer serializer) {
-               return register(SerializerRegistration.class, new SerializerRegistration<CapabilitySerializer>() {
-                       @Override
-                       public Class<?> getRegisteredObjectClass() {
-                               return capabilityClass;
-                       }
-
-                       @Override
-                       public Class<CapabilitySerializer> getRegisteredSerializerClass() {
-                               return CapabilitySerializer.class;
-                       }
-
-                       @Override
-                       public CapabilitySerializer getRegisteredSerializer() {
-                               return serializer;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerMessageParser(final int messageType, final MessageParser parser) {
-               return register(ParserRegistration.class, new ParserRegistration<MessageParser>() {
-                       @Override
-                       public int getRegisteredNumber() {
-                               return messageType;
-                       }
-
-                       @Override
-                       public Class<MessageParser> getRegisteredParserClass() {
-                               return MessageParser.class;
-                       }
-
-                       @Override
-                       public MessageParser getRegisteredParserObject() {
-                               return parser;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerMessageSerializer(final Class<? extends Notification> messageClass, final MessageSerializer serializer) {
-               return register(SerializerRegistration.class, new SerializerRegistration<MessageSerializer>() {
-                       @Override
-                       public Class<?> getRegisteredObjectClass() {
-                               return messageClass;
-                       }
-
-                       @Override
-                       public Class<MessageSerializer> getRegisteredSerializerClass() {
-                               return MessageSerializer.class;
-                       }
-
-                       @Override
-                       public MessageSerializer getRegisteredSerializer() {
-                               return serializer;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerNlriParser(final Class<? extends AddressFamily> afi, final Class<? extends SubsequentAddressFamily> safi,
-                       final NlriParser parser) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public AutoCloseable registerNlriSerializer(final Class<? extends DataObject> nlriClass, final NlriSerializer serializer) {
-               return register(SerializerRegistration.class, new SerializerRegistration<NlriSerializer>() {
-                       @Override
-                       public Class<?> getRegisteredObjectClass() {
-                               return nlriClass;
-                       }
-
-                       @Override
-                       public Class<NlriSerializer> getRegisteredSerializerClass() {
-                               return NlriSerializer.class;
-                       }
-
-                       @Override
-                       public NlriSerializer getRegisteredSerializer() {
-                               return serializer;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerParameterParser(final int parameterType, final ParameterParser parser) {
-               return register(ParserRegistration.class, new ParserRegistration<ParameterParser>() {
-                       @Override
-                       public int getRegisteredNumber() {
-                               return parameterType;
-                       }
-
-                       @Override
-                       public Class<ParameterParser> getRegisteredParserClass() {
-                               return ParameterParser.class;
-                       }
-
-                       @Override
-                       public ParameterParser getRegisteredParserObject() {
-                               return parser;
-                       }
-               });
-       }
-
-       @Override
-       public AutoCloseable registerParameterSerializer(final Class<? extends BgpParameters> paramClass, final ParameterSerializer serializer) {
-               return register(SerializerRegistration.class, new SerializerRegistration<ParameterSerializer>() {
-                       @Override
-                       public Class<?> getRegisteredObjectClass() {
-                               return paramClass;
-                       }
-
-                       @Override
-                       public Class<ParameterSerializer> getRegisteredSerializerClass() {
-                               return ParameterSerializer.class;
-                       }
-
-                       @Override
-                       public ParameterSerializer getRegisteredSerializer() {
-                               return serializer;
-                       }
-               });
-       }
-}