From: Thanh Ha Date: Thu, 7 Nov 2019 18:30:48 +0000 (-0500) Subject: Fix Checkstyle errors in odl-simple X-Git-Tag: 1.0.0~14 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ed3b884ca88022c052996a5604f3b6fcab130e94;p=odlmicro.git Fix Checkstyle errors in odl-simple * License headers to EPL 1.0 -> ODL Projects need to use EPL as the license so fix the license headers to reflect the proper license. * Using tabs instead of spaces -> Checkstyle is recommending code be space indented rather than tabs. * Fix import order should be alphabetical. * Fix line length longer than max 120 characters. JIRA: ODLMICRO-27 Issue: ODL-7526 Signed-off-by: Thanh Ha Signed-off-by: Tejas Nevrekar Change-Id: I595d441db7294645e4189ab6ffd17f8ea80ce22a --- diff --git a/simple-core/src/main/java/org/opendaylight/aaa/simple/AAAModule.java b/simple-core/src/main/java/org/opendaylight/aaa/simple/AAAModule.java index 3367d8b..c4bcbd5 100644 --- a/simple-core/src/main/java/org/opendaylight/aaa/simple/AAAModule.java +++ b/simple-core/src/main/java/org/opendaylight/aaa/simple/AAAModule.java @@ -7,6 +7,8 @@ */ package org.opendaylight.aaa.simple; +import com.google.inject.AbstractModule; +import com.google.inject.Provides; import javax.annotation.Nullable; import javax.inject.Singleton; @@ -17,8 +19,6 @@ import org.opendaylight.aaa.api.PasswordCredentials; import org.opendaylight.aaa.shiro.tokenauthrealm.auth.ClaimBuilder; import org.opendaylight.aaa.shiro.tokenauthrealm.auth.PasswordCredentialBuilder; -import com.google.inject.AbstractModule; -import com.google.inject.Provides; public class AAAModule extends AbstractModule { @@ -29,21 +29,25 @@ public class AAAModule extends AbstractModule { } @Provides - @Singleton - CredentialAuth getPasswordCredentialAuth() { - PasswordCredentials passwordCredentials = new PasswordCredentialBuilder().setUserName("admin").setPassword("admin").setDomain("").build(); - return new CredentialAuth() { + @Singleton + CredentialAuth getPasswordCredentialAuth() { + PasswordCredentials passwordCredentials = new PasswordCredentialBuilder() + .setUserName("admin") + .setPassword("admin") + .setDomain("") + .build(); + return new CredentialAuth() { - @Nullable - @Override - public Claim authenticate(PasswordCredentials cred) throws AuthenticationException { - if (cred.equals(passwordCredentials)) { - return new ClaimBuilder() - .setUser("admin") - .build(); - } - return null; - } - }; - } + @Nullable + @Override + public Claim authenticate(PasswordCredentials cred) throws AuthenticationException { + if (cred.equals(passwordCredentials)) { + return new ClaimBuilder() + .setUser("admin") + .build(); + } + return null; + } + }; + } } diff --git a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalBossGroup.java b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalBossGroup.java index dc6f2fa..34a3c12 100644 --- a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalBossGroup.java +++ b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalBossGroup.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.controller.simple; diff --git a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalEventExecutor.java b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalEventExecutor.java index 7f2519e..6c4b8f3 100644 --- a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalEventExecutor.java +++ b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalEventExecutor.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.controller.simple; @@ -12,13 +12,12 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import io.netty.util.concurrent.EventExecutor; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; - import javax.inject.Qualifier; -import io.netty.util.concurrent.EventExecutor; /** * PingPong {@link EventExecutor} dependency injection annotation. diff --git a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalTimer.java b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalTimer.java index 4ad2e53..ee9c517 100644 --- a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalTimer.java +++ b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalTimer.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.controller.simple; diff --git a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalWorkerGroup.java b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalWorkerGroup.java index c587558..1717be8 100644 --- a/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalWorkerGroup.java +++ b/simple-core/src/main/java/org/opendaylight/controller/simple/GlobalWorkerGroup.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.controller.simple; diff --git a/simple-core/src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java b/simple-core/src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java index e998616..d8086e8 100644 --- a/simple-core/src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java +++ b/simple-core/src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java @@ -7,6 +7,11 @@ */ package org.opendaylight.controller.simple; +import com.google.inject.Provides; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import io.netty.channel.EventLoopGroup; +import io.netty.util.Timer; +import io.netty.util.concurrent.EventExecutor; import javax.inject.Singleton; import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor; @@ -39,12 +44,6 @@ import org.opendaylight.mdsal.dom.broker.DOMRpcRouter; import org.opendaylight.mdsal.simple.MdsalModule; import org.opendaylight.mdsal.simple.PingPong; -import com.google.inject.Provides; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.netty.channel.EventLoopGroup; -import io.netty.util.Timer; -import io.netty.util.concurrent.EventExecutor; @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") public class InMemoryControllerModule extends AbstractCloseableModule { @@ -116,39 +115,39 @@ public class InMemoryControllerModule extends AbstractCloseableModule { } // NETCONF - // FIXME Add configuration for thread-count - @Provides - @Singleton - @GlobalBossGroup - EventLoopGroup getGlobalBossGroup() { - return NioEventLoopGroupCloseable.newInstance(0); - } + // FIXME Add configuration for thread-count + @Provides + @Singleton + @GlobalBossGroup + EventLoopGroup getGlobalBossGroup() { + return NioEventLoopGroupCloseable.newInstance(0); + } // NETCONF - // FIXME Add configuration for thread-count - @Provides - @Singleton - @GlobalWorkerGroup - EventLoopGroup getGlobalWorkerGroup() { - return NioEventLoopGroupCloseable.newInstance(0); - } + // FIXME Add configuration for thread-count + @Provides + @Singleton + @GlobalWorkerGroup + EventLoopGroup getGlobalWorkerGroup() { + return NioEventLoopGroupCloseable.newInstance(0); + } // NETCONF - // FIXME Add configuration for thread-count - @Provides - @Singleton - @GlobalTimer - Timer getGlobalTimer() { - return HashedWheelTimerCloseable.newInstance(0L, 0); - } + // FIXME Add configuration for thread-count + @Provides + @Singleton + @GlobalTimer + Timer getGlobalTimer() { + return HashedWheelTimerCloseable.newInstance(0L, 0); + } // NETCONF - @Provides - @Singleton - @GlobalEventExecutor - EventExecutor getGlobalEventExecutor() { - return AutoCloseableEventExecutor.globalEventExecutor(); - } + @Provides + @Singleton + @GlobalEventExecutor + EventExecutor getGlobalEventExecutor() { + return AutoCloseableEventExecutor.globalEventExecutor(); + } @Override public void close() throws Exception { diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfMain.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfMain.java index 8bd6c45..cf1e81c 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfMain.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfMain.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfModule.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfModule.java index 9870b82..dc87e13 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfModule.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/NetconfModule.java @@ -1,15 +1,18 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple; +import com.google.inject.Provides; +import io.netty.channel.EventLoopGroup; +import io.netty.util.Timer; +import io.netty.util.concurrent.EventExecutor; import java.util.Arrays; import java.util.concurrent.TimeUnit; - import javax.inject.Singleton; import org.opendaylight.aaa.api.CredentialAuth; @@ -63,11 +66,6 @@ import org.opendaylight.serviceutils.simple.ServiceUtilsModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.inject.Provides; - -import io.netty.channel.EventLoopGroup; -import io.netty.util.Timer; -import io.netty.util.concurrent.EventExecutor; /** * Guice module for NetConf. @@ -108,204 +106,211 @@ public class NetconfModule extends AutoWiringModule { install(new RestConfModule()); } - // Converted here from netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml - // START - @Provides - @Singleton - NamingThreadPoolFactory getNamingThreadPoolFactory() { - return new NamingThreadPoolFactory(NAME_PREFIX); - } - - @Provides - @Singleton - @GlobalNetconfProcessingExecutor - ThreadPool getFlexibleThreadPool(NamingThreadPoolFactory namingThreadPoolFactory) { - return new FlexibleThreadPoolWrapper(MIN_THREAD_COUNT_FLEXIBLE_THREAD_POOL, - MAX_THREAD_COUNT_FLEXIBLE_THREAD_POOL, - KEEP_ALIVE_MILLIS_FLEXIBLE_THREAD_POOL, - TimeUnit.valueOf("MILLISECONDS"), - namingThreadPoolFactory); - } + // Converted here from netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml + // START + @Provides + @Singleton + NamingThreadPoolFactory getNamingThreadPoolFactory() { + return new NamingThreadPoolFactory(NAME_PREFIX); + } - @Provides - @Singleton - @GlobalNetconfSshScheduledExecutor - ScheduledThreadPool getScheduledThreadPool(NamingThreadPoolFactory namingThreadPoolFactory) { - return new ScheduledThreadPoolWrapper(MAX_THREAD_COUNT_SCHEDULED_THREAD_POOL, namingThreadPoolFactory); - } - - // Converted here from netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml - // END + @Provides + @Singleton + @GlobalNetconfProcessingExecutor + ThreadPool getFlexibleThreadPool(NamingThreadPoolFactory namingThreadPoolFactory) { + return new FlexibleThreadPoolWrapper(MIN_THREAD_COUNT_FLEXIBLE_THREAD_POOL, + MAX_THREAD_COUNT_FLEXIBLE_THREAD_POOL, + KEEP_ALIVE_MILLIS_FLEXIBLE_THREAD_POOL, + TimeUnit.valueOf("MILLISECONDS"), + namingThreadPoolFactory); + } - // Converted here from netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml - // START @Provides - @Singleton + @Singleton + @GlobalNetconfSshScheduledExecutor + ScheduledThreadPool getScheduledThreadPool(NamingThreadPoolFactory namingThreadPoolFactory) { + return new ScheduledThreadPoolWrapper(MAX_THREAD_COUNT_SCHEDULED_THREAD_POOL, namingThreadPoolFactory); + } + + // Converted here from netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml + // END + + // Converted here from netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml + // START + @Provides + @Singleton @org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher NetconfClientDispatcher getNetconfClientDispatcher( - @GlobalBossGroup EventLoopGroup globalBossGroup, - @GlobalWorkerGroup EventLoopGroup globalWorkerGroup, - @GlobalTimer Timer globalTimer) { + @GlobalBossGroup EventLoopGroup globalBossGroup, + @GlobalWorkerGroup EventLoopGroup globalWorkerGroup, + @GlobalTimer Timer globalTimer) { return new NetconfClientDispatcherImpl(globalBossGroup, globalWorkerGroup, globalTimer); } - // Converted here from netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml - // END + // Converted here from netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml + // END - // Converted here from mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml - // START + // Converted here from mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml + // START @Provides @Singleton @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry NetconfOperationServiceFactoryListener getMapperAggregatorRegistry() { - return new AggregatedNetconfOperationServiceFactory(); + return new AggregatedNetconfOperationServiceFactory(); } @Provides @Singleton @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory NetconfOperationServiceFactory getAggregatedNetconfOperationServiceFactoryListener() { - return new AggregatedNetconfOperationServiceFactory(); + return new AggregatedNetconfOperationServiceFactory(); } @Provides @Singleton @AggregatedNetconfOperationServiceFactoryMappers AggregatedNetconfOperationServiceFactory getAggregatedNetconfOperationServiceFactoryMappers( - @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory) { - return new AggregatedNetconfOperationServiceFactory(Arrays.asList(aggregatedNetconfOperationServiceFactory)); - } + @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory + NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory) { + return new AggregatedNetconfOperationServiceFactory(Arrays.asList(aggregatedNetconfOperationServiceFactory)); + } @Provides @Singleton NetconfMonitoringService getNetconfMonitoringService( - @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory, - @GlobalNetconfSshScheduledExecutor ScheduledThreadPool scheduledThreadPool) { - return new NetconfMonitoringServiceImpl(aggregatedNetconfOperationServiceFactory, scheduledThreadPool, MONITORING_UPDATE_INTERVAL); + @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory + NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory, + @GlobalNetconfSshScheduledExecutor ScheduledThreadPool scheduledThreadPool) { + return new NetconfMonitoringServiceImpl( + aggregatedNetconfOperationServiceFactory, scheduledThreadPool, MONITORING_UPDATE_INTERVAL); } - + @Provides @Singleton NetconfServerSessionNegotiatorFactory getNetconfServerSessionNegotiatorFactory( - @GlobalTimer Timer globalTimer, - @AggregatedNetconfOperationServiceFactoryMappers AggregatedNetconfOperationServiceFactory aggregatedNetconfOperationServiceFactoryMappers, - SessionIdProvider sessionIdProvider, - NetconfMonitoringService netconfMonitoringService) { - return new NetconfServerSessionNegotiatorFactory(globalTimer, - aggregatedNetconfOperationServiceFactoryMappers, - sessionIdProvider, - CONNECTION_TIMEOUT_MILLIS, - netconfMonitoringService); - } + @GlobalTimer Timer globalTimer, + @AggregatedNetconfOperationServiceFactoryMappers + AggregatedNetconfOperationServiceFactory aggregatedNetconfOperationServiceFactoryMappers, + SessionIdProvider sessionIdProvider, + NetconfMonitoringService netconfMonitoringService) { + return new NetconfServerSessionNegotiatorFactory(globalTimer, + aggregatedNetconfOperationServiceFactoryMappers, + sessionIdProvider, + CONNECTION_TIMEOUT_MILLIS, + netconfMonitoringService); + } @Provides - @Singleton + @Singleton ServerChannelInitializer getServerChannelInitializer( - NetconfServerSessionNegotiatorFactory netconfServerSessionNegotiatorFactory) { - return new ServerChannelInitializer(netconfServerSessionNegotiatorFactory); + NetconfServerSessionNegotiatorFactory netconfServerSessionNegotiatorFactory) { + return new ServerChannelInitializer(netconfServerSessionNegotiatorFactory); } - + @Provides - @Singleton + @Singleton NetconfServerDispatcher getNetconfServerDispatcher( - ServerChannelInitializer serverChannelInitializer, - @GlobalBossGroup EventLoopGroup globalBossGroup, - @GlobalWorkerGroup EventLoopGroup globalWorkerGroup) { + ServerChannelInitializer serverChannelInitializer, + @GlobalBossGroup EventLoopGroup globalBossGroup, + @GlobalWorkerGroup EventLoopGroup globalWorkerGroup) { return new NetconfServerDispatcherImpl(serverChannelInitializer, globalBossGroup, globalWorkerGroup); } - // Converted here from mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml - // END + // Converted here from mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml + // END // Converted here from netconf-topology/src/main/resources/OSGI-INF/blueprint/netconf-topology.xml - // START + // START @Provides - @Singleton + @Singleton SchemaRepositoryProviderImpl getSchemaRepositoryProviderImpl( - ServerChannelInitializer serverChannelInitializer, - @GlobalBossGroup EventLoopGroup globalBossGroup, - @GlobalWorkerGroup EventLoopGroup globalWorkerGroup) { + ServerChannelInitializer serverChannelInitializer, + @GlobalBossGroup EventLoopGroup globalBossGroup, + @GlobalWorkerGroup EventLoopGroup globalWorkerGroup) { return new SchemaRepositoryProviderImpl("shared-schema-repository-impl"); } - @Provides - @Singleton - NetconfTopology getNetconfTopology(@org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency, - @GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor, - @GlobalNetconfProcessingExecutor ThreadPool processingExecutor, - SchemaRepositoryProviderImpl schemaRepositoryProvider, - @GlobalEventExecutor EventExecutor eventExecutor, - DataBroker dataBroker, - DOMMountPointService mountPointService, - AAAEncryptionService encryptionService) { - NetconfTopologyImpl impl= new NetconfTopologyImpl("topology-netconf", - clientDispatcherDependency, - eventExecutor, - keepAliveExecutor, - processingExecutor, - schemaRepositoryProvider, - dataBroker, - mountPointService, - encryptionService); - impl.init(); - return impl; - } + @Provides + @Singleton + NetconfTopology getNetconfTopology(@org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher + NetconfClientDispatcher clientDispatcherDependency, + @GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor, + @GlobalNetconfProcessingExecutor ThreadPool processingExecutor, + SchemaRepositoryProviderImpl schemaRepositoryProvider, + @GlobalEventExecutor EventExecutor eventExecutor, + DataBroker dataBroker, + DOMMountPointService mountPointService, + AAAEncryptionService encryptionService) { + NetconfTopologyImpl impl = new NetconfTopologyImpl("topology-netconf", + clientDispatcherDependency, + eventExecutor, + keepAliveExecutor, + processingExecutor, + schemaRepositoryProvider, + dataBroker, + mountPointService, + encryptionService); + impl.init(); + return impl; + } // -// @Provides -// @Singleton -// NetconfTopologySingletonService getNetconfTopologyManager(DataBroker dataBroker, -// DOMRpcProviderService rpcRegistry, -// ClusterSingletonServiceProvider clusterSingletonService, -// @GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor, -// @GlobalNetconfProcessingExecutor ThreadPool processingExecutor, -// ActorSystemProvider actorSystemProvider, -// @GlobalEventExecutor EventExecutor eventExecutor, -// @org.opendaylight.netconf.simple.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency, -// DOMMountPointService mountPointService, -// AAAEncryptionService encryptionService) { -// Config config = new ConfigBuilder().setWriteTransactionIdleTimeout(WRITE_TRANSACTION_IDLE_TIMEOUT_MILLIS) -// .build(); -// return new NetconfTopologyManager(dataBroker, -// rpcRegistry, -// clusterSingletonService, -// keepAliveExecutor, -// processingExecutor, -// actorSystemProvider, -// eventExecutor, -// clientDispatcherDependency, -// "topology-netconf", -// config, -// mountPointService, -// encryptionService); -// } +// @Provides +// @Singleton +// NetconfTopologySingletonService getNetconfTopologyManager(DataBroker dataBroker, +// DOMRpcProviderService rpcRegistry, +// ClusterSingletonServiceProvider clusterSingletonService, +// @GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor, +// @GlobalNetconfProcessingExecutor ThreadPool processingExecutor, +// ActorSystemProvider actorSystemProvider, +// @GlobalEventExecutor EventExecutor eventExecutor, +// @org.opendaylight.netconf.simple.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency, +// DOMMountPointService mountPointService, +// AAAEncryptionService encryptionService) { +// Config config = new ConfigBuilder().setWriteTransactionIdleTimeout(WRITE_TRANSACTION_IDLE_TIMEOUT_MILLIS) +// .build(); +// return new NetconfTopologyManager(dataBroker, +// rpcRegistry, +// clusterSingletonService, +// keepAliveExecutor, +// processingExecutor, +// actorSystemProvider, +// eventExecutor, +// clientDispatcherDependency, +// "topology-netconf", +// config, +// mountPointService, +// encryptionService); +// } // Converted here from netconf-topology/src/main/resources/OSGI-INF/blueprint/netconf-topology.xml - // END + // END - // Converted here from mdsal-netconf-connector/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-connector.xml - // START + // Converted here from mdsal-netconf-connector/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-connector.xml + // START - @Provides - @Singleton - @MdsalNetconfConnector - NetconfOperationServiceFactory getMdsalNetconfOperationServiceFactory(DOMSchemaService schemaService, - @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry NetconfOperationServiceFactoryListener mapperAggregatorRegistry, - DOMDataBroker domDataBroker, - DOMRpcService domRpcService) { - return new MdsalNetconfOperationServiceFactory(schemaService, mapperAggregatorRegistry, domDataBroker, domRpcService); - } + @Provides + @Singleton + @MdsalNetconfConnector + NetconfOperationServiceFactory getMdsalNetconfOperationServiceFactory(DOMSchemaService schemaService, + @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry + NetconfOperationServiceFactoryListener mapperAggregatorRegistry, + DOMDataBroker domDataBroker, + DOMRpcService domRpcService) { + return new MdsalNetconfOperationServiceFactory( + schemaService, mapperAggregatorRegistry, domDataBroker, domRpcService); + } // Converted here from mdsal-netconf-connector/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-connector.xml - // END + // END // Converted here from netconf/aaa-authn-odl-plugin/src/main/resources/OSGI-INF/blueprint/aaa-authn-netconf.xml - // START + // START - @Provides - @Singleton - @NetconfAuthProvider - AuthProvider getNetconfAuthProvider(CredentialAuth credService) { - return new CredentialServiceAuthProvider(credService); - } + @Provides + @Singleton + @NetconfAuthProvider + AuthProvider getNetconfAuthProvider(CredentialAuth credService) { + return new CredentialServiceAuthProvider(credService); + } // Converted here from netconf/aaa-authn-odl-plugin/src/main/resources/OSGI-INF/blueprint/aaa-authn-netconf.xml - // END + // END } diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactory.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactory.java index d6c1364..6fc7fbd 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactory.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactory.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactoryMappers.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactoryMappers.java index 2e21a28..d90590c 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactoryMappers.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/AggregatedNetconfOperationServiceFactoryMappers.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; @@ -26,7 +26,8 @@ import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; *

