You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:49 UTC
[44/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
index 0260445..3220ad2 100644
--- a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
@@ -34,31 +34,31 @@ import java.util.StringTokenizer;
*
*/
public final class UrlUtils {
-
+
private static final int RADIX = 16;
private static final byte ESCAPE_CHAR = '%';
private static final byte PLUS_CHAR = '+';
-
+
private UrlUtils() {
-
+
}
public static String urlEncode(String value) {
-
+
return urlEncode(value, StandardCharsets.UTF_8.name());
}
-
+
public static String urlEncode(String value, String enc) {
-
+
try {
value = URLEncoder.encode(value, enc);
} catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex);
}
-
+
return value;
}
-
+
/**
* Decodes using URLDecoder - use when queries or form post values are decoded
* @param value value to decode
@@ -69,7 +69,7 @@ public final class UrlUtils {
}
private static String urlDecode(String value, String enc, boolean isPath) {
-
+
boolean needDecode = false;
int escapesCount = 0;
int i = 0;
@@ -120,11 +120,11 @@ public final class UrlUtils {
return i;
}
-
+
public static String urlDecode(String value) {
return urlDecode(value, StandardCharsets.UTF_8.name());
}
-
+
/**
* URL path segments may contain '+' symbols which should not be decoded into ' '
* This method replaces '+' with %2B and delegates to URLDecoder
@@ -133,8 +133,8 @@ public final class UrlUtils {
public static String pathDecode(String value) {
return urlDecode(value, StandardCharsets.UTF_8.name(), true);
}
-
-
+
+
/**
* Create a map from String to String that represents the contents of the query
* portion of a URL. For each x=y, x is the key and y is the value.
@@ -156,11 +156,11 @@ public final class UrlUtils {
}
return ht;
}
-
+
/**
* Return everything in the path up to the last slash in a URI.
* @param baseURI
- * @return the trailing
+ * @return the trailing
*/
public static String getStem(String baseURI) {
int idx = baseURI.lastIndexOf('/');
@@ -170,6 +170,6 @@ public final class UrlUtils {
}
return result;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
index bebea75..ba3c4ad 100644
--- a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
@@ -33,14 +33,14 @@ import java.util.Set;
* Implements a combination of WeakHashMap and IdentityHashMap.
* Useful for caches that need to key off of a == comparison
* instead of a .equals.
- *
+ *
* <b>
* This class is not a general-purpose Map implementation! While
* this class implements the Map interface, it intentionally violates
* Map's general contract, which mandates the use of the equals method
* when comparing objects. This class is designed for use only in the
* rare cases wherein reference-equality semantics are required.
- *
+ *
* Note that this implementation is not synchronized.
* </b>
*/
@@ -150,7 +150,7 @@ public class WeakIdentityHashMap<K, V> implements Map<K, V> {
class IdentityWeakReference extends WeakReference<K> {
int hash;
-
+
@SuppressWarnings("unchecked")
IdentityWeakReference(Object obj) {
super((K)obj, queue);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
index f9acb2b..28928d7 100644
--- a/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
@@ -31,7 +31,7 @@ public final class XmlSchemaPrimitiveUtils {
}
private XmlSchemaPrimitiveUtils() {
}
-
+
private static void initializeMap() {
registerPrimitiveClasses("int", Integer.class, int.class);
registerPrimitiveClasses("byte", Byte.class, byte.class);
@@ -40,28 +40,28 @@ public final class XmlSchemaPrimitiveUtils {
registerPrimitiveClasses("float", Float.class, float.class);
registerPrimitiveClasses("double", Double.class, double.class);
registerPrimitiveClasses("string", String.class);
-
- registerPrimitiveClasses("dateTime", java.sql.Date.class,
- java.util.Date.class,
+
+ registerPrimitiveClasses("dateTime", java.sql.Date.class,
+ java.util.Date.class,
Calendar.class,
java.sql.Timestamp.class);
registerPrimitiveClasses("time", java.sql.Time.class);
// add more as needed
}
-
+
private static void registerPrimitiveClasses(String value, Class<?> ... classes) {
for (Class<?> cls : classes) {
XML_SCHEMA_PRIMITIVE_MAP.put(cls, value);
}
}
-
+
public static String getSchemaRepresentation(Class<?> type) {
return getSchemaRepresentation(type, SCHEMA_NS_PREFIX);
}
-
+
public static String getSchemaRepresentation(Class<?> type, String xsdPrefix) {
String value = XML_SCHEMA_PRIMITIVE_MAP.get(type);
return value == null ? value : xsdPrefix + ":" + value;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java b/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
index 24b4fb9..bd10b13 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
@@ -20,14 +20,14 @@
package org.apache.cxf.common.xmlschema;
/**
- * Exception thrown when we detect an attempt to set an impossible XML Schema reference.
+ * Exception thrown when we detect an attempt to set an impossible XML Schema reference.
*/
public class InvalidXmlSchemaReferenceException extends RuntimeException {
private static final long serialVersionUID = -2053958361555768873L;
/**
- *
+ *
*/
public InvalidXmlSchemaReferenceException() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java b/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
index f48ed62..c95c36c 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
@@ -24,7 +24,7 @@ import java.io.Reader;
import org.w3c.dom.ls.LSInput;
/**
- * LSInput implementation that can be used in
+ * LSInput implementation that can be used in
* custom LSResourceResolver implementations for getting
* schema import and include references resolved.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
index a66aceb..c6d8509 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
@@ -298,7 +298,7 @@ public class SchemaCollection {
addCrossImports(schema, complexType.getContentModel());
addCrossImportsAttributeList(schema, complexType.getAttributes());
// could it be a choice or something else?
-
+
if (complexType.getParticle() instanceof XmlSchemaChoice) {
XmlSchemaChoice choice = (XmlSchemaChoice)complexType.getParticle();
addCrossImports(schema, choice);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
index 7db5aba..3f17d46 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
@@ -51,7 +51,7 @@ import org.apache.ws.commons.schema.constants.Constants;
*/
public final class XmlSchemaUtils {
public static final String XSI_NIL = "xsi:nil='true'";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaUtils.class);
private XmlSchemaUtils() {
@@ -238,7 +238,7 @@ public final class XmlSchemaUtils {
return ext.getAttributes();
}
- public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type,
+ public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type,
SchemaCollection collection) {
List<XmlSchemaAnnotated> results = new ArrayList<>();
QName baseTypeName = getBaseType(type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/Configurable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/Configurable.java b/core/src/main/java/org/apache/cxf/configuration/Configurable.java
index ad7152c..acde841 100644
--- a/core/src/main/java/org/apache/cxf/configuration/Configurable.java
+++ b/core/src/main/java/org/apache/cxf/configuration/Configurable.java
@@ -20,15 +20,15 @@
package org.apache.cxf.configuration;
/**
* A configurable interface for obtaining a bean's name
- *
- * A class which implements this interface should return the
- * unique bean name for configuration to use
+ *
+ * A class which implements this interface should return the
+ * unique bean name for configuration to use
*/
public interface Configurable {
-
+
/**
* Get the configurable object's Bean name
- * @return the bean name
+ * @return the bean name
*/
- String getBeanName();
+ String getBeanName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java b/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
index 22bb23f..0f78211 100644
--- a/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
@@ -23,10 +23,10 @@ import java.util.Collection;
import java.util.List;
/**
- *
+ *
*/
public interface ConfiguredBeanLocator {
-
+
/**
* Gets the names of all the configured beans of the specific type. Does
* not cause them to be loaded.
@@ -34,8 +34,8 @@ public interface ConfiguredBeanLocator {
* @return List of all the bean names for the given type
*/
List<String> getBeanNamesOfType(Class<?> type);
-
-
+
+
/**
* Gets the bean of the given name and type
* @param name
@@ -43,19 +43,19 @@ public interface ConfiguredBeanLocator {
* @return the bean
*/
<T> T getBeanOfType(String name, Class<T> type);
-
+
/**
* Gets all the configured beans of the specific types. Causes them
- * all to be loaded.
+ * all to be loaded.
* @param type
* @return The collection of all the configured beans of the given type
*/
<T> Collection<? extends T> getBeansOfType(Class<T> type);
-
+
/**
* Iterates through the beans of the given type, calling the listener
- * to determine if it should be loaded or not.
+ * to determine if it should be loaded or not.
* @param type
* @param listener
* @return true if beans of the type were loaded
@@ -64,22 +64,22 @@ public interface ConfiguredBeanLocator {
/**
* For supporting "legacy" config, checks the configured bean to see if
- * it has a property configured with the given name/value. Mostly used
- * for supporting things configured with "activationNamespaces" set.
+ * it has a property configured with the given name/value. Mostly used
+ * for supporting things configured with "activationNamespaces" set.
* @param beanName
* @param propertyName
* @param value
* @return true if the bean has the given property/value
*/
boolean hasConfiguredPropertyValue(String beanName, String propertyName, String value);
-
+
interface BeanLoaderListener<T> {
/**
- * Return true to have the loader go ahead and load the bean. If false,
+ * Return true to have the loader go ahead and load the bean. If false,
* the loader will just skip to the next bean
* @param name
* @param type
- * @return true if the bean should be loaded
+ * @return true if the bean should be loaded
*/
boolean loadBean(String name, Class<? extends T> type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/Configurer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/Configurer.java b/core/src/main/java/org/apache/cxf/configuration/Configurer.java
index ccdbdb6..e4b1945 100644
--- a/core/src/main/java/org/apache/cxf/configuration/Configurer.java
+++ b/core/src/main/java/org/apache/cxf/configuration/Configurer.java
@@ -21,16 +21,16 @@ package org.apache.cxf.configuration;
/**
* The configurer's interface
- *
- * A class that implements this interface will perform a
+ *
+ * A class that implements this interface will perform a
* bean's configuration work
*/
-public interface Configurer {
-
+public interface Configurer {
+
String DEFAULT_USER_CFG_FILE = "cxf.xml";
String USER_CFG_FILE_PROPERTY_NAME = "cxf.config.file";
-
+
String USER_CFG_FILE_PROPERTY_URL = "cxf.config.file.url";
/**
@@ -38,7 +38,7 @@ public interface Configurer {
* @param beanInstance the instance of the bean which needs to be configured
*/
void configureBean(Object beanInstance);
-
+
/**
* set up the Bean's value by using Dependency Injection from the application context
* with a proper name. You can use * as the prefix of wildcard name.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index 8b83053..5de387c 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -81,25 +81,25 @@ public abstract class AbstractBPBeanDefinitionParser {
return v;
}
- protected Metadata parseListData(ParserContext context,
- ComponentMetadata enclosingComponent,
+ protected Metadata parseListData(ParserContext context,
+ ComponentMetadata enclosingComponent,
Element element) {
- MutableCollectionMetadata m
- = (MutableCollectionMetadata) context.parseElement(CollectionMetadata.class,
+ MutableCollectionMetadata m
+ = (MutableCollectionMetadata) context.parseElement(CollectionMetadata.class,
enclosingComponent, element);
m.setCollectionClass(List.class);
return m;
}
- protected Metadata parseMapData(ParserContext context,
- ComponentMetadata enclosingComponent,
+ protected Metadata parseMapData(ParserContext context,
+ ComponentMetadata enclosingComponent,
Element element) {
return context.parseElement(MapMetadata.class, enclosingComponent, element);
}
- protected void setFirstChildAsProperty(Element element,
- ParserContext ctx,
- MutableBeanMetadata bean,
+ protected void setFirstChildAsProperty(Element element,
+ ParserContext ctx,
+ MutableBeanMetadata bean,
String propertyName) {
Element first = DOMUtils.getFirstElement(element);
@@ -189,7 +189,7 @@ public abstract class AbstractBPBeanDefinitionParser {
}
return setBus;
}
- protected void processBusAttribute(Element element, ParserContext ctx,
+ protected void processBusAttribute(Element element, ParserContext ctx,
MutableBeanMetadata bean, String val) {
if (this.hasBusProperty()) {
bean.addProperty("bus", getBusRef(ctx, val));
@@ -204,14 +204,14 @@ public abstract class AbstractBPBeanDefinitionParser {
String val) {
//nothing
}
- protected void mapAttribute(MutableBeanMetadata bean, Element e,
+ protected void mapAttribute(MutableBeanMetadata bean, Element e,
String name, String val, ParserContext context) {
mapToProperty(bean, name, val, context);
}
protected boolean isAttribute(String pre, String name) {
- return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
- && !"abstract".equals(name) && !"lazy-init".equals(name)
+ return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
+ && !"abstract".equals(name) && !"lazy-init".equals(name)
&& !"id".equals(name);
}
@@ -222,9 +222,9 @@ public abstract class AbstractBPBeanDefinitionParser {
protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) {
}
- protected void mapToProperty(MutableBeanMetadata bean,
- String propertyName,
- String val,
+ protected void mapToProperty(MutableBeanMetadata bean,
+ String propertyName,
+ String val,
ParserContext context) {
if ("id".equals(propertyName)) {
return;
@@ -266,7 +266,7 @@ public abstract class AbstractBPBeanDefinitionParser {
protected MutableBeanMetadata getBus(ParserContext context, String name) {
ComponentDefinitionRegistry cdr = context.getComponentDefinitionRegistry();
ComponentMetadata meta = cdr.getComponentDefinition("blueprintBundle");
-
+
if (!cdr.containsComponentDefinition(InterceptorTypeConverter.class.getName())) {
MutablePassThroughMetadata md = context.createMetadata(MutablePassThroughMetadata.class);
md.setObject(new InterceptorTypeConverter());
@@ -312,9 +312,9 @@ public abstract class AbstractBPBeanDefinitionParser {
}
protected void mapElementToJaxbProperty(ParserContext ctx,
- MutableBeanMetadata bean, Element parent,
+ MutableBeanMetadata bean, Element parent,
QName name,
- String propertyName,
+ String propertyName,
Class<?> c) {
Element data = DOMUtils.getFirstChildWithName(parent, name);
if (data == null) {
@@ -323,7 +323,7 @@ public abstract class AbstractBPBeanDefinitionParser {
mapElementToJaxbProperty(ctx, bean, data, propertyName, c);
}
-
+
public static class JAXBBeanFactory {
final JAXBContext ctx;
final Class<?> cls;
@@ -331,8 +331,8 @@ public abstract class AbstractBPBeanDefinitionParser {
ctx = c;
cls = c2;
}
-
-
+
+
public Object createJAXBBean(String v) {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new StringReader(v));
try {
@@ -354,10 +354,10 @@ public abstract class AbstractBPBeanDefinitionParser {
}
protected void mapElementToJaxbProperty(ParserContext ctx,
- MutableBeanMetadata bean,
- Element data,
- String propertyName,
- Class<?> c) {
+ MutableBeanMetadata bean,
+ Element data,
+ String propertyName,
+ Class<?> c) {
try {
XMLStreamWriter xmlWriter = null;
Unmarshaller u = null;
@@ -366,8 +366,8 @@ public abstract class AbstractBPBeanDefinitionParser {
xmlWriter = StaxUtils.createXMLStreamWriter(writer);
StaxUtils.copy(data, xmlWriter);
xmlWriter.flush();
-
-
+
+
MutableBeanMetadata factory = ctx.createMetadata(MutableBeanMetadata.class);
factory.setClassName(c.getName());
factory.setFactoryComponent(createPassThrough(ctx, new JAXBBeanFactory(getContext(c), c)));
@@ -375,7 +375,7 @@ public abstract class AbstractBPBeanDefinitionParser {
factory.addArgument(createValue(ctx, writer.toString()), String.class.getName(), 0);
bean.addProperty(propertyName, factory);
- } catch (Exception ex) {
+ } catch (Exception ex) {
u = getContext(c).createUnmarshaller();
u.setEventHandler(null);
Object obj;
@@ -401,7 +401,7 @@ public abstract class AbstractBPBeanDefinitionParser {
throw new RuntimeException("Could not parse configuration.", e);
}
}
-
+
protected synchronized JAXBContext getContext(Class<?> cls) {
if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) {
@@ -410,9 +410,9 @@ public abstract class AbstractBPBeanDefinitionParser {
if (jaxbClasses != null) {
tmp.addAll(jaxbClasses);
}
- JAXBContextCache.addPackage(tmp, PackageUtils.getPackageName(cls),
- cls == null
- ? getClass().getClassLoader()
+ JAXBContextCache.addPackage(tmp, PackageUtils.getPackageName(cls),
+ cls == null
+ ? getClass().getClassLoader()
: cls.getClassLoader());
if (cls != null) {
boolean hasOf = false;
@@ -427,7 +427,7 @@ public abstract class AbstractBPBeanDefinitionParser {
}
}
JAXBContextCache.scanPackages(tmp);
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(tmp, null, null, null, false);
jaxbClasses = ccs.getClasses();
jaxbContext = ccs.getContext();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
index fca633c..b5ecba9 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
@@ -24,14 +24,14 @@ import org.osgi.service.blueprint.container.Converter;
import org.osgi.service.blueprint.container.ReifiedType;
/**
- *
+ *
*/
public class InterceptorTypeConverter implements Converter {
/** {@inheritDoc}*/
public boolean canConvert(Object sourceObject, ReifiedType targetType) {
return sourceObject instanceof Interceptor
- && targetType.getRawClass().isInstance(sourceObject);
+ && targetType.getRawClass().isInstance(sourceObject);
}
/** {@inheritDoc}*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
index 77ce8b3..9eae7d7 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
@@ -27,11 +27,11 @@ import org.osgi.service.blueprint.reflect.BeanProperty;
import org.osgi.service.blueprint.reflect.Metadata;
/**
- *
+ *
*/
public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser {
protected Class<?> cls;
-
+
public SimpleBPBeanDefinitionParser(Class<?> cls) {
this.cls = cls;
}
@@ -42,20 +42,20 @@ public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser
public String getFactoryCreateType(Element element) {
return null;
}
-
+
public String getId(Element element, ParserContext context) {
return element.hasAttribute("id") ? element.getAttribute("id") : null;
}
-
+
public Metadata parse(Element element, ParserContext context) {
-
+
MutableBeanMetadata cxfBean = context.createMetadata(MutableBeanMetadata.class);
cxfBean.setRuntimeClass(cls);
String fact = getFactorySuffix();
if (fact == null) {
cxfBean.setId(getId(element, context));
} else {
- cxfBean.setId(getId(element, context) + fact);
+ cxfBean.setId(getId(element, context) + fact);
}
parseAttributes(element, context, cxfBean);
parseChildElements(element, context, cxfBean);
@@ -72,7 +72,7 @@ public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser
}
if (fact != null) {
context.getComponentDefinitionRegistry().registerComponentDefinition(cxfBean);
-
+
MutableBeanMetadata bean = context.createMetadata(MutableBeanMetadata.class);
bean.setId(getId(element, context));
bean.setFactoryComponent(cxfBean);
@@ -83,5 +83,5 @@ public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser
return cxfBean;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 4e52018..24e162d 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -65,10 +65,10 @@ public final class SSLUtils {
private static final String CERTIFICATE_FACTORY_TYPE = "X.509";
private static final String HTTPS_CIPHER_SUITES = "https.cipherSuites";
-
+
private static final boolean DEFAULT_REQUIRE_CLIENT_AUTHENTICATION = false;
private static final boolean DEFAULT_WANT_CLIENT_AUTHENTICATION = true;
-
+
private static final List<String> DEFAULT_CIPHERSUITE_FILTERS_INCLUDE =
Arrays.asList(new String[] {".*"});
/**
@@ -79,12 +79,12 @@ public final class SSLUtils {
".*_anon_.*",
".*_EXPORT_.*",
".*_DES_.*"});
-
+
private static volatile KeyManager[] defaultManagers;
private SSLUtils() {
- }
-
+ }
+
public static KeyManager[] getKeyStoreManagers(
String keyStoreLocation,
String keyStoreType,
@@ -95,24 +95,24 @@ public final class SSLUtils {
Logger log)
throws Exception {
//TODO for performance reasons we should cache
- // the KeymanagerFactory and TrustManagerFactory
+ // the KeymanagerFactory and TrustManagerFactory
if (keyStorePassword != null
- && keyPassword != null
+ && keyPassword != null
&& !keyStorePassword.equals(keyPassword)) {
LogUtils.log(log,
Level.WARNING,
"KEY_PASSWORD_NOT_SAME_KEYSTORE_PASSWORD");
}
- KeyManager[] keystoreManagers = null;
- KeyManagerFactory kmf =
- KeyManagerFactory.getInstance(keyStoreMgrFactoryAlgorithm);
+ KeyManager[] keystoreManagers = null;
+ KeyManagerFactory kmf =
+ KeyManagerFactory.getInstance(keyStoreMgrFactoryAlgorithm);
KeyStore ks = KeyStore.getInstance(keyStoreType);
-
+
if (keyStoreType.equalsIgnoreCase(PKCS12_TYPE)) {
Path path = FileSystems.getDefault().getPath(keyStoreLocation);
byte[] bytes = Files.readAllBytes(path);
try (ByteArrayInputStream bin = new ByteArrayInputStream(bytes)) {
-
+
if (keyStorePassword != null) {
keystoreManagers = loadKeyStore(kmf,
ks,
@@ -122,9 +122,9 @@ public final class SSLUtils {
log);
}
}
- } else {
+ } else {
byte[] sslCert = loadFile(keyStoreLocation);
-
+
if (sslCert != null && sslCert.length > 0 && keyStorePassword != null) {
try (ByteArrayInputStream bin = new ByteArrayInputStream(sslCert)) {
keystoreManagers = loadKeyStore(kmf,
@@ -134,11 +134,11 @@ public final class SSLUtils {
keyStorePassword,
log);
}
- }
+ }
}
if (keyStorePassword == null && keyStoreLocation != null) {
LogUtils.log(log, Level.WARNING,
- "FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD",
+ "FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD",
keyStoreLocation);
}
return keystoreManagers;
@@ -153,24 +153,24 @@ public final class SSLUtils {
}
return defaultManagers;
}
-
+
private static synchronized void loadDefaultKeyManagers(Logger log) {
if (defaultManagers != null) {
return;
}
-
+
String location = getKeystore(null, log);
String keyStorePassword = getKeystorePassword(null, log);
String keyPassword = getKeyPassword(null, log);
FileInputStream fis = null;
-
+
try {
File file = new File(location);
if (file.exists()) {
- KeyManagerFactory kmf =
- KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ KeyManagerFactory kmf =
+ KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
fis = new FileInputStream(file);
ks.load(fis, (keyStorePassword != null) ? keyStorePassword.toCharArray() : null);
kmf.init(ks, (keyPassword != null) ? keyPassword.toCharArray() : null);
@@ -211,9 +211,9 @@ public final class SSLUtils {
} catch (Exception e) {
LogUtils.log(log,
Level.WARNING,
- "FAILED_TO_LOAD_KEYSTORE",
+ "FAILED_TO_LOAD_KEYSTORE",
new Object[]{keyStoreLocation, e.getMessage()});
- }
+ }
return keystoreManagers;
}
@@ -225,12 +225,12 @@ public final class SSLUtils {
Logger log)
throws Exception {
// ********************** Load Trusted CA file **********************
-
+
KeyStore trustedCertStore = KeyStore.getInstance(trustStoreType);
if (pkcs12) {
//TODO could support multiple trust cas
-
+
trustedCertStore.load(null, "".toCharArray());
CertificateFactory cf = CertificateFactory.getInstance(CERTIFICATE_FACTORY_TYPE);
byte[] caCert = loadFile(trustStoreLocation);
@@ -242,22 +242,22 @@ public final class SSLUtils {
}
}
} catch (Exception e) {
- LogUtils.log(log, Level.WARNING, "FAILED_TO_LOAD_TRUST_STORE",
+ LogUtils.log(log, Level.WARNING, "FAILED_TO_LOAD_TRUST_STORE",
new Object[]{trustStoreLocation, e.getMessage()});
- }
+ }
} else {
try (FileInputStream trustStoreInputStream = new FileInputStream(trustStoreLocation)) {
trustedCertStore.load(trustStoreInputStream, null);
}
}
-
- TrustManagerFactory tmf =
+
+ TrustManagerFactory tmf =
TrustManagerFactory.getInstance(trustStoreMgrFactoryAlgorithm);
tmf.init(trustedCertStore);
LogUtils.log(log, Level.FINE, "LOADED_TRUST_STORE", trustStoreLocation);
return tmf.getTrustManagers();
}
-
+
protected static byte[] loadFile(String fileName) throws IOException {
if (fileName == null) {
return null;
@@ -283,11 +283,11 @@ public final class SSLUtils {
LogUtils.log(log, Level.FINE, logMsg, keyStoreLocation);
return keyStoreLocation;
}
-
+
public static String getKeystoreType(String keyStoreType, Logger log) {
return getKeystoreType(keyStoreType, log, DEFAULT_KEYSTORE_TYPE);
}
-
+
public static String getKeystoreType(String keyStoreType, Logger log, String def) {
String logMsg = null;
if (keyStoreType != null) {
@@ -298,13 +298,13 @@ public final class SSLUtils {
keyStoreType = def;
logMsg = "KEY_STORE_TYPE_NOT_SET";
} else {
- logMsg = "KEY_STORE_TYPE_SYSTEM_SET";
+ logMsg = "KEY_STORE_TYPE_SYSTEM_SET";
}
}
LogUtils.log(log, Level.FINE, logMsg, keyStoreType);
return keyStoreType;
}
-
+
public static String getKeystoreProvider(String keyStoreProvider, Logger log) {
String logMsg = null;
if (keyStoreProvider != null) {
@@ -314,13 +314,13 @@ public final class SSLUtils {
if (keyStoreProvider == null) {
logMsg = "KEY_STORE_PROVIDER_NOT_SET";
} else {
- logMsg = "KEY_STORE_PROVIDER_SYSTEM_SET";
+ logMsg = "KEY_STORE_PROVIDER_SYSTEM_SET";
}
}
LogUtils.log(log, Level.FINE, logMsg, keyStoreProvider);
return keyStoreProvider;
- }
-
+ }
+
public static String getKeystorePassword(String keyStorePassword,
Logger log) {
String logMsg = null;
@@ -334,9 +334,9 @@ public final class SSLUtils {
: "KEY_STORE_PASSWORD_NOT_SET";
}
LogUtils.log(log, Level.FINE, logMsg);
- return keyStorePassword;
+ return keyStorePassword;
}
-
+
public static String getKeyPassword(String keyPassword, Logger log) {
String logMsg = null;
if (keyPassword != null) {
@@ -369,8 +369,8 @@ public final class SSLUtils {
}
LogUtils.log(log, Level.FINE, logMsg, keyStoreMgrFactoryAlgorithm);
return keyStoreMgrFactoryAlgorithm;
- }
-
+ }
+
public static String getTrustStoreAlgorithm(
String trustStoreMgrFactoryAlgorithm,
Logger log) {
@@ -384,8 +384,8 @@ public final class SSLUtils {
}
LogUtils.log(log, Level.FINE, logMsg, trustStoreMgrFactoryAlgorithm);
return trustStoreMgrFactoryAlgorithm;
- }
-
+ }
+
public static SSLContext getSSLContext(String protocol,
KeyManager[] keyStoreManagers,
TrustManager[] trustStoreManagers)
@@ -394,7 +394,7 @@ public final class SSLUtils {
ctx.init(keyStoreManagers, trustStoreManagers, null);
return ctx;
}
-
+
public static String[] getSupportedCipherSuites(SSLContext context) {
return context.getSocketFactory().getSupportedCipherSuites();
}
@@ -402,7 +402,7 @@ public final class SSLUtils {
public static String[] getServerSupportedCipherSuites(SSLContext context) {
return context.getServerSocketFactory().getSupportedCipherSuites();
}
-
+
public static String[] getCiphersuitesToInclude(List<String> cipherSuitesList,
FiltersType filters,
String[] defaultCipherSuites,
@@ -416,25 +416,25 @@ public final class SSLUtils {
if (!(cipherSuitesList == null || cipherSuitesList.isEmpty())) {
return getCiphersFromList(cipherSuitesList, log, false);
}
-
+
String[] cipherSuites = getSystemCiphersuites(log);
if (cipherSuites != null) {
return cipherSuites;
}
- // If we have no explicit cipherSuites (for the include case as above), and no filters,
+ // If we have no explicit cipherSuites (for the include case as above), and no filters,
// then just use the defaults
if ((defaultCipherSuites != null && defaultCipherSuites.length != 0)
&& (filters == null || !(filters.isSetInclude() || filters.isSetExclude()))) {
- LogUtils.log(log, Level.FINE, "CIPHERSUITES_SET", defaultCipherSuites.toString());
+ LogUtils.log(log, Level.FINE, "CIPHERSUITES_SET", defaultCipherSuites.toString());
return defaultCipherSuites;
}
-
+
LogUtils.log(log, Level.FINE, "CIPHERSUITES_NOT_SET");
-
+
return getFilteredCiphersuites(filters, supportedCipherSuites, log, false);
}
-
+
public static String[] getFilteredCiphersuites(FiltersType filters,
String[] supportedCipherSuites,
Logger log, boolean exclude) {
@@ -488,9 +488,9 @@ public final class SSLUtils {
} else {
return null;
}
-
+
}
-
+
private static List<Pattern> compileRegexPatterns(List<String> regexes,
boolean include,
Logger log) {
@@ -506,7 +506,7 @@ public final class SSLUtils {
}
return patterns;
}
-
+
private static boolean matchesOneOf(String s, List<Pattern> patterns) {
boolean matches = false;
if (patterns != null) {
@@ -520,9 +520,9 @@ public final class SSLUtils {
}
return matches;
}
-
+
private static String[] getCiphersFromList(List<String> cipherSuitesList,
- Logger log,
+ Logger log,
boolean exclude) {
int numCipherSuites = cipherSuitesList.size();
String[] cipherSuites = cipherSuitesList.toArray(new String[numCipherSuites]);
@@ -534,17 +534,17 @@ public final class SSLUtils {
}
ciphsStr.append(s);
}
- LogUtils.log(log, Level.FINE,
- exclude ? "CIPHERSUITES_EXCLUDED" : "CIPHERSUITES_SET", ciphsStr.toString());
+ LogUtils.log(log, Level.FINE,
+ exclude ? "CIPHERSUITES_EXCLUDED" : "CIPHERSUITES_SET", ciphsStr.toString());
}
return cipherSuites;
}
-
+
public static String getTrustStore(String trustStoreLocation, Logger log) {
String logMsg = null;
if (trustStoreLocation != null) {
logMsg = "TRUST_STORE_SET";
- } else {
+ } else {
trustStoreLocation = SystemPropertyAction.getProperty("javax.net.ssl.trustStore");
if (trustStoreLocation != null) {
logMsg = "TRUST_STORE_SYSTEM_PROPERTY_SET";
@@ -557,7 +557,7 @@ public final class SSLUtils {
LogUtils.log(log, Level.FINE, logMsg, trustStoreLocation);
return trustStoreLocation;
}
-
+
public static String getTrustStoreType(String trustStoreType, Logger log) {
String logMsg = null;
if (trustStoreType != null) {
@@ -565,7 +565,7 @@ public final class SSLUtils {
} else {
//Can default to JKS
trustStoreType = SystemPropertyAction.getProperty("javax.net.ssl.trustStoreType");
- if (trustStoreType == null) {
+ if (trustStoreType == null) {
trustStoreType = DEFAULT_TRUST_STORE_TYPE;
logMsg = "TRUST_STORE_TYPE_NOT_SET";
} else {
@@ -575,7 +575,7 @@ public final class SSLUtils {
LogUtils.log(log, Level.FINE, logMsg, trustStoreType);
return trustStoreType;
}
-
+
public static String getSecureSocketProtocol(String secureSocketProtocol,
Logger log) {
if (secureSocketProtocol != null) {
@@ -589,7 +589,7 @@ public final class SSLUtils {
}
return secureSocketProtocol;
}
-
+
public static boolean getRequireClientAuthentication(
boolean isSetRequireClientAuthentication,
Boolean isRequireClientAuthentication,
@@ -601,7 +601,7 @@ public final class SSLUtils {
isRequireClientAuthentication.booleanValue();
LogUtils.log(log,
Level.FINE,
- "REQUIRE_CLIENT_AUTHENTICATION_SET",
+ "REQUIRE_CLIENT_AUTHENTICATION_SET",
requireClientAuthentication);
} else {
LogUtils.log(log,
@@ -610,7 +610,7 @@ public final class SSLUtils {
}
return requireClientAuthentication;
}
-
+
public static boolean getWantClientAuthentication(
boolean isSetWantClientAuthentication,
Boolean isWantClientAuthentication,
@@ -622,18 +622,18 @@ public final class SSLUtils {
isWantClientAuthentication.booleanValue();
LogUtils.log(log,
Level.FINE,
- "WANT_CLIENT_AUTHENTICATION_SET",
+ "WANT_CLIENT_AUTHENTICATION_SET",
wantClientAuthentication);
} else {
LogUtils.log(log,
Level.WARNING,
"WANT_CLIENT_AUTHENTICATION_NOT_SET");
- }
+ }
return wantClientAuthentication;
- }
-
+ }
+
+
-
public static void logUnSupportedPolicies(Object policy,
boolean client,
String[] unsupported,
@@ -649,7 +649,7 @@ public final class SSLUtils {
}
}
}
-
+
private static void logUnSupportedPolicy(boolean isSet,
boolean client,
String policy,
@@ -661,20 +661,20 @@ public final class SSLUtils {
? "UNSUPPORTED_SSL_CLIENT_POLICY_DATA"
: "UNSUPPORTED_SSL_SERVER_POLICY_DATA",
policy);
- }
+ }
}
-
+
public static boolean testAllDataHasSetupMethod(Object policy,
String[] unsupported,
String[] derivative) {
Method[] sslPolicyMethods = policy.getClass().getDeclaredMethods();
Method[] methods = SSLUtils.class.getMethods();
boolean ok = true;
-
+
for (int i = 0; i < sslPolicyMethods.length && ok; i++) {
String sslPolicyMethodName = sslPolicyMethods[i].getName();
if (sslPolicyMethodName.startsWith("isSet")) {
- String dataName =
+ String dataName =
sslPolicyMethodName.substring("isSet".length(),
sslPolicyMethodName.length());
String thisMethodName = "get" + dataName;
@@ -685,7 +685,7 @@ public final class SSLUtils {
}
return ok;
}
-
+
private static boolean hasMethod(Method[] methods, String methodName) {
boolean found = false;
for (int i = 0; i < methods.length && !found; i++) {
@@ -693,7 +693,7 @@ public final class SSLUtils {
}
return found;
}
-
+
private static boolean isExcluded(String[] excluded,
String dataName) {
boolean found = false;
@@ -701,6 +701,6 @@ public final class SSLUtils {
found = excluded[i].equals(dataName);
}
return found;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
index cfc6b2d..f880e53 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
@@ -26,7 +26,7 @@ import javax.net.ssl.SSLSocketFactory;
/**
* This class extends {@link TLSParameterBase} with client-specific
* SSL/TLS parameters.
- *
+ *
*/
public class TLSClientParameters extends TLSParameterBase {
private boolean disableCNCheck;
@@ -35,26 +35,26 @@ public class TLSClientParameters extends TLSParameterBase {
private boolean useHttpsURLConnectionDefaultSslSocketFactory;
private boolean useHttpsURLConnectionDefaultHostnameVerifier;
private HostnameVerifier hostnameVerifier;
-
+
/**
* Set custom HostnameVerifier
* @param verifier hostname verifier
*/
public void setHostnameVerifier(HostnameVerifier verifier) {
- hostnameVerifier = verifier;
+ hostnameVerifier = verifier;
}
-
+
/**
* Get custom HostnameVerifier
* @return hostname verifier
*/
public HostnameVerifier getHostnameVerifier() {
- return hostnameVerifier;
+ return hostnameVerifier;
}
/**
* Set whether or not JSEE should omit checking if the host name
* specified in the URL matches that of the Common Name
- * (CN) on the server's certificate. Default is false;
+ * (CN) on the server's certificate. Default is false;
* this attribute should not be set to true during production use.
*/
public void setDisableCNCheck(boolean disableCNCheck) {
@@ -85,7 +85,7 @@ public class TLSClientParameters extends TLSParameterBase {
public final SSLSocketFactory getSSLSocketFactory() {
return sslSocketFactory;
}
-
+
/**
* Returns the SSL cache timeout in seconds if it has been configured or the default value
*/
@@ -100,7 +100,7 @@ public class TLSClientParameters extends TLSParameterBase {
this.sslCacheTimeout = sslCacheTimeout;
}
-
+
/**
* Returns whether or not {@link javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()} should be
* used to create https connections. If <code>true</code> , {@link #getJsseProvider()} ,
@@ -115,7 +115,7 @@ public class TLSClientParameters extends TLSParameterBase {
/**
* Sets whether or not {@link javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()} should be
* used to create https connections.
- *
+ *
* @see #isUseHttpsURLConnectionDefaultSslSocketFactory()
*/
public void setUseHttpsURLConnectionDefaultSslSocketFactory(
@@ -134,14 +134,14 @@ public class TLSClientParameters extends TLSParameterBase {
/**
* Sets whether or not {@link javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier()} should be
* used to create https connections.
- *
+ *
* @see #isUseHttpsURLConnectionDefaultHostnameVerifier()
*/
public void setUseHttpsURLConnectionDefaultHostnameVerifier(
boolean useHttpsURLConnectionDefaultHostnameVerifier) {
this.useHttpsURLConnectionDefaultHostnameVerifier = useHttpsURLConnectionDefaultHostnameVerifier;
}
-
+
public int hashCode() {
int hash = disableCNCheck ? 37 : 17;
if (sslSocketFactory != null) {
@@ -184,7 +184,7 @@ public class TLSClientParameters extends TLSParameterBase {
}
return i;
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -215,7 +215,7 @@ public class TLSClientParameters extends TLSParameterBase {
}
if (certConstraints != null) {
if (that.certConstraints != null) {
- eq &= equals(certConstraints.getIssuerDNConstraints(),
+ eq &= equals(certConstraints.getIssuerDNConstraints(),
that.certConstraints.getIssuerDNConstraints());
eq &= equals(certConstraints.getSubjectDNConstraints(),
that.certConstraints.getSubjectDNConstraints());
@@ -229,7 +229,7 @@ public class TLSClientParameters extends TLSParameterBase {
}
return false;
}
-
+
private static boolean equals(final List<?> obj1, final List<?> obj2) {
if (obj1.size() == obj2.size()) {
for (int x = 0; x < obj1.size(); x++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
index e67571b..4086e10 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
@@ -50,18 +50,18 @@ import org.apache.cxf.staxutils.StaxUtils;
public final class TLSClientParametersConfig {
private static Set<Class<?>> classes;
private static JAXBContext context;
-
+
private TLSClientParametersConfig() {
//not constructed
}
-
+
private static synchronized JAXBContext getContext() throws JAXBException {
if (context == null || classes == null) {
Set<Class<?>> c2 = new HashSet<Class<?>>();
- JAXBContextCache.addPackage(c2,
- PackageUtils.getPackageName(TLSClientParametersType.class),
+ JAXBContextCache.addPackage(c2,
+ PackageUtils.getPackageName(TLSClientParametersType.class),
TLSClientParametersConfig.class.getClassLoader());
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(c2, null, null, null, false);
classes = ccs.getClasses();
context = ccs.getContext();
@@ -69,18 +69,18 @@ public final class TLSClientParametersConfig {
return context;
}
- public static TLSClientParameters createTLSClientParametersFromType(TLSClientParametersType params)
+ public static TLSClientParameters createTLSClientParametersFromType(TLSClientParametersType params)
throws GeneralSecurityException,
IOException {
- TLSClientParameters ret = new TLSClientParameters();
+ TLSClientParameters ret = new TLSClientParameters();
boolean usingDefaults = params.isUseHttpsURLConnectionDefaultSslSocketFactory();
TLSClientParametersTypeInternal iparams = null;
if (params instanceof TLSClientParametersTypeInternal) {
iparams = (TLSClientParametersTypeInternal)params;
}
-
+
if (params.isDisableCNCheck()) {
ret.setDisableCNCheck(true);
}
@@ -133,15 +133,15 @@ public final class TLSClientParametersConfig {
}
return ret;
}
-
+
public static Object createTLSClientParameters(String s) {
-
+
StringReader reader = new StringReader(s);
XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
try {
- JAXBElement<TLSClientParametersType> type = JAXBUtils.unmarshall(getContext(),
+ JAXBElement<TLSClientParametersType> type = JAXBUtils.unmarshall(getContext(),
data,
TLSClientParametersType.class);
TLSClientParametersType cpt = type.getValue();
@@ -158,7 +158,7 @@ public final class TLSClientParametersConfig {
}
}
}
-
+
public static class TLSClientParametersTypeInternal extends TLSClientParametersType {
private KeyManager[] keyManagersRef;
private TrustManager[] trustManagersRef;
@@ -170,7 +170,7 @@ public final class TLSClientParametersConfig {
public void setKeyManagersRef(KeyManager[] keyManagersRef) {
this.keyManagersRef = keyManagersRef;
}
-
+
public boolean isSetKeyManagersRef() {
return this.keyManagersRef != null;
}
@@ -182,7 +182,7 @@ public final class TLSClientParametersConfig {
public void setTrustManagersRef(TrustManager[] trustManagersRef) {
this.trustManagersRef = trustManagersRef;
}
-
+
public boolean isSetTrustManagersRef() {
return this.trustManagersRef != null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
index b3d7e99..b379f5e 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
@@ -48,10 +48,10 @@ public class TLSParameterBase {
*/
public final void setJsseProvider(String prov) {
provider = prov;
- }
+ }
/**
- * Return the JSSE provider.
+ * Return the JSSE provider.
*/
public String getJsseProvider() {
return provider;
@@ -79,7 +79,7 @@ public class TLSParameterBase {
public final void setTrustManagers(TrustManager[] trustMgrs) {
trustManagers = trustMgrs;
}
-
+
/**
* Returns the TrustManagers associated with the endpoint.
*/
@@ -94,7 +94,7 @@ public class TLSParameterBase {
public final void setCipherSuites(List<String> cs) {
ciphersuites = cs;
}
-
+
/**
* Returns the CipherSuites associated with this endpoint.
*/
@@ -106,15 +106,15 @@ public class TLSParameterBase {
}
/**
- * This parameter sets the filter to include and/or exclude the
+ * This parameter sets the filter to include and/or exclude the
* cipher suites to use from the set list or system defaults.
*/
public final void setCipherSuitesFilter(FiltersType filters) {
cipherSuiteFilters = filters;
}
-
+
/**
- * Returns the cipher suites filter
+ * Returns the cipher suites filter
*/
public FiltersType getCipherSuitesFilter() {
return cipherSuiteFilters;
@@ -127,14 +127,14 @@ public class TLSParameterBase {
public final void setSecureRandom(SecureRandom random) {
secureRandom = random;
}
-
+
/**
* Get the certificate constraints type
*/
public CertificateConstraintsType getCertConstraints() {
return certConstraints;
}
-
+
/**
* Set the certificate constraints type
*/
@@ -164,7 +164,7 @@ public class TLSParameterBase {
public String getSecureSocketProtocol() {
return protocol;
}
-
+
/**
* This parameter configures the cert alias used on server side
* this is useful when keystore has multiple certs
@@ -172,7 +172,7 @@ public class TLSParameterBase {
public final void setCertAlias(String ctAlias) {
certAlias = ctAlias;
}
-
+
/**
* This parameter retrieves the cert alias specified on server side
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index e8743b7..644a1e9 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -117,7 +117,7 @@ public final class TLSParameterJaxBUtils {
password = tmp.toCharArray();
}
}
- String provider = SSLUtils.getKeystoreProvider(kst.isSetProvider()
+ String provider = SSLUtils.getKeystoreProvider(kst.isSetProvider()
? kst.getProvider() : null,
LOG);
KeyStore keyStore = provider == null
@@ -196,7 +196,7 @@ public final class TLSParameterJaxBUtils {
}
return is;
}
-
+
/**
* Create a KeyStore containing the trusted CA certificates contained
* in the supplied input stream.
@@ -246,8 +246,8 @@ public final class TLSParameterJaxBUtils {
}
return new String(b, 0, l).toCharArray();
- }
-
+ }
+
/**
* This method converts the JAXB KeyManagersType into a list of
* JSSE KeyManagers.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index 0a2f3ac..9ba48d7 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -26,14 +26,14 @@ import org.apache.cxf.configuration.security.ClientAuthentication;
/**
* This class extends {@link TLSParameterBase} with service-specific
* SSL/TLS parameters.
- *
+ *
*/
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
List<String> excludeProtocols = new ArrayList<>();
List<String> includeProtocols = new ArrayList<>();
-
+
/**
* This parameter configures the server side to request and/or
* require client authentication.
@@ -48,14 +48,14 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
-
+
/**
* This parameter sets the protocol list to exclude.
*/
public final void setExcludeProtocols(List<String> protocols) {
excludeProtocols = protocols;
}
-
+
/**
* Returns the protocols to exclude that are associated with this endpoint.
*/
@@ -65,14 +65,14 @@ public class TLSServerParameters extends TLSParameterBase {
}
return excludeProtocols;
}
-
+
/**
* This parameter sets the protocol list to include.
*/
public final void setIncludeProtocols(List<String> protocols) {
includeProtocols = protocols;
}
-
+
/**
* Returns the protocols to include that are associated with this endpoint.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 137e80d..bade93e 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -33,18 +33,18 @@ import org.apache.cxf.configuration.security.TLSServerParametersType;
* configuration of the http-destination.
*/
@NoJSR250Annotations
-public class TLSServerParametersConfig
+public class TLSServerParametersConfig
extends TLSServerParameters {
- public TLSServerParametersConfig(TLSServerParametersType params)
+ public TLSServerParametersConfig(TLSServerParametersType params)
throws GeneralSecurityException,
IOException {
-
+
TLSServerParametersTypeInternal iparams = null;
if (params instanceof TLSServerParametersTypeInternal) {
iparams = (TLSServerParametersTypeInternal)params;
}
-
+
if (params.isSetSecureSocketProtocol()) {
this.setSecureSocketProtocol(params.getSecureSocketProtocol());
}
@@ -105,7 +105,7 @@ public class TLSServerParametersConfig
public void setKeyManagersRef(KeyManager[] keyManagersRef) {
this.keyManagersRef = keyManagersRef;
}
-
+
public boolean isSetKeyManagersRef() {
return this.keyManagersRef != null;
}
@@ -117,11 +117,11 @@ public class TLSServerParametersConfig
public void setTrustManagersRef(TrustManager[] trustManagersRef) {
this.trustManagersRef = trustManagersRef;
}
-
+
public boolean isSetTrustManagersRef() {
return this.trustManagersRef != null;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index e6e55de..431a72a 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -54,54 +54,54 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
import org.springframework.beans.factory.xml.ParserContext;
-public abstract class AbstractBeanDefinitionParser
+public abstract class AbstractBeanDefinitionParser
extends org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser {
public static final String WIRE_BUS_ATTRIBUTE = AbstractBeanDefinitionParser.class.getName() + ".wireBus";
public static final String WIRE_BUS_NAME = AbstractBeanDefinitionParser.class.getName() + ".wireBusName";
- public static final String WIRE_BUS_CREATE
+ public static final String WIRE_BUS_CREATE
= AbstractBeanDefinitionParser.class.getName() + ".wireBusCreate";
- public static final String WIRE_BUS_HANDLER
+ public static final String WIRE_BUS_HANDLER
= "org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor";
private static final Logger LOG = LogUtils.getL7dLogger(AbstractBeanDefinitionParser.class);
-
+
private Class<?> beanClass;
private JAXBContext context;
private Set<Class<?>> classes;
public AbstractBeanDefinitionParser() {
}
-
+
@Override
protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
- boolean setBus = parseAttributes(element, ctx, bean);
+ boolean setBus = parseAttributes(element, ctx, bean);
if (!setBus && hasBusProperty()) {
addBusWiringAttribute(bean, BusWiringType.PROPERTY);
}
parseChildElements(element, ctx, bean);
}
-
+
protected boolean parseAttributes(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
NamedNodeMap atts = element.getAttributes();
boolean setBus = false;
for (int i = 0; i < atts.getLength(); i++) {
Attr node = (Attr) atts.item(i);
-
+
setBus |= parseAttribute(element, node, ctx, bean);
}
return setBus;
}
- protected boolean parseAttribute(Element element, Attr node,
+ protected boolean parseAttribute(Element element, Attr node,
ParserContext ctx, BeanDefinitionBuilder bean) {
String val = node.getValue();
String pre = node.getPrefix();
String name = node.getLocalName();
String prefix = node.getPrefix();
-
+
// Don't process namespaces
if (isNamespace(name, prefix)) {
return false;
}
-
+
if ("createdFromAPI".equals(name)) {
bean.setAbstract(true);
} else if ("abstract".equals(name)) {
@@ -118,8 +118,8 @@ public abstract class AbstractBeanDefinitionParser
return false;
}
-
- protected boolean processBusAttribute(Element element, ParserContext ctx,
+
+ protected boolean processBusAttribute(Element element, ParserContext ctx,
BeanDefinitionBuilder bean,
String val) {
if (val != null && val.trim().length() > 0) {
@@ -129,7 +129,7 @@ public abstract class AbstractBeanDefinitionParser
addBusWiringAttribute(bean, BusWiringType.PROPERTY,
val, ctx);
}
- return true;
+ return true;
}
return false;
}
@@ -144,13 +144,13 @@ public abstract class AbstractBeanDefinitionParser
private boolean isNamespace(String name, String prefix) {
return "xmlns".equals(prefix) || prefix == null && "xmlns".equals(name);
}
-
+
protected void parseChildElements(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
Element el = DOMUtils.getFirstElement(element);
while (el != null) {
String name = el.getLocalName();
mapElement(ctx, bean, el, name);
- el = DOMUtils.getNextElement(el);
+ el = DOMUtils.getNextElement(el);
}
}
@@ -174,46 +174,46 @@ public abstract class AbstractBeanDefinitionParser
protected void mapAttribute(BeanDefinitionBuilder bean, String name, String val) {
mapToProperty(bean, name, val);
}
-
+
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) {
}
-
+
@Override
- protected String resolveId(Element elem, AbstractBeanDefinition definition,
+ protected String resolveId(Element elem, AbstractBeanDefinition definition,
ParserContext ctx) throws BeanDefinitionStoreException {
-
+
// REVISIT: use getAttributeNS instead
-
+
String id = getIdOrName(elem);
String createdFromAPI = elem.getAttribute("createdFromAPI");
-
+
if (null == id || "".equals(id)) {
return super.resolveId(elem, definition, ctx);
- }
-
+ }
+
if (createdFromAPI != null && "true".equals(createdFromAPI.toLowerCase())) {
return id + getSuffix();
}
- return id;
+ return id;
}
protected boolean hasBusProperty() {
return false;
}
-
+
protected String getSuffix() {
return "";
}
- protected void setFirstChildAsProperty(Element element, ParserContext ctx,
+ protected void setFirstChildAsProperty(Element element, ParserContext ctx,
BeanDefinitionBuilder bean, String propertyName) {
Element first = getFirstChild(element);
-
+
if (first == null) {
throw new IllegalStateException(propertyName + " property must have child elements!");
}
-
+
String id;
BeanDefinition child;
if (first.getNamespaceURI().equals(BeanDefinitionParserDelegate.BEANS_NAMESPACE_URI)) {
@@ -231,9 +231,9 @@ public abstract class AbstractBeanDefinitionParser
bean.addPropertyValue(propertyName, child);
return;
} else {
- throw new UnsupportedOperationException("Elements with the name " + name
+ throw new UnsupportedOperationException("Elements with the name " + name
+ " are not currently "
- + "supported as sub elements of "
+ + "supported as sub elements of "
+ element.getLocalName());
}
}
@@ -245,12 +245,12 @@ public abstract class AbstractBeanDefinitionParser
return DOMUtils.getFirstElement(element);
}
- protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
+ protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
BusWiringType type) {
addBusWiringAttribute(bean, type, null, null);
}
-
- protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
+
+ protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
BusWiringType type,
String busName,
ParserContext ctx) {
@@ -260,31 +260,31 @@ public abstract class AbstractBeanDefinitionParser
if (busName.charAt(0) == '#') {
busName = busName.substring(1);
}
- bean.getRawBeanDefinition().setAttribute(WIRE_BUS_NAME, busName);
+ bean.getRawBeanDefinition().setAttribute(WIRE_BUS_NAME, busName);
}
-
- if (ctx != null
+
+ if (ctx != null
&& !ctx.getRegistry().containsBeanDefinition(WIRE_BUS_HANDLER)) {
- BeanDefinitionBuilder b
+ BeanDefinitionBuilder b
= BeanDefinitionBuilder.rootBeanDefinition(WIRE_BUS_HANDLER);
ctx.getRegistry().registerBeanDefinition(WIRE_BUS_HANDLER, b.getBeanDefinition());
}
}
-
- protected void mapElementToJaxbProperty(Element parent,
- BeanDefinitionBuilder bean,
+
+ protected void mapElementToJaxbProperty(Element parent,
+ BeanDefinitionBuilder bean,
QName name,
String propertyName) {
mapElementToJaxbProperty(parent, bean, name, propertyName, null);
}
-
- protected void mapElementToJaxbProperty(Element parent,
- BeanDefinitionBuilder bean,
+
+ protected void mapElementToJaxbProperty(Element parent,
+ BeanDefinitionBuilder bean,
QName name,
- String propertyName,
+ String propertyName,
Class<?> c) {
Element data = null;
-
+
Node node = parent.getFirstChild();
while (node != null) {
if (node.getNodeType() == Node.ELEMENT_NODE && name.getLocalPart().equals(node.getLocalName())
@@ -308,9 +308,9 @@ public abstract class AbstractBeanDefinitionParser
if (classes != null) {
tmp.addAll(classes);
}
- JAXBContextCache.addPackage(tmp, getJaxbPackage(),
- cls == null
- ? getClass().getClassLoader()
+ JAXBContextCache.addPackage(tmp, getJaxbPackage(),
+ cls == null
+ ? getClass().getClassLoader()
: cls.getClassLoader());
if (cls != null) {
boolean hasOf = false;
@@ -325,7 +325,7 @@ public abstract class AbstractBeanDefinitionParser
}
}
JAXBContextCache.scanPackages(tmp);
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(tmp, null, null, null, false);
classes = ccs.getClasses();
context = ccs.getContext();
@@ -336,9 +336,9 @@ public abstract class AbstractBeanDefinitionParser
return context;
}
- protected void mapElementToJaxbProperty(Element data,
- BeanDefinitionBuilder bean,
- String propertyName,
+ protected void mapElementToJaxbProperty(Element data,
+ BeanDefinitionBuilder bean,
+ String propertyName,
Class<?> c) {
try {
XMLStreamWriter xmlWriter = null;
@@ -348,8 +348,8 @@ public abstract class AbstractBeanDefinitionParser
xmlWriter = StaxUtils.createXMLStreamWriter(writer);
StaxUtils.copy(data, xmlWriter);
xmlWriter.flush();
-
- BeanDefinitionBuilder jaxbbean
+
+ BeanDefinitionBuilder jaxbbean
= BeanDefinitionBuilder.rootBeanDefinition(JAXBBeanFactory.class);
jaxbbean.getRawBeanDefinition().setFactoryMethodName("createJAXBBean");
jaxbbean.addConstructorArgValue(getContext(c));
@@ -382,26 +382,26 @@ public abstract class AbstractBeanDefinitionParser
}
- public void mapElementToJaxbPropertyFactory(Element data,
- BeanDefinitionBuilder bean,
- String propertyName,
+ public void mapElementToJaxbPropertyFactory(Element data,
+ BeanDefinitionBuilder bean,
+ String propertyName,
Class<?> type,
Class<?> factory,
String method,
Object ... args) {
- bean.addPropertyValue(propertyName, mapElementToJaxbBean(data,
+ bean.addPropertyValue(propertyName, mapElementToJaxbBean(data,
factory,
null, type, method, args));
}
- public AbstractBeanDefinition mapElementToJaxbBean(Element data,
+ public AbstractBeanDefinition mapElementToJaxbBean(Element data,
Class<?> cls,
Class<?> factory,
String method,
Object ... args) {
return mapElementToJaxbBean(data, cls, factory, cls, method, args);
- }
+ }
- public AbstractBeanDefinition mapElementToJaxbBean(Element data,
+ public AbstractBeanDefinition mapElementToJaxbBean(Element data,
Class<?> cls,
Class<?> factory,
Class<?> jaxbClass,
@@ -418,7 +418,7 @@ public abstract class AbstractBeanDefinitionParser
StaxUtils.close(xmlWriter);
}
- BeanDefinitionBuilder jaxbbean
+ BeanDefinitionBuilder jaxbbean
= BeanDefinitionBuilder.rootBeanDefinition(cls);
if (factory != null) {
jaxbbean.getRawBeanDefinition().setFactoryBeanName(factory.getName());
@@ -429,11 +429,11 @@ public abstract class AbstractBeanDefinitionParser
if (args != null) {
for (Object o : args) {
jaxbbean.addConstructorArgValue(o);
- }
+ }
}
return jaxbbean.getBeanDefinition();
}
-
+
protected static <T> T unmarshalFactoryString(String s, JAXBContext ctx, Class<T> cls) {
StringReader reader = new StringReader(s);
XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
@@ -455,7 +455,7 @@ public abstract class AbstractBeanDefinitionParser
JAXBUtils.closeUnmarshaller(u);
}
}
-
+
protected String getJaxbPackage() {
return "";
}
@@ -464,7 +464,7 @@ public abstract class AbstractBeanDefinitionParser
if (ID_ATTRIBUTE.equals(propertyName)) {
return;
}
-
+
if (!StringUtils.isEmpty(val)) {
if (val.startsWith("#") && !val.startsWith("#{")) {
bean.addPropertyReference(propertyName, val.substring(1));
@@ -473,7 +473,7 @@ public abstract class AbstractBeanDefinitionParser
}
}
}
-
+
protected boolean isAttribute(String pre, String name) {
return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
&& !"abstract".equals(name) && !"lazy-init".equals(name) && !"id".equals(name);
@@ -498,12 +498,12 @@ public abstract class AbstractBeanDefinitionParser
if (colIdx == -1) {
local = t;
pre = "";
-
+
ns = DOMUtils.getNamespace(element, "");
} else {
pre = t.substring(0, colIdx);
local = t.substring(colIdx + 1);
-
+
ns = DOMUtils.getNamespace(element, pre);
}
@@ -513,14 +513,14 @@ public abstract class AbstractBeanDefinitionParser
/* This id-or-name resolution logic follows that in Spring's
* org.springframework.beans.factory.xml.BeanDefinitionParserDelegate object
* Intent is to have resolution of CXF custom beans follow that of Spring beans
- */
+ */
protected String getIdOrName(Element elem) {
String id = elem.getAttribute(BeanDefinitionParserDelegate.ID_ATTRIBUTE);
-
+
if (null == id || "".equals(id)) {
String names = elem.getAttribute("name");
if (null != names) {
- StringTokenizer st =
+ StringTokenizer st =
new StringTokenizer(names, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
if (st.countTokens() > 0) {
id = st.nextToken();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
index b8ab25d..f3feb20 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
@@ -41,11 +41,11 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
public static void setFactoriesAreAbstract(boolean b) {
factoriesAreAbstract = b;
}
-
+
protected String getDestroyMethod() {
return null;
}
-
+
@Override
protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
Class<?> factoryClass = getFactoryClass();
@@ -54,7 +54,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
factoryBean = BeanDefinitionBuilder.rootBeanDefinition(getFactoryClass());
}
- NamedNodeMap atts = element.getAttributes();
+ NamedNodeMap atts = element.getAttributes();
boolean createdFromAPI = false;
boolean setBus = false;
for (int i = 0; i < atts.getLength(); i++) {
@@ -62,7 +62,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
String val = node.getValue();
String pre = node.getPrefix();
String name = node.getLocalName();
-
+
if ("createdFromAPI".equals(name)) {
factoryBean.setAbstract(true);
bean.setAbstract(true);
@@ -82,13 +82,13 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
}
}
mapAttribute(factoryBean, element, name, val);
- }
+ }
}
-
+
if (!setBus) {
addBusWiringAttribute(factoryBean, BusWiringType.PROPERTY);
}
-
+
Node node = element.getFirstChild();
while (node != null) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -97,7 +97,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
}
node = node.getNextSibling();
}
-
+
String id = getIdOrName(element);
BeanDefinition container = ctx.getContainingBeanDefinition();
boolean noFactory = false;
@@ -117,7 +117,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
if (createdFromAPI) {
id = id + getSuffix();
}
-
+
if (FactoryBean.class.isAssignableFrom(getFactoryClass())) {
if (!noFactory) {
AbstractBeanDefinition def = factoryBean.getRawBeanDefinition().cloneBeanDefinition();