You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gn...@apache.org on 2017/09/28 09:14:39 UTC
[cxf] branch master updated: [CXF-7519] The
cxf-rt-transports-http-jetty should not rely on the old blueprint
compatibility bundle
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 3c171d7 [CXF-7519] The cxf-rt-transports-http-jetty should not rely on the old blueprint compatibility bundle
3c171d7 is described below
commit 3c171d7a4cd1e2c77e0a0081ddf54e6549d3383f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Sep 27 18:05:18 2017 +0200
[CXF-7519] The cxf-rt-transports-http-jetty should not rely on the old blueprint compatibility bundle
---
.../blueprint/JettyServerEngineFactoryParser.java | 23 ++++++++++++----------
.../UndertowServerEngineFactoryParser.java | 14 ++++++-------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
index e69751c..8c09cae 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.transport.http_jetty.blueprint;
-import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.UUID;
@@ -27,14 +26,12 @@ import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
-import org.apache.aries.blueprint.reflect.MapEntryImpl;
-import org.apache.aries.blueprint.reflect.MapMetadataImpl;
+import org.apache.aries.blueprint.mutable.MutableMapMetadata;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
-import org.osgi.service.blueprint.reflect.MapEntry;
import org.osgi.service.blueprint.reflect.Metadata;
import org.osgi.service.blueprint.reflect.ValueMetadata;
@@ -93,7 +90,10 @@ public class JettyServerEngineFactoryParser extends AbstractBPBeanDefinitionPars
protected Metadata parseEngineConnector(List<Element> engines, ComponentMetadata enclosingComponent,
ParserContext context) {
- List<MapEntry> entries = new ArrayList<>();
+ MutableMapMetadata map = context.createMetadata(MutableMapMetadata.class);
+ map.setKeyType("java.lang.String");
+ map.setValueType("org.eclipse.jetty.server.Connector");
+
for (Element engine : engines) {
String port = engine.getAttribute("port");
ValueMetadata keyValue = createValue(context, port);
@@ -103,16 +103,19 @@ public class JettyServerEngineFactoryParser extends AbstractBPBeanDefinitionPars
if (connector != null) {
Element first = DOMUtils.getFirstElement(connector);
Metadata valValue = context.parseElement(Metadata.class, enclosingComponent, first);
- entries.add(new MapEntryImpl(keyValue, valValue));
+ map.addEntry(keyValue, valValue);
}
}
- return new MapMetadataImpl("java.lang.String", "org.eclipse.jetty.server.Connector", entries);
+ return map;
}
protected Metadata parseEngineHandlers(List<Element> engines, ComponentMetadata enclosingComponent,
ParserContext context) {
- List<MapEntry> entries = new ArrayList<>();
+ MutableMapMetadata map = context.createMetadata(MutableMapMetadata.class);
+ map.setKeyType("java.lang.String");
+ map.setValueType("java.util.List");
+
for (Element engine : engines) {
String port = engine.getAttribute("port");
ValueMetadata keyValue = createValue(context, port);
@@ -121,10 +124,10 @@ public class JettyServerEngineFactoryParser extends AbstractBPBeanDefinitionPars
"handlers");
if (handlers != null) {
Metadata valValue = parseListData(context, enclosingComponent, handlers);
- entries.add(new MapEntryImpl(keyValue, valValue));
+ map.addEntry(keyValue, valValue);
}
}
- return new MapMetadataImpl("java.lang.String", "java.util.List", entries);
+ return map;
}
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
index 9d553ee..22d1ccd 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowServerEngineFactoryParser.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.transport.http_undertow.blueprint;
-import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.UUID;
@@ -27,14 +26,12 @@ import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
-import org.apache.aries.blueprint.reflect.MapEntryImpl;
-import org.apache.aries.blueprint.reflect.MapMetadataImpl;
+import org.apache.aries.blueprint.mutable.MutableMapMetadata;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
-import org.osgi.service.blueprint.reflect.MapEntry;
import org.osgi.service.blueprint.reflect.Metadata;
import org.osgi.service.blueprint.reflect.ValueMetadata;
@@ -93,7 +90,10 @@ public class UndertowServerEngineFactoryParser extends AbstractBPBeanDefinitionP
protected Metadata parseEngineHandlers(List<Element> engines, ComponentMetadata enclosingComponent,
ParserContext context) {
- List<MapEntry> entries = new ArrayList<>();
+ MutableMapMetadata map = context.createMetadata(MutableMapMetadata.class);
+ map.setKeyType("java.lang.String");
+ map.setValueType("java.util.List");
+
for (Element engine : engines) {
String port = engine.getAttribute("port");
ValueMetadata keyValue = createValue(context, port);
@@ -102,10 +102,10 @@ public class UndertowServerEngineFactoryParser extends AbstractBPBeanDefinitionP
"handlers");
if (handlers != null) {
Metadata valValue = parseListData(context, enclosingComponent, handlers);
- entries.add(new MapEntryImpl(keyValue, valValue));
+ map.addEntry(keyValue, valValue);
}
}
- return new MapMetadataImpl("java.lang.String", "java.util.List", entries);
+ return map;
}
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].