Source cleaning
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/35d81169 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/35d81169 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/35d81169 Branch: refs/heads/master Commit: 35d811698d5fc4327f5074d5a10403337f9f0820 Parents: 5febd14 Author: Carlos Sierra <csie...@apache.org> Authored: Mon May 14 09:32:33 2018 +0200 Committer: Carlos Sierra <csie...@apache.org> Committed: Mon May 14 09:32:33 2018 +0200 ---------------------------------------------------------------------- .../whiteboard/activator/CxfJaxrsBundleActivator.java | 5 +++-- .../aries/jax/rs/whiteboard/internal/Whiteboard.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/35d81169/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java index 98d699d..24aa9a9 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java @@ -19,6 +19,8 @@ package org.apache.aries.jax.rs.whiteboard.activator; import java.util.Arrays; import java.util.Dictionary; +import java.util.HashMap; +import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -165,8 +167,7 @@ public class CxfJaxrsBundleActivator implements BundleActivator { }); } - private static String endpointFilter(PropertyHolder configuration ) { - + private static String endpointFilter(PropertyHolder configuration) { Object whiteBoardTargetProperty = configuration.get( HTTP_WHITEBOARD_TARGET); http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/35d81169/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 8d084ce..10b0167 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 @@ -600,9 +600,12 @@ public class Whiteboard { createRegistrator(extensions, tuple, properties). flatMap(registrator -> registerCXFServletService( - registrator.getBus(), properties, contextReference).then( + registrator.getBus(), properties, contextReference). + then( register( - CxfJaxrsServiceRegistrator.class, () -> registrator, properties).then( + CxfJaxrsServiceRegistrator.class, + () -> registrator, properties). + then( just(registrator) )))); } @@ -715,7 +718,9 @@ public class Whiteboard { Object defaultApplicationBase = _configurationMap.get( "default.application.base"); - if (defaultApplicationBase == null || !(defaultApplicationBase instanceof String)) { + if (defaultApplicationBase == null || + !(defaultApplicationBase instanceof String)) { + defaultApplicationBase = "/"; } @@ -726,7 +731,8 @@ public class Whiteboard { properties.put("service.ranking", Integer.MIN_VALUE); properties.put( JAX_RS_WHITEBOARD_TARGET, - "(" + SERVICE_PID + "=" + _configurationMap.get(SERVICE_PID) + ")"); + "(" + SERVICE_PID + "=" + _configurationMap.get(SERVICE_PID) + + ")"); return properties; });
