You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/04/03 07:56:34 UTC
[2/2] aries-jax-rs-whiteboard git commit: Use another registry for
extensions
Use another registry for extensions
This way we take into account only the extensions that have been already
validated, that are gettable, and that are not shadowed by another
service without having to repeat the checks.
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/6653f53f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/6653f53f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/6653f53f
Branch: refs/heads/master
Commit: 6653f53fe5163c65b034c8450faa08490798629c
Parents: 90bedd6
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Apr 3 09:20:20 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Apr 3 09:20:20 2018 +0200
----------------------------------------------------------------------
.../whiteboard/internal/ExtensionRegistry.java | 172 +++++++++++++++++++
.../jax/rs/whiteboard/internal/Whiteboard.java | 11 +-
2 files changed, 181 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/6653f53f/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ExtensionRegistry.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ExtensionRegistry.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ExtensionRegistry.java
new file mode 100644
index 0000000..a9064a6
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ExtensionRegistry.java
@@ -0,0 +1,172 @@
+/*
+ * 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.jax.rs.whiteboard.internal;
+
+import org.apache.aries.osgi.functional.CachingServiceReference;
+import org.apache.aries.osgi.functional.OSGi;
+import org.apache.aries.osgi.functional.OSGiResult;
+import org.apache.aries.osgi.functional.Publisher;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.apache.aries.osgi.functional.OSGi.fromOsgiRunnable;
+
+public class ExtensionRegistry implements AutoCloseable {
+
+ public ExtensionRegistry() {
+ _extensionPublishers = new HashSet<>();
+ _registeredExtensions = new HashSet<>();
+ }
+
+ @Override
+ public void close() {
+ for (ExtensionPublisher extensionPublisher : _extensionPublishers) {
+ extensionPublisher.close();
+ }
+ }
+
+ public OSGi<CachingServiceReference<?>> waitForExtension(
+ String extensionFilter) {
+
+ Filter filter;
+
+ try {
+ filter = FrameworkUtil.createFilter(extensionFilter);
+ }
+ catch (InvalidSyntaxException e) {
+ throw new RuntimeException();
+ }
+
+ return fromOsgiRunnable((bc, p) -> {
+ synchronized (ExtensionRegistry.this) {
+ ExtensionPublisher ep = new ExtensionPublisher(p, filter);
+
+ _extensionPublishers.add(ep);
+
+ for (CachingServiceReference<?> extension :
+ _registeredExtensions) {
+
+ ep.enable(extension);
+ }
+
+ return () -> {
+ synchronized (ExtensionRegistry.this) {
+ _extensionPublishers.remove(ep);
+
+ for (CachingServiceReference<?> extension :
+ _registeredExtensions) {
+
+ ep.disable(extension);
+ }
+ }
+ };
+ }
+
+ });
+ }
+
+ public void registerExtension(
+ CachingServiceReference<?> extension) {
+
+ synchronized (ExtensionRegistry.this) {
+ for (ExtensionPublisher publisher : _extensionPublishers) {
+ publisher.enable(extension);
+ }
+
+ _registeredExtensions.add(extension);
+ }
+ }
+
+ public void unregisterExtension(
+ CachingServiceReference<?> extension) {
+
+ synchronized (ExtensionRegistry.this) {
+ for (ExtensionPublisher publisher : _extensionPublishers) {
+ publisher.disable(extension);
+ }
+
+ _registeredExtensions.remove(extension);
+ }
+ }
+
+ private final HashSet<ExtensionPublisher> _extensionPublishers;
+ private final HashSet<CachingServiceReference<?>> _registeredExtensions;
+
+ private static class ExtensionPublisher implements AutoCloseable {
+
+ public ExtensionPublisher(
+ Publisher<? super CachingServiceReference<?>> publisher,
+ Filter filter) {
+
+ _publisher = publisher;
+ _filter = filter;
+ }
+
+ public void close() {
+ if (_closed.compareAndSet(false, true)) {
+ if (_enabled.compareAndSet(false, true)) {
+ if (_result != null) {
+ _result.close();
+ }
+ }
+ }
+ }
+
+
+ public void enable(CachingServiceReference<?> serviceReference) {
+ if (_closed.get()) {
+ return;
+ }
+ if (_filter.match(serviceReference.getServiceReference())) {
+
+ if (_enabled.compareAndSet(false, true)) {
+ _result = _publisher.publish(serviceReference);
+ }
+ }
+ }
+
+ public void disable(CachingServiceReference<?> serviceReference) {
+ if (_closed.get()) {
+ return;
+ }
+ if (_filter.match(serviceReference.getServiceReference())) {
+ if (_enabled.compareAndSet(true, false)) {
+ if (_result != null) {
+ _result.close();
+ }
+
+ _result = null;
+ }
+ }
+ }
+
+ private Publisher<? super CachingServiceReference<?>> _publisher;
+ private Filter _filter;
+ private AtomicBoolean _enabled = new AtomicBoolean(false);
+ private AtomicBoolean _closed = new AtomicBoolean(false);
+ private OSGiResult _result;
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/6653f53f/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index a73e002..82d5ad9 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -137,6 +137,7 @@ public class Whiteboard {
private static final Logger _log = LoggerFactory.getLogger(
Whiteboard.class);
private final ApplicationExtensionRegistry _applicationExtensionRegistry;
+ private final ExtensionRegistry _extensionRegistry;
private final AriesJaxrsServiceRuntime _runtime;
private final Map<String, ?> _configurationMap;
@@ -160,6 +161,7 @@ public class Whiteboard {
_runtimeReference = _runtimeRegistration.getReference();
_counter = new ServiceRegistrationChangeCounter(_runtimeRegistration);
_applicationExtensionRegistry = new ApplicationExtensionRegistry();
+ _extensionRegistry = new ExtensionRegistry();
_program =
all(
@@ -180,9 +182,9 @@ public class Whiteboard {
public void stop() {
_osgiResult.close();
-
_runtimeRegistration.unregister();
_applicationExtensionRegistry.close();
+ _extensionRegistry.close();
}
public void addHttpEndpoints(List<String> endpoints) {
@@ -205,6 +207,9 @@ public class Whiteboard {
_runtime::removeInvalidExtension),
_runtime::addInvalidExtension,
_runtime::removeInvalidExtension).
+ effects(
+ _extensionRegistry::registerExtension,
+ _extensionRegistry::unregisterExtension).
flatMap(extensionReference ->
chooseApplication(
extensionReference, allApplicationReferences(),
@@ -922,7 +927,9 @@ public class Whiteboard {
}
program =
- once(getApplicationExtensionsForWhiteboard()).
+ once(
+ _extensionRegistry.waitForExtension(
+ extensionDependency)).
flatMap(
sr -> {
Object applicationSelectProperty =