Cleanup package imports

This removes Import-Package instructions, relying on bundle plugin to
figure them out.

We rework the rib-mock API contract to not rely on static contructor, to
fix one of the failures.

We are removing test-tool bundle integration tests, as these should be
switched to jars.

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

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index a6bdfbe73de724e064bf313a03e1509240fff7b3..860526ecf62a7a8ecef8a17996214abfe8477ad4 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -104,12 +104,6 @@
                             org.opendaylight.protocol.bgp.concepts,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.*,
                                                </Export-Package>
-                                               <Import-Package>
-                                                       com.google.common.base,
-                                                       org.opendaylight.protocol.concepts,
-                            org.opendaylight.yang.gen.v1.*,
-                            org.opendaylight.yangtools.yang.binding
-                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index 4e123d15867200f21a4264d648befd0616f0777b..910b45312d57da4ba5c427bd4c2516405a5764f3 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -112,15 +112,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Import-Package>
-                                                       com.google.common.base,
-                                                       com.google.common.collect,
-                                                       com.google.common.primitives,
-                                                       org.opendaylight.protocol.concepts,
-                                                       org.opendaylight.protocol.framework,
-                                                       org.opendaylight.protocol.util,
-                                                       org.slf4j,
-                                               </Import-Package>
                                                <Export-Package>
                             org.opendaylight.protocol.bgp.parser,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.*,

diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index 0cf4b32e83f163922dde04cea4f2fb14260982c0..ffa7981f8a3c08474e71f6de5aa583674b6354db 100644 (file)
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -81,11 +81,6 @@
                                                <Export-Package>
                                                        org.opendaylight.protocol.bgp.parser.mock
                                                </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.protocol.bgp.parser,
-                                                       org.opendaylight.protocol.framework,
-                                                       org.opendaylight.protocol.concepts
-                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index 8975be78d43ef1bc43358f2d5ccda1801be226f6..8b0309b1e8ac2e19744ba543fb77689a9d999455 100644 (file)
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -68,7 +68,11 @@
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                                                <Export-Package>
                             org.opendaylight.protocol.bgp.parser.spi,
-                                               </Export-Package>
+                            org.opendaylight.protocol.bgp.parser.spi.osgi,
+                        </Export-Package>
+                        <Private-Package>
+                            org.opendaylight.protocol.bgp.parser.spi.pojo,
+                        </Private-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml
index c6440b7f1f8d3f1204b0265504f006d4465dc5f0..bd252f6fa7600d93b7971e12a37644e9b292e13e 100644 (file)
--- a/bgp/rib-mock/pom.xml
+++ b/bgp/rib-mock/pom.xml
@@ -85,16 +85,6 @@
                                                <Export-Package>
                                                        org.opendaylight.protocol.bgp.rib.mock,
                                                </Export-Package>
-                                               <Import-Package>
-                                                       com.google.common.*,
-                                                       org.opendaylight.protocol.bgp.parser,
-                            org.opendaylight.protocol.bgp.parser.impl,
-                            org.opendaylight.protocol.bgp.rib.impl,
-                                                       org.opendaylight.protocol.concepts,
-                                                       org.opendaylight.protocol.framework,
-                            org.opendaylight.protocol.util,
-                                                       org.slf4j,
-                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java
index c4fe9488d60b18e54cf43e294a0dabf039f56bfb..4889114acc69b6a86594a4bbb8a326fdecdc9437 100644 (file)
--- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java
+++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java
@@ -18,7 +18,7 @@ import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.parser.BGPSessionListener;
 import org.opendaylight.protocol.bgp.parser.impl.BGPMessageFactoryImpl;
-import org.opendaylight.protocol.bgp.parser.impl.SingletonProviderContext;
+import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.BGP;
 import org.opendaylight.protocol.concepts.ListenerRegistration;
 import org.opendaylight.protocol.framework.DeserializerException;
