[CXF-7010] Making setting a version for OSGI optional, trying to get a default bus in the formatted service list handler if the bus is null
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/557f3b9e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/557f3b9e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/557f3b9e Branch: refs/heads/master-jaxrs-2.1 Commit: 557f3b9e880ea8025ab11b1a4cc519103ca4ec70 Parents: 276017a Author: Sergey Beryozkin <[email protected]> Authored: Mon Aug 15 23:06:31 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Aug 15 23:06:31 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java | 7 ++++++- .../servlet/servicelist/FormattedServiceListWriter.java | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/557f3b9e/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java index 4435a87..f52b991 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java @@ -39,7 +39,12 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver { } for (Bundle b : bundle.getBundleContext().getBundles()) { String location = b.getLocation(); - if (location.equals(LOCATION + swaggerUiVersion)) { + if (swaggerUiVersion != null) { + if (location.equals(LOCATION + swaggerUiVersion)) { + return getSwaggerUiRoot(b, swaggerUiVersion); + } + } else if (location.startsWith(LOCATION)) { + swaggerUiVersion = location.substring(LOCATION.length()); return getSwaggerUiRoot(b, swaggerUiVersion); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/557f3b9e/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java index 0c25519..ae9a4d4 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java @@ -24,6 +24,7 @@ import java.net.URI; import java.util.Map; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.service.model.OperationInfo; @@ -44,8 +45,12 @@ public class FormattedServiceListWriter implements ServiceListWriter { this.title = title; this.showForeignContexts = showForeignContexts; this.bus = bus; - if (bus != null) { - this.atomMap = CastUtils.cast((Map<?, ?>)bus.getProperty("org.apache.cxf.extensions.logging.atom.pull")); + if (this.bus == null) { + this.bus = BusFactory.getDefaultBus(false); + } + if (this.bus != null) { + this.atomMap = + CastUtils.cast((Map<?, ?>)this.bus.getProperty("org.apache.cxf.extensions.logging.atom.pull")); } }
