Source formatting
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/9ca1d216 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/9ca1d216 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/9ca1d216 Branch: refs/heads/master Commit: 9ca1d216f981a5b900d4a26fc90bbfec77ad1863 Parents: 5dfa929 Author: Carlos Sierra <csie...@apache.org> Authored: Fri Mar 23 16:28:48 2018 +0100 Committer: Carlos Sierra <csie...@apache.org> Committed: Fri Mar 23 17:20:20 2018 +0100 ---------------------------------------------------------------------- .../jax/rs/whiteboard/internal/Whiteboard.java | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/9ca1d216/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 dc0003d..1599582 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 @@ -477,7 +477,8 @@ public class Whiteboard { _runtime.setApplicationForPath( getApplicationBase( at.getCachingServiceReference()::getProperty), - at.getCachingServiceReference(), registrator), + at.getCachingServiceReference(), + registrator), registrator -> _runtime.unsetApplicationForPath( getApplicationBase( @@ -737,9 +738,6 @@ public class Whiteboard { CachingServiceReference<CxfJaxrsServiceRegistrator> registratorReference) { - String applicationName = getServiceName( - registratorReference::getProperty); - Bundle originalBundle = _bundleContext.getBundle( (long)registratorReference.getProperty( "original.service.bundleid")); @@ -809,7 +807,8 @@ public class Whiteboard { private OSGi<?> safeRegisterExtension( CachingServiceReference<?> serviceReference, - CachingServiceReference<CxfJaxrsServiceRegistrator> registratorReference) { + CachingServiceReference<CxfJaxrsServiceRegistrator> + registratorReference) { Bundle originalBundle = _bundleContext.getBundle( (long)registratorReference.getProperty( @@ -864,8 +863,8 @@ public class Whiteboard { serviceReference.getServiceReference() + " into application " + getServiceName( - registratorReference. - getServiceReference()::getProperty) + registratorReference.getServiceReference() + ::getProperty) ), ifDebugEnabled( _log, @@ -1131,10 +1130,11 @@ public class Whiteboard { return cxfNonSpringServlet; } - private static OSGi<CachingServiceReference<Object>> onlySupportedInterfaces( - OSGi<CachingServiceReference<Object>> program, - Consumer<CachingServiceReference<?>> onInvalidAdded, - Consumer<CachingServiceReference<?>> onInvalidRemoved) { + private static OSGi<CachingServiceReference<Object>> + onlySupportedInterfaces( + OSGi<CachingServiceReference<Object>> program, + Consumer<CachingServiceReference<?>> onInvalidAdded, + Consumer<CachingServiceReference<?>> onInvalidRemoved) { return program.flatMap(sr -> { if (signalsValidInterface(sr)) { @@ -1358,7 +1358,9 @@ public class Whiteboard { return contextPath + applicationBase; } - public CachingServiceReference<ServletContextHelper> getContextReference() { + public CachingServiceReference<ServletContextHelper> + getContextReference() { + return _contextReference; }