USAGE: 

 {@literal @}Singleton
  * public class Thing {
  *     {@literal @}Inject
- *     public Thing({@literal @}AggregatedNetconfOperationServiceFactoryMappers NetconfOperationServiceFactory listener) {
+ *     public Thing({@literal @}AggregatedNetconfOperationServiceFactoryMappers
+ *         NetconfOperationServiceFactory listener) {
  *         ...
  *     }
  * }
diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfProcessingExecutor.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfProcessingExecutor.java index a825f22..99250b0 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfProcessingExecutor.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfProcessingExecutor.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfSshScheduledExecutor.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfSshScheduledExecutor.java index 93840ed..474a442 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfSshScheduledExecutor.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/GlobalNetconfSshScheduledExecutor.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MapperAggregatorRegistry.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MapperAggregatorRegistry.java index 093a45a..8843e66 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MapperAggregatorRegistry.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MapperAggregatorRegistry.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MdsalNetconfConnector.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MdsalNetconfConnector.java index bc07d0a..1496bf7 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MdsalNetconfConnector.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/MdsalNetconfConnector.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfAuthProvider.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfAuthProvider.java index 130d1e2..a37b348 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfAuthProvider.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfAuthProvider.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfClientDispatcher.java b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfClientDispatcher.java index 66ac651..df92ebb 100644 --- a/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfClientDispatcher.java +++ b/simple-netconf/src/main/java/org/opendaylight/netconf/simple/annotations/NetconfClientDispatcher.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.netconf.simple.annotations; diff --git a/simple-openflowplugin/src/main/java/org/opendaylight/openflowplugin/simple/OpenflowPluginMain.java b/simple-openflowplugin/src/main/java/org/opendaylight/openflowplugin/simple/OpenflowPluginMain.java index 18058a8..542350d 100644 --- a/simple-openflowplugin/src/main/java/org/opendaylight/openflowplugin/simple/OpenflowPluginMain.java +++ b/simple-openflowplugin/src/main/java/org/opendaylight/openflowplugin/simple/OpenflowPluginMain.java @@ -1,9 +1,9 @@ /* - * (C) 2019 Lumina Networks, Inc. - * 2077 Gateway Place, Suite 500, San Jose, CA 95110. - * All rights reserved. + * Copyright (c) 2019 Lumina Networks, Inc. and others. All rights reserved. * - * Use of the software files and documentation is subject to license terms. + * 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.openflowplugin.simple;