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/06/08 09:18:21 UTC
[1/5] aries-jax-rs-whiteboard git commit: Once filter should be
applied after application filter
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 63ab1d3c7 -> 2eddd9158
Once filter should be applied after application filter
it was incorrectly being applied before.
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/c975cb84
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c975cb84
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c975cb84
Branch: refs/heads/master
Commit: c975cb848918bd7ac240d95a30f199505e42957f
Parents: 63ab1d3
Author: Carlos Sierra <cs...@apache.org>
Authored: Thu Jun 7 20:22:38 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Thu Jun 7 20:22:38 2018 +0200
----------------------------------------------------------------------
.../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c975cb84/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 3f56548..4c84fab 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
@@ -952,7 +952,7 @@ public class Whiteboard {
program =
once(
_extensionRegistry.waitForExtension(
- extensionDependency)).
+ extensionDependency).
flatMap(
sr -> {
Object applicationSelectProperty =
@@ -980,7 +980,7 @@ public class Whiteboard {
return nothing();
}
- ).effects(
+ )).effects(
__ -> {},
__ -> _runtime.addDependentApplication(
reference)
[3/5] aries-jax-rs-whiteboard git commit: Simplify
Posted by cs...@apache.org.
Simplify
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/b14c1764
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/b14c1764
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/b14c1764
Branch: refs/heads/master
Commit: b14c1764f596b26d1969b5d0242b3b91cc7c7e4d
Parents: fc6e993
Author: Carlos Sierra <cs...@apache.org>
Authored: Thu Jun 7 23:38:35 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Thu Jun 7 23:38:35 2018 +0200
----------------------------------------------------------------------
.../apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/b14c1764/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 f45b6f3..9827b64 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
@@ -1024,10 +1024,7 @@ public class Whiteboard {
OSGi<CachingServiceReference<?>> program = just(reference);
- if (extensionDependencies.length > 0) {
- onAddingDependent.accept(reference);
- }
- else {
+ if (extensionDependencies.length == 0) {
return program;
}
@@ -1079,7 +1076,7 @@ public class Whiteboard {
}
program = effects(
- () -> {},
+ () -> onAddingDependent.accept(reference),
() -> onRemovingDependent.accept(reference)).
then(program);
[5/5] aries-jax-rs-whiteboard git commit: Deduplicate
Posted by cs...@apache.org.
Deduplicate
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/2eddd915
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/2eddd915
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/2eddd915
Branch: refs/heads/master
Commit: 2eddd9158764f026abcc324d2f77838aec110dfc
Parents: 67098f1
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Jun 8 11:17:22 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Jun 8 11:17:22 2018 +0200
----------------------------------------------------------------------
.../aries/jax/rs/whiteboard/internal/AriesJaxrsServiceRuntime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2eddd915/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxrsServiceRuntime.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxrsServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxrsServiceRuntime.java
index a70bef3..099d49c 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxrsServiceRuntime.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxrsServiceRuntime.java
@@ -790,7 +790,7 @@ public class AriesJaxrsServiceRuntime implements JaxrsServiceRuntime {
return (__, collection) -> {
if (collection == null) {
- collection = new ArrayList<>();
+ collection = new HashSet<>();
}
collection.add(t);
[4/5] aries-jax-rs-whiteboard git commit: Don't cycle when there is
more than one candidate
Posted by cs...@apache.org.
Don't cycle when there is more than one candidate
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/67098f15
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/67098f15
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/67098f15
Branch: refs/heads/master
Commit: 67098f15f1fc782b9441a5d5d2e363058844c5da
Parents: b14c176
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Jun 8 11:17:00 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Jun 8 11:17:00 2018 +0200
----------------------------------------------------------------------
.../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/67098f15/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 9827b64..46604e8 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
@@ -1051,11 +1051,11 @@ public class Whiteboard {
}
program =
- _applicationExtensionRegistry.waitForApplicationExtension(
+ once(_applicationExtensionRegistry.waitForApplicationExtension(
applicationName, extensionDependency).effects(
__ -> {},
__ -> onAddingDependent.accept(reference)
- ).
+ )).
effects(
ifDebugEnabled(
_log,
[2/5] aries-jax-rs-whiteboard git commit: This need to be symmetric
Posted by cs...@apache.org.
This need to be symmetric
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/fc6e9935
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/fc6e9935
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/fc6e9935
Branch: refs/heads/master
Commit: fc6e99358ecedc37051f8a73bf0a8b9d095cb01f
Parents: c975cb8
Author: Carlos Sierra <cs...@apache.org>
Authored: Thu Jun 7 23:38:13 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Thu Jun 7 23:38:13 2018 +0200
----------------------------------------------------------------------
.../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fc6e9935/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 4c84fab..f45b6f3 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
@@ -1123,7 +1123,10 @@ public class Whiteboard {
serviceReferences(
CxfJaxrsServiceRegistrator.class,
applicationSelectProperty.toString()).
- effects(__ -> onResolved.accept(serviceReference), __ -> {}));
+ effects(
+ __ -> onResolved.accept(serviceReference),
+ __ -> onWaiting.accept(serviceReference))
+ );
}
private static <T> OSGi<T> countChanges(