@@ -45,18 +45,19 @@ public final class BGPMock implements BGP, Closeable {
        private final List<byte[]> allPreviousByteMessages;
        private final List<Notification> allPreviousBGPMessages;
        private final EventBus eventBus;
+
        @GuardedBy("this")
        private final List<EventBusRegistration> openRegistrations = Lists.newLinkedList();
 
-       public BGPMock(final EventBus eventBus, final List<byte[]> bgpMessages) {
+       public BGPMock(final EventBus eventBus, final MessageRegistry registry, final List<byte[]> bgpMessages) {
                this.allPreviousByteMessages = Lists.newLinkedList(bgpMessages);
                this.eventBus = eventBus;
-               this.allPreviousBGPMessages = this.parsePrevious(this.allPreviousByteMessages);
+               this.allPreviousBGPMessages = this.parsePrevious(registry, this.allPreviousByteMessages);
        }
 
-       private List<Notification> parsePrevious(final List<byte[]> msgs) {
+       private List<Notification> parsePrevious(final MessageRegistry registry, final List<byte[]> msgs) {
                final List<Notification> messages = Lists.newArrayList();
-               final ProtocolMessageFactory<Notification> parser = new BGPMessageFactoryImpl(SingletonProviderContext.getInstance().getMessageRegistry());
+               final ProtocolMessageFactory<Notification> parser = new BGPMessageFactoryImpl(registry);
                try {
                        for (final byte[] b : msgs) {
 

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index 98347b430c425cfe738793f8d1bfda43fae5e08f..342c5988231f313736b138b6a4d44f2078c2d0df 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -70,9 +70,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Import-Package>
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130918.*,
-                                               </Import-Package>
                                                <Export-Package>
                                                        org.opendaylight.protocol.bgp.rib.spi
                                                </Export-Package>

diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml
index 66089cccd5eb2dccdbb49297c0228b59e7420a0e..bc13fe58201326d1418f3bb1f72a85947c5b1e91 100644 (file)
--- a/bgp/util/pom.xml
+++ b/bgp/util/pom.xml
@@ -80,15 +80,6 @@
                                                <Export-Package>
                                                        org.opendaylight.protocol.bgp.util,
                                                </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.protocol.bgp.concepts,
-                                                       org.opendaylight.protocol.bgp.parser,
-                                                       org.opendaylight.protocol.concepts,
-                            org.opendaylight.protocol.util,
-                                                       com.google.common.*, 
-                                                       org.apache.commons.*,
-                                                       org.slf4j
-                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/concepts/pom.xml b/concepts/pom.xml
index b9e897f7a53ef5347bb6a5da243cc3ee4dd639ca..8df83d8bf9fac123e154c346b5a37369bee728be 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -105,13 +105,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Import-Package>
-                            org.opendaylight.protocol.util,
-                            com.google.common.base,
-                            com.google.common.collect,
-                            com.google.common.net,
-                            com.google.common.primitives,
-                                               </Import-Package>
                                                <Export-Package>
                             org.opendaylight.protocol.concepts,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.*,

diff --git a/framework/pom.xml b/framework/pom.xml
index 89404be8740bc8caa939fae504610040ba8fc571..d841a3ca26c541870094dbca2ad85582e0d0274d 100644 (file)
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -72,17 +72,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Import-Package>
-                                                       com.google.common.base,
-                                                       com.google.common.collect,
-                                                       org.opendaylight.protocol.concepts,
-                                                       org.slf4j,
-                            javax.net.ssl,
-                            org.opendaylight.protocol.util,
-                                                       javax.annotation,
-                                                       javax.management,
-                                                       io.netty.*,
-                                               </Import-Package>
                                                <Export-Package>
                                                        org.opendaylight.protocol.framework,
                                                </Export-Package>

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java
index 83533f17cd1c9e7b6ea3df7c9895a87ff7262a8d..26c628d13572c43ed7e93c38dd37e7b184b20ddc 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;
 public final class BgpRibSpiBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("bgp-parser-api", "bgp-rib-api", "concepts", "framework", "util");
+               return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "bgp-rib-api", "concepts", "framework", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java
deleted file mode 100644 (file)
index d3bb834..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpTesttoolBundleTest.java
+++ /dev/null
@@ -1,27 +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.integration;
-
-import java.util.Collection;
-
-import com.google.common.collect.Lists;
-
-public final class BgpTesttoolBundleTest extends AbstractBundleTest {
-       @Override
-       protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("bgp-parser-api", "bgp-concepts", "bgp-linkstate",
-                               "bgp-parser-impl", "bgp-parser-spi", "bgp-util", "concepts",
-                               "framework", "bgp-rib-api", "bgp-rib-impl", "bgp-rib-spi",
-                               "rsvp-api", "util");
-       }
-
-       @Override
-       protected Collection<String> requiredBundles() {
-               return Lists.newArrayList("bgp-testtool");
-       }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java
index 2f128175fc2b3bc2c5f7f684c13cca9d05b9e714..ea3d07020182f09042d6b84dad7b32600ffbd079 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;
 public final class PcepImplBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("concepts", "framework", "pcep-api", "rsvp-api", "util");
+               return Lists.newArrayList("concepts", "framework", "pcep-api", "pcep-spi", "rsvp-api", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java
index 45b0a4552f75667039ad20f99828bc8ee2070de9..b7dacff7648c7397b3fec34ad3d3d2de241a510c 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;
 public final class PcepSpiBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("concepts", "framework", "pcep-api", "util");
+               return Lists.newArrayList("concepts", "framework", "pcep-api", "rsvp-api", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepTesttoolBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepTesttoolBundleTest.java
deleted file mode 100644 (file)
index 4c6a660..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepTesttoolBundleTest.java
+++ /dev/null
@@ -1,24 +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.integration;
-
-import java.util.Collection;
-
-import com.google.common.collect.Lists;
-
-public final class PcepTesttoolBundleTest extends AbstractBundleTest {
-       @Override
-       protected Collection<String> prerequisiteBundles() {
-               return Lists.newArrayList("concepts", "framework", "pcep-api", "pcep-impl", "rsvp-api", "util");
-       }
-
-       @Override
-       protected Collection<String> requiredBundles() {
-               return Lists.newArrayList("pcep-testtool");
-       }
-}

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 8cefc89306a99f55b07da1898e8f34fa5022123d..39aa9f233bd0bbf23f2dd1f6fcfddb2eaf9e56ac 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -110,26 +110,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Import-Package>
-                                                       org.opendaylight.protocol.concepts,
-                                                       org.opendaylight.protocol.framework,
-                                                       com.google.common.base,
-                                                       com.google.common.collect,
-                                                       com.google.common.primitives,
-                                                       javax.annotation,
-                                                       javax.management,
-                            javax.net.ssl,
-                                                       org.opendaylight.protocol.pcep,
-                                                       org.opendaylight.protocol.pcep.concepts,
-                                                       org.opendaylight.protocol.pcep.message,
-                                                       org.opendaylight.protocol.pcep.object,
-                                                       org.opendaylight.protocol.pcep.subobject,
-                                                       org.opendaylight.protocol.pcep.tlv,
-                            org.opendaylight.protocol.util,
-                                                       org.slf4j,
-                                                       io.netty.channel, 
-                                                       io.netty.util.concurrent,
-                                               </Import-Package>
                                                <Export-Package>
                                                        org.opendaylight.protocol.pcep.impl.*,
                                                </Export-Package>

diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml
index 3bac3dab495ff4c22446d65776980724286360cf..6adf2e98ec8dc4bb947b6d4b926c115cd1f7e436 100644 (file)
--- a/pcep/spi/pom.xml
+++ b/pcep/spi/pom.xml
@@ -55,14 +55,6 @@
                        <Export-Package>
                            org.opendaylight.protocol.pcep.spi,
                        </Export-Package>
-                       <Import-Package>
-                           org.opendaylight.protocol.concepts,
-                           org.opendaylight.protocol.framework,
-                           org.opendaylight.protocol.util,
-                           com.google.common.*,
-                           javax.management,
-                           org.slf4j.*
-                       </Import-Package>
                    </instructions>
                </configuration>
            </plugin>

diff --git a/util/pom.xml b/util/pom.xml
index bb7db8e542009f8727202c662ed722f7ddcce2dd..e6a2c1c44d4607a379419fa57cd0846b9960cdab 100644 (file)
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -41,10 +41,6 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Import-Package>
-                            com.google.common.*, 
-                            javax.net.ssl,
-                                               </Import-Package>
                                                <Export-Package>
                                                        org.opendaylight.protocol.util
                                                </Export-Package>