Removed checkstyle warnings.

[bgpcep.git] / integration-tests / src / test / java / org / opendaylight / protocol / integration / pcep / AbstractPcepOsgiTest.java

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
index 1d0190f993b6c046f7824e653105217380813ae8..84861850bbff0ce6516a5cd93094d73e75ccaef3 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
@@ -14,7 +14,9 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 import java.util.Collection;
 import java.util.Collections;
+
 import javax.inject.Inject;
+
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.controller.test.sal.binding.it.TestHelper;
@@ -28,37 +30,37 @@ import org.osgi.framework.BundleContext;
 
 //FIXME: merge with org.opendaylight.controller.test.sal.binding.it.AbstractTest ?
 public class AbstractPcepOsgiTest {
-       @Inject
-       @Filter(timeout = 120 * 1000)
-       BindingAwareBroker broker;
-       @Inject
-       BundleContext bundleContext;
-
-       public BindingAwareBroker getBroker() {
-               return this.broker;
-       }
-
-       public void setBroker(final BindingAwareBroker broker) {
-               this.broker = broker;
-       }
-
-       public BundleContext getBundleContext() {
-               return this.bundleContext;
-       }
-
-       public void setBundleContext(final BundleContext bundleContext) {
-               this.bundleContext = bundleContext;
-       }
-
-       @Configuration
-       public Option[] config() {
-               return options(
-                               //TestHelper.getLoggingBundles(), //
-
-                               pcepModules(), //
-                               systemProperty("osgi.bundles.defaultStartLevel").value("4"),
-                               systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
-                               systemPackages("sun.nio.ch"),
+    @Inject
+    @Filter(timeout = 120 * 1000)
+    BindingAwareBroker broker;
+    @Inject
+    BundleContext bundleContext;
+
+    public BindingAwareBroker getBroker() {
+        return this.broker;
+    }
+
+    public void setBroker(final BindingAwareBroker broker) {
+        this.broker = broker;
+    }
+
+    public BundleContext getBundleContext() {
+        return this.bundleContext;
+    }
+
+    public void setBundleContext(final BundleContext bundleContext) {
+        this.bundleContext = bundleContext;
+    }
+
+    @Configuration
+    public Option[] config() {
+        return options(
+                // TestHelper.getLoggingBundles(), //
+
+                pcepModules(), //
+                systemProperty("osgi.bundles.defaultStartLevel").value("4"),
+                systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+                systemPackages("sun.nio.ch"),
 
                 mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), //
                 mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), //
@@ -66,58 +68,53 @@ public class AbstractPcepOsgiTest {
                 mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(),
                 mavenBundle("org.openexi", "nagasena").versionAsInProject(),
 
-
                 TestHelper.mdSalCoreBundles(),
 
-                TestHelper.bindingAwareSalBundles(),
-                TestHelper.configMinumumBundles(),
-                TestHelper.baseModelBundles(),
-                TestHelper.flowCapableModelBundles(),
-                TestHelper.junitAndMockitoBundles()
-        );
-       }
-
-       private Option pcepModules() {
-               return new DefaultCompositeOption(mavenBundle("org.opendaylight.yangtools.model", "ietf-topology").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-topology-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-tunnel-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-api-config").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-impl").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-spi").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-ietf-stateful02").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "pcep-ietf-stateful07").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "tcpmd5-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "tcpmd5-netty").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "topology-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "topology-tunnel-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "programming-topology-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "programming-tunnel-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "concepts").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "util").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "rsvp-api").versionAsInProject(), //
-                               mavenBundle("org.opendaylight.bgpcep", "programming-api").versionAsInProject());
-       }
-
-       abstract class AbstractTestProvider implements BindingAwareProvider {
-
-               @Override
-               public Collection<? extends RpcService> getImplementations() {
-                       return Collections.emptySet();
-               }
-
-               @Override
-               public Collection<? extends ProviderFunctionality> getFunctionality() {
-                       return Collections.emptySet();
-               }
-
-               @Override
-               public void onSessionInitialized(final BindingAwareBroker.ConsumerContext session) {
-               }
-
-       }
-
-       TopologyKey getTopologyId(final String id) {
-               return new TopologyKey(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId(id));
-       }
+                TestHelper.bindingAwareSalBundles(), TestHelper.configMinumumBundles(), TestHelper.baseModelBundles(),
+                TestHelper.flowCapableModelBundles(), TestHelper.junitAndMockitoBundles());
+    }
+
+    private Option pcepModules() {
+        return new DefaultCompositeOption(mavenBundle("org.opendaylight.yangtools.model", "ietf-topology").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-topology-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-tunnel-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-api-config").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-impl").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-spi").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-ietf-stateful02").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "pcep-ietf-stateful07").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "tcpmd5-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "tcpmd5-netty").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "topology-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "topology-tunnel-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "programming-topology-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "programming-tunnel-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "concepts").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "util").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "rsvp-api").versionAsInProject(), //
+                mavenBundle("org.opendaylight.bgpcep", "programming-api").versionAsInProject());
+    }
+
+    abstract class AbstractTestProvider implements BindingAwareProvider {
+
+        @Override
+        public Collection<? extends RpcService> getImplementations() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public Collection<? extends ProviderFunctionality> getFunctionality() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public void onSessionInitialized(final BindingAwareBroker.ConsumerContext session) {
+        }
+
+    }
+
+    TopologyKey getTopologyId(final String id) {
+        return new TopologyKey(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId(id));
+    }
 }