[aries-rsa] branch master updated: ARIES-1943 Changed TopologyManager importer logic to not assume all referenced ImportRegistrations are 'open'. (#36)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 0f48071 ARIES-1943 Changed TopologyManager importer logic to not
assume all referenced ImportRegistrations are 'open'. (#36)
0f48071 is described below
commit 0f48071f60263d35e55dcf7f510f06dd75018da5
Author: Arnoud Glimmerveen
AuthorDate: Wed Nov 13 15:04:16 2019 +0100
ARIES-1943 Changed TopologyManager importer logic to not assume all
referenced ImportRegistrations are 'open'. (#36)
* ARIES-1943 Changed TopologyManager importer logic to not assume all
referenced ImportRegistrations are 'open'.
In addition assigned functional thread names to the ExecutorServices used
by Importer and Exporter logic.
* Based threadName pattern on using class.
* Changed approach to naming threads, as discussed in the comments of PR
#36.
---
.../aries/rsa/topologymanager/Activator.java | 2 +-
.../rsa/topologymanager/NamedThreadFactory.java| 46 ++
.../importer/TopologyManagerImport.java| 34 +---
3 files changed, 75 insertions(+), 7 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
index 3ff832f..352a294 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
@@ -119,7 +119,7 @@ public class Activator implements BundleActivator {
public void doStart(final BundleContext bc, ExportPolicy policy) {
LOG.debug("TopologyManager: start()");
notifier = new EndpointListenerNotifier();
-exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS,
new LinkedBlockingQueue());
+exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS,
new LinkedBlockingQueue(), new
NamedThreadFactory(TopologyManagerExport.class));
exportManager = new TopologyManagerExport(notifier, exportExecutor,
policy);
epeListenerTracker = new EndpointEventListenerTracker(bc,
exportManager);
importManager = new TopologyManagerImport(bc);
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
new file mode 100644
index 000..724bede
--- /dev/null
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.rsa.topologymanager;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NamedThreadFactory implements ThreadFactory {
+/**
+ * Counter used when constructing unique Thread names
+ */
+private final AtomicInteger count = new AtomicInteger(0);
+/**
+ * Pattern used when constructing Thread names. This pattern must include
the sequence
+ * %d which will be used to replace with a Thread count.
+ */
+private final String namePattern;
+
+/**
+ * @param context Class name will be used to name threads created by this
ThreadFactory.
+ */
+public NamedThreadFactory(Class context) {
+this.namePattern = context.getSimpleName() + "-%d";
+}
+
+@Override
+public Thread newThread(Runnable r) {
+return new Thread(r, String.format(namePattern,
count.getAndIncrement()));
+}
+}
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index e28089b..1225a6e 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
[aries-rsa] branch master updated (8035bca -> 98d9f42)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from 8035bca Standardize license headers add 98d9f42 ARIES-1942 - Use annotation based bundle configs (#35) No new revisions were added by this update. Summary of changes: discovery/command/bnd.bnd | 22 -- discovery/command/pom.xml | 2 +- discovery/config/bnd.bnd | 21 -- discovery/config/pom.xml | 2 +- .../aries/rsa/discovery/config/Activator.java | 8 discovery/local/bnd.bnd| 9 +--- discovery/local/pom.xml| 3 +- .../aries/rsa/discovery/local/package-info.java| 24 --- discovery/zookeeper/bnd.bnd| 19 - discovery/zookeeper/pom.xml| 2 +- .../rsa/discovery/zookeeper/InterestManager.java | 29 ++--- .../client/ZookeeperEndpointListener.java | 12 +++--- .../client/ZookeeperEndpointRepository.java| 2 +- .../discovery/zookeeper/client/package-info.java | 10 ++--- .../rsa/discovery/zookeeper/package-info.java | 6 +-- .../discovery/zookeeper/InterestManagerTest.java | 5 +-- .../zookeeper/ZookeeperDiscoveryTest.java | 6 +-- eapub/bnd.bnd | 1 - eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml| 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml | 29 - examples/echotcp/api/pom.xml | 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml | 26 examples/echotcp/service/pom.xml | 2 +- .../rsa/itests/felix/rsa/TestRSAListener.java | 2 +- parent/pom.xml | 49 -- provider/fastbin/bnd.bnd | 5 +-- provider/fastbin/pom.xml | 2 +- .../aries/rsa/provider/fastbin/Activator.java | 9 provider/tcp/bnd.bnd | 4 -- provider/tcp/pom.xml | 2 +- .../apache/aries/rsa/provider/tcp/TCPProvider.java | 8 +++- rsa/bnd.bnd| 10 + rsa/pom.xml| 2 +- .../java/org/apache/aries/rsa/core/Activator.java | 9 spi/bnd.bnd| 20 - spi/pom.xml| 2 +- .../rsa/annotations/RSADiscoveryProvider.java | 12 ++ .../rsa/annotations/RSADistributionProvider.java | 12 ++ .../apache/aries/rsa/annotations/package-info.java | 9 ++-- .../org/apache/aries/rsa/spi/package-info.java | 9 ++-- .../main/java/org/apache/aries/rsa/spi/packageinfo | 19 - .../org/apache/aries/rsa/util/package-info.java| 9 ++-- .../java/org/apache/aries/rsa/util/packageinfo | 19 - topology-manager/bnd.bnd | 24 --- topology-manager/pom.xml | 2 +- .../aries/rsa/topologymanager/Activator.java | 21 ++ 50 files changed, 176 insertions(+), 336 deletions(-) delete mode 100644 discovery/command/bnd.bnd delete mode 100644 discovery/config/bnd.bnd copy provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/api/Dispatched.java => discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/package-info.java (68%) delete mode 100644 discovery/zookeeper/bnd.bnd copy examples/echotcp/api/src/main/java/org/apache/aries/rsa/examples/echotcp/api/EchoService.java => discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/package-info.java (84%) delete mode 100644 spi/bnd.bnd create mode 100644 spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java create mode 100644 spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java copy provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/myservice/DTOType.java => spi/src/main/java/org/apache/aries/rsa/annotations/package-info.java (86%) copy provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/myservice/DTOType.java => spi/src/main/java/org/apache/aries/rsa/spi/package-info.java (86%) delete mode 100644 spi/src/main/java/org/apache/aries/rsa/spi/packageinfo copy provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/myservice/DTOType.java => spi/src/main/java/org/apache/aries/rsa/util/package-info.java (86%) delete mode 100644
[aries-rsa] branch ARIES-1942 updated (e1bc7d4 -> fd72e6a)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch ARIES-1942 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from e1bc7d4 ARIES-1942 - Use custom annotations for discovery and distribution add 54c6972 Simplify MultiMap add 10348ce Made MultiMap key a generic type add 17a3898 Remove redundant semicolon add 85f26da Fix TopologyManagerImport concurrency add 8035bca Standardize license headers add fd72e6a Merge branch 'master' into ARIES-1942 No new revisions were added by this update. Summary of changes: .../aries/rsa/discovery/config/Activator.java | 1 - .../rsa/discovery/config/ConfigDiscovery.java | 1 - .../rsa/discovery/config/PropertyValidator.java| 1 - .../discovery/config/PropertyValidatorTest.java| 3 +- .../endpoint/EndpointDescriptionParserImpl.java| 2 +- .../rsa/discovery/endpoint/PropertiesMapper.java | 2 +- .../local/EndpointDescriptionBundleParser.java | 2 +- .../aries/rsa/discovery/local/LocalDiscovery.java | 2 +- .../endpoint/EndpointDescriptionParserTest.java| 2 +- .../discovery/endpoint/PropertiesMapperTest.java | 2 +- .../local/EndpointDescriptionBundleParserTest.java | 2 +- .../rsa/discovery/local/LocalDiscoveryTest.java| 2 +- .../aries/rsa/discovery/zookeeper/Interest.java| 4 +- .../rsa/discovery/zookeeper/InterestManager.java | 2 +- .../zookeeper/PublishingEndpointListener.java | 2 +- .../discovery/zookeeper/client/ClientManager.java | 2 +- .../client/ZookeeperEndpointListener.java | 2 +- .../client/ZookeeperEndpointRepository.java| 2 +- .../rsa/discovery/zookeeper/package-info.java | 2 +- .../zookeeper/server/MyQuorumPeerMain.java | 4 +- .../zookeeper/server/MyZooKeeperServerMain.java| 4 +- .../zookeeper/server/ZookeeperServer.java | 4 +- .../zookeeper/server/ZookeeperStarter.java | 2 +- .../discovery/zookeeper/InterestManagerTest.java | 2 +- .../zookeeper/PublishingEndpointListenerTest.java | 2 +- .../zookeeper/ZookeeperDiscoveryTest.java | 2 +- .../zookeeper/client/ClientManagerTest.java| 2 +- .../ZookeeperEndpointRepositoryPathTest.java | 2 +- .../zookeeper/server/ZookeeperStarterTest.java | 2 +- .../java/org/apache/aries/rsa/eapub/Activator.java | 2 +- .../apache/aries/rsa/eapub/EventAdminHelper.java | 2 +- .../aries/rsa/eapub/EventAdminHelperTest.java | 2 +- .../rsa/examples/fastbin/api/EchoService.java | 2 +- .../examples/fastbin/consumer/EchoConsumer.java| 2 +- .../examples/fastbin/service/EchoServiceImpl.java | 2 +- .../rsa/examples/echotcp/api/EchoService.java | 2 +- .../examples/echotcp/consumer/EchoConsumer.java| 2 +- .../examples/echotcp/service/EchoServiceImpl.java | 2 +- .../apache/aries/rsa/itests/felix/RsaTestBase.java | 3 +- .../rsa/itests/felix/ServerConfiguration.java | 3 +- .../rsa/itests/felix/TwoContainerPaxExam.java | 3 +- .../config/TestConfigDiscoveryRoundTrip.java | 5 +- .../itests/felix/fastbin/TestFastbinRoundTrip.java | 4 +- .../rsa/itests/felix/rsa/TestRSAListener.java | 5 +- .../rsa/itests/felix/tcp/TestDiscoveryExport.java | 2 +- .../rsa/itests/felix/tcp/TestDiscoveryImport.java | 4 +- .../aries/rsa/itests/felix/tcp/TestFindHook.java | 5 +- .../aries/rsa/itests/felix/tcp/TestRoundTrip.java | 5 +- .../aries/rsa/provider/fastbin/Activator.java | 2 +- .../aries/rsa/provider/fastbin/BaseActivator.java | 2 +- .../rsa/provider/fastbin/FastBinProvider.java | 2 +- .../rsa/provider/fastbin/api/AsyncCallback.java| 2 +- .../provider/fastbin/api/AsyncCallbackFuture.java | 2 +- .../aries/rsa/provider/fastbin/api/Dispatched.java | 2 +- .../fastbin/api/ObjectSerializationStrategy.java | 2 +- .../fastbin/api/ProtobufSerializationStrategy.java | 2 +- .../rsa/provider/fastbin/api/Serialization.java| 2 +- .../fastbin/api/SerializationStrategy.java | 2 +- .../rsa/provider/fastbin/io/ClientInvoker.java | 2 +- .../rsa/provider/fastbin/io/ProtocolCodec.java | 2 +- .../rsa/provider/fastbin/io/ServerInvoker.java | 2 +- .../aries/rsa/provider/fastbin/io/Service.java | 2 +- .../aries/rsa/provider/fastbin/io/Transport.java | 2 +- .../fastbin/io/TransportAcceptListener.java| 3 +- .../rsa/provider/fastbin/io/TransportListener.java | 2 +- .../rsa/provider/fastbin/io/TransportServer.java | 2 +- .../aries/rsa/provider/fastbin/streams/Chunk.java | 2 +- .../provider/fastbin/streams/InputStreamProxy.java | 2 +- .../fastbin/streams/OutputStreamProxy.java | 2 +- .../provider/fastbin/streams/StreamProvider.java | 2 +- .../fastbin/streams/StreamProviderImpl.java| 2 +- .../fastbin/tcp/AbstractInvocationStrategy.java| 2 +- .../fastbin/tcp/AsyncFutureInvocationStrategy.java |
[aries-rsa] branch ARIES-1942 updated (33b001d -> e1bc7d4)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch ARIES-1942
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git.
from 33b001d ARIES-1942 - Use annotation based bundle configs
add e1bc7d4 ARIES-1942 - Use custom annotations for discovery and
distribution
No new revisions were added by this update.
Summary of changes:
discovery/local/bnd.bnd| 5 -
.../aries/rsa/discovery/local/package-info.java| 24 ++
.../rsa/discovery/zookeeper/package-info.java | 6 +-
.../apache/aries/rsa/provider/tcp/TCPProvider.java | 7 ++-
.../rsa/annotations/RSADiscoveryProvider.java | 12 +++
.../rsa/annotations/RSADistributionProvider.java | 12 +++
.../aries/rsa/annotations}/package-info.java | 3 ++-
.../org/apache/aries/rsa/spi/package-info.java | 19 +
.../org/apache/aries/rsa/util/package-info.java| 19 +
9 files changed, 91 insertions(+), 16 deletions(-)
create mode 100644
spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java
create mode 100644
spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java
copy
{discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client
=> spi/src/main/java/org/apache/aries/rsa/annotations}/package-info.java (93%)
