From: Ed Warnicke Date: Mon, 27 Jan 2014 14:11:06 +0000 (+0000) Subject: Merge changes I8c23739a,Ia0e70828 X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-14~1 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4c1e9ed9fa2386ca63a0bbf11da620c83a6d7d5e;hp=-c Merge changes I8c23739a,Ia0e70828 * changes: Bulk-add copyright headers to java files Bulk-add copyright headers to .xtend files --- 4c1e9ed9fa2386ca63a0bbf11da620c83a6d7d5e diff --combined opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index 884e7c914e,7c606e61c5..3c5efa5e3a --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@@ -1,3 -1,10 +1,10 @@@ + /* + * Copyright (c) 2014 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.controller.test.sal.binding.it; import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; @@@ -58,7 -65,7 +65,7 @@@ public class TestHelper mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), // mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), // - mavenBundle(CONTROLLER + ".thirdparty", "ganymed", "1.0-SNAPSHOT"), // + mavenBundle(CONTROLLER + ".thirdparty", "ganymed").versionAsInProject(), // mavenBundle(CONTROLLER, "netconf-mapping-api").versionAsInProject(), // mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), // diff --combined opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java index 4ddceb3b5f,200948cc0c..4d395267dd --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java @@@ -1,3 -1,10 +1,10 @@@ + /* + * Copyright (c) 2014 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.controller.md.sal.common.impl.routing; import java.util.Map.Entry; @@@ -12,7 -19,6 +19,7 @@@ import com.google.common.base.Predicate import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; /** * Base abstract implementation of DataReadRouter, which performs @@@ -23,8 -29,8 +30,8 @@@ */ public abstract class AbstractDataReadRouter

, D> implements DataReader { - Multimap> configReaders = HashMultimap.create(); - Multimap> operationalReaders = HashMultimap.create(); + Multimap> configReaders = Multimaps.synchronizedSetMultimap(HashMultimap.>create()); + Multimap> operationalReaders = Multimaps.synchronizedSetMultimap(HashMultimap.>create()); @Override public D readConfigurationData(P path) { diff --combined opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend index cef88fc375,527b428975..927975ca53 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend @@@ -1,3 -1,10 +1,10 @@@ + /* + * Copyright (c) 2014 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.controller.md.sal.common.impl.service import com.google.common.collect.FluentIterable @@@ -37,7 -44,6 +44,7 @@@ import org.opendaylight.yangtools.yang. import org.slf4j.LoggerFactory import static com.google.common.base.Preconditions.* import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent +import com.google.common.collect.Multimaps abstract class AbstractDataBroker

, D, DCL extends DataChangeListener> implements DataModificationTransactionFactory, // DataReader, // @@@ -61,8 -67,8 +68,8 @@@ DataProvisionService @Property private val AtomicLong finishedTransactionsCount = new AtomicLong - Multimap> listeners = HashMultimap.create(); - Multimap> commitHandlers = HashMultimap.create(); + Multimap> listeners = Multimaps.synchronizedSetMultimap(HashMultimap.create()); + Multimap> commitHandlers = Multimaps.synchronizedSetMultimap(HashMultimap.create()); val ListenerRegistry>> commitHandlerRegistrationListeners = new ListenerRegistry(); public new() { diff --combined opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java index f0f5ac3e33,4955eceaff..28d5ae914f --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java @@@ -1,3 -1,10 +1,10 @@@ + /* + * Copyright (c) 2014 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.controller.sal.dom.broker.impl; import static com.google.common.base.Preconditions.checkArgument; @@@ -119,7 -126,6 +126,7 @@@ public class SchemaAwareRpcBroker imple RpcDefinition definition = findRpcDefinition(rpcType); checkArgument(!isRoutedRpc(definition), "RPC Type must not be routed."); GlobalRpcRegistration reg = new GlobalRpcRegistration(rpcType, implementation, this); + implementations.putIfAbsent(rpcType, implementation); return reg; } diff --combined opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend index 3f77133c2e,a26fc257c2..5b97443b92 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend @@@ -1,3 -1,10 +1,10 @@@ + /* + * Copyright (c) 2014 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.controller.sal.dom.broker.osgi import org.opendaylight.controller.sal.core.api.BrokerService @@@ -8,7 -15,6 +15,7 @@@ import org.opendaylight.controller.sal. import org.opendaylight.controller.sal.core.api.notify.NotificationService import org.opendaylight.controller.sal.core.api.model.SchemaService import org.opendaylight.controller.sal.core.api.mount.MountProvisionService +import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry class ProxyFactory { @@@ -41,10 -47,6 +48,10 @@@ new SchemaServiceProxy(ref as ServiceReference, service); } + private static def dispatch createProxyImpl(ServiceReference ref, RpcProvisionRegistry service) { + new RpcProvisionRegistryProxy(ref as ServiceReference, service); + } + private static def dispatch createProxyImpl(ServiceReference reference, BrokerService service) { throw new IllegalArgumentException("Not supported class"); } diff --combined opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java index a15e8d616c,c4672bf65d..08aeea2678 --- a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java +++ b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java @@@ -1,3 -1,10 +1,10 @@@ + /* + * Copyright (c) 2014 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.controller.test.restconf.it; import static junit.framework.Assert.assertEquals; @@@ -216,7 -223,7 +223,7 @@@ public class ServiceProviderController mavenBundle(ODL, "netconf-impl").versionAsInProject(), mavenBundle(ODL, "netconf-client").versionAsInProject(), mavenBundle(ODL, "netconf-util").versionAsInProject(), - mavenBundle(ODL + ".thirdparty", "ganymed", "1.0-SNAPSHOT"), + mavenBundle(ODL + ".thirdparty", "ganymed").versionAsInProject(), mavenBundle(ODL, "netconf-mapping-api").versionAsInProject(), mavenBundle(ODL, "config-netconf-connector").versionAsInProject(), mavenBundle(ODL, "config-persister-impl").versionAsInProject(),