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:33 UTC
[1/2] aries-jax-rs-whiteboard git commit: Do not publish
ApplicationExtensionRegistration
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master e1b463889 -> 6653f53fe
Do not publish ApplicationExtensionRegistration
Use a small internal registry to keep track of the association.
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/90bedd62
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/90bedd62
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/90bedd62
Branch: refs/heads/master
Commit: 90bedd62c9497db1779bf686bf939ab7b958c0c5
Parents: e1b4638
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Apr 2 18:03:32 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Apr 3 09:19:53 2018 +0200
----------------------------------------------------------------------
.../internal/ApplicationExtensionRegistry.java | 231 +++++++++++++++++++
.../jax/rs/whiteboard/internal/Whiteboard.java | 65 ++----
.../utils/ApplicationExtensionRegistration.java | 20 --
3 files changed, 250 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/90bedd62/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationExtensionRegistry.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationExtensionRegistry.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationExtensionRegistry.java
new file mode 100644
index 0000000..ffa1a5c
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationExtensionRegistry.java
@@ -0,0 +1,231 @@
+/*
+ * 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 ApplicationExtensionRegistry implements AutoCloseable {
+
+ public ApplicationExtensionRegistry() {
+ _applicationPublishers = new HashMap<>();
+ _applicationRegisteredExtensions = new HashMap<>();
+ }
+
+ public void close() {
+ _applicationPublishers.forEach(
+ (__, aeps) -> aeps.forEach(ApplicationExtensionPublisher::close)
+ );
+ }
+
+ public OSGi<CachingServiceReference<?>> waitForApplicationExtension(
+ String applicationName, String extensionFilter) {
+
+ Filter filter;
+
+ try {
+ filter = FrameworkUtil.createFilter(extensionFilter);
+ }
+ catch (InvalidSyntaxException e) {
+ throw new RuntimeException();
+ }
+
+ return fromOsgiRunnable((bc, p) -> {
+ synchronized (ApplicationExtensionRegistry.this) {
+ ApplicationExtensionPublisher aep =
+ new ApplicationExtensionPublisher(p, filter);
+
+ _applicationPublishers.compute(
+ applicationName,
+ (__, set) -> {
+ if (set == null) {
+ set = new HashSet<>();
+ }
+
+ set.add(aep);
+
+ return set;
+ });
+
+ Collection<CachingServiceReference<?>> extensions =
+ _applicationRegisteredExtensions.get(applicationName);
+
+ if (extensions != null) {
+ for (CachingServiceReference<?> extension : extensions) {
+ aep.enable(extension);
+ }
+ }
+
+ return () -> {
+ synchronized (ApplicationExtensionRegistry.this) {
+ Collection<ApplicationExtensionPublisher> set =
+ _applicationPublishers.get(applicationName);
+
+ set.remove(aep);
+
+ if (extensions != null) {
+ for (CachingServiceReference<?> extension :
+ extensions) {
+
+ aep.disable(extension);
+ }
+ }
+ }
+ };
+ }
+
+ });
+ }
+
+ public void registerExtensionInApplication(
+ String applicationName, CachingServiceReference<?> extension) {
+
+ synchronized (ApplicationExtensionRegistry.this) {
+ Collection<ApplicationExtensionPublisher> publishers =
+ _applicationPublishers.get(applicationName);
+
+ if (publishers != null) {
+ for (ApplicationExtensionPublisher publisher : publishers) {
+ publisher.enable(extension);
+ }
+ }
+
+ _applicationRegisteredExtensions.compute(
+ applicationName,
+ (__, set) -> {
+ if (set == null) {
+ set = new HashSet<>();
+ }
+
+ set.add(extension);
+
+ return set;
+ }
+ );
+ }
+ }
+
+ public void unregisterExtensionInApplication(
+ String applicationName, CachingServiceReference<?> extension) {
+
+ synchronized (ApplicationExtensionRegistry.this) {
+ Collection<ApplicationExtensionPublisher> publishers =
+ _applicationPublishers.get(applicationName);
+
+ if (publishers != null) {
+ for (ApplicationExtensionPublisher publisher : publishers) {
+ publisher.disable(extension);
+ }
+ }
+
+ _applicationRegisteredExtensions.compute(
+ applicationName,
+ (__, set) -> {
+ if (set == null) {
+ set = new HashSet<>();
+ }
+
+ set.remove(extension);
+
+ return set;
+ }
+ );
+ }
+ }
+
+ private final HashMap
+ <String, Collection<ApplicationExtensionPublisher>>
+ _applicationPublishers;
+ private final HashMap<String, Collection<CachingServiceReference<?>>>
+ _applicationRegisteredExtensions;
+
+ private static class ApplicationExtensionPublisher
+ implements AutoCloseable {
+
+ public ApplicationExtensionPublisher(
+ Publisher<? super CachingServiceReference<?>> publisher,
+ Filter filter) {
+
+ _publisher = publisher;
+ _filter = filter;
+ }
+
+ public void close() {
+ if (_closed.compareAndSet(false, true)) {
+ if (_enabled.compareAndSet(true, false)) {
+ if (_result != null) {
+ _result.close();
+ }
+
+ _result = null;
+ }
+ }
+
+ }
+
+
+ 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/90bedd62/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 2b1e77d..a73e002 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
@@ -19,7 +19,6 @@ package org.apache.aries.jax.rs.whiteboard.internal;
import org.apache.aries.jax.rs.whiteboard.internal.cxf.CxfJaxrsServiceRegistrator;
import org.apache.aries.jax.rs.whiteboard.internal.utils.Utils;
-import org.apache.aries.jax.rs.whiteboard.internal.utils.ApplicationExtensionRegistration;
import org.apache.aries.jax.rs.whiteboard.internal.utils.PropertyHolder;
import org.apache.aries.jax.rs.whiteboard.internal.utils.ServiceTuple;
import org.apache.aries.osgi.functional.CachingServiceReference;
@@ -137,6 +136,7 @@ public class Whiteboard {
private static final Logger _log = LoggerFactory.getLogger(
Whiteboard.class);
+ private final ApplicationExtensionRegistry _applicationExtensionRegistry;
private final AriesJaxrsServiceRuntime _runtime;
private final Map<String, ?> _configurationMap;
@@ -159,6 +159,8 @@ public class Whiteboard {
new HashMap<>(_configurationMap));
_runtimeReference = _runtimeRegistration.getReference();
_counter = new ServiceRegistrationChangeCounter(_runtimeRegistration);
+ _applicationExtensionRegistry = new ApplicationExtensionRegistry();
+
_program =
all(
ignore(registerDefaultApplication()),
@@ -180,6 +182,7 @@ public class Whiteboard {
_osgiResult.close();
_runtimeRegistration.unregister();
+ _applicationExtensionRegistry.close();
}
public void addHttpEndpoints(List<String> endpoints) {
@@ -660,7 +663,7 @@ public class Whiteboard {
private OSGi<CachingServiceReference<Object>>
getApplicationExtensionsForWhiteboard() {
- return serviceReferences(_applicationExtensionsFilter.toString()).
+ return serviceReferences(_extensionsFilter.toString()).
filter(new TargetFilter<>(_runtimeReference));
}
@@ -876,23 +879,16 @@ public class Whiteboard {
)
).
- then(
- register(
- ApplicationExtensionRegistration.class,
- () -> new ApplicationExtensionRegistration(){},
- () -> {
- Map<String, Object> properties = getProperties(
- serviceReference);
-
- properties.put(
- "original.application.name", applicationName);
- properties.put(
- "original.objectClass",
- serviceReference.getProperty("objectClass"));
-
- return properties;
- }
- ))));
+ effects(
+ __ ->
+ _applicationExtensionRegistry.
+ registerExtensionInApplication(
+ applicationName, serviceReference),
+ __ ->
+ _applicationExtensionRegistry.
+ unregisterExtensionInApplication(
+ applicationName, serviceReference)
+ )));
}
@@ -925,13 +921,8 @@ public class Whiteboard {
reference, extensionDependency);
}
- String finalExtensionDependency = String.format(
- "(&(!(objectClass=%s))%s)",
- ApplicationExtensionRegistration.class.getName(),
- extensionDependency);
-
program =
- once(serviceReferences(finalExtensionDependency)).
+ once(getApplicationExtensionsForWhiteboard()).
flatMap(
sr -> {
Object applicationSelectProperty =
@@ -1033,17 +1024,8 @@ public class Whiteboard {
}
program =
- once(serviceReferences(
- ApplicationExtensionRegistration.class).
- filter(
- sr -> sr.getProperty("original.application.name").
- equals(applicationName)
- ).map(
- CachingServiceReference::getServiceReference
- ).filter(
- extensionFilter::match
- )
- ).effects(
+ _applicationExtensionRegistry.waitForApplicationExtension(
+ applicationName, extensionDependency).effects(
__ -> {},
__ -> onAddingDependent.accept(reference)
).
@@ -1292,23 +1274,14 @@ public class Whiteboard {
private static Filter _applicationsFilter;
- private static Filter _applicationExtensionsFilter;
-
static {
try {
_applicationsFilter = FrameworkUtil.createFilter(
format(
"(&(objectClass=%s)(%s=*))", Application.class.getName(),
JAX_RS_APPLICATION_BASE));
- String extensionFilterString = format(
- "(%s=true)", JAX_RS_EXTENSION);
_extensionsFilter = FrameworkUtil.createFilter(
- extensionFilterString);
- _applicationExtensionsFilter = FrameworkUtil.createFilter(
- format(
- "(&(!(objectClass=%s))(%s=%s)%s)",
- ApplicationExtensionRegistration.class.getName(),
- JAX_RS_EXTENSION, true, extensionFilterString));
+ format("(%s=true)", JAX_RS_EXTENSION));
_resourcesFilter = FrameworkUtil.createFilter(
format("(%s=true)", JAX_RS_RESOURCE));
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/90bedd62/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/utils/ApplicationExtensionRegistration.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/utils/ApplicationExtensionRegistration.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/utils/ApplicationExtensionRegistration.java
deleted file mode 100644
index 3a5cec5..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/utils/ApplicationExtensionRegistration.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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.utils;
-
-public interface ApplicationExtensionRegistration {}
[2/2] aries-jax-rs-whiteboard git commit: Use another registry for
extensions
Posted by cs...@apache.org.
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 =