You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/12/24 09:52:46 UTC
[cxf] branch master updated: use StringUtils.capitalize
This is an automated email from the ASF dual-hosted git repository.
buhhunyx 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 3e58250 use StringUtils.capitalize
3e58250 is described below
commit 3e5825057de2a8aacc06a5707649424cc62043df
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Dec 24 12:52:09 2019 +0300
use StringUtils.capitalize
---
.../cxf/common/injection/ResourceInjector.java | 8 +++----
.../org/apache/cxf/common/util/StringUtils.java | 23 ++++++++++--------
.../apache/cxf/common/util/StringUtilsTest.java | 23 ++++++++++++++++++
.../apache/cxf/aegis/type/AbstractTypeCreator.java | 5 ++--
.../org/apache/cxf/aegis/type/basic/BeanType.java | 3 ++-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 3 +--
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 3 +--
.../ext/search/AbstractSearchConditionParser.java | 8 +++----
.../jaxrs/ext/search/PrimitiveSearchCondition.java | 8 ++-----
.../visitor/AbstractSearchConditionVisitor.java | 8 ++-----
.../apache/cxf/transport/jms/uri/JMSEndpoint.java | 6 ++---
.../java/org/apache/cxf/tools/util/NameUtil.java | 15 +++---------
.../internal/SpringServiceBuilderFactory.java | 4 ++--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 27 +++++-----------------
.../misc/processor/address/AddressFactory.java | 4 ++--
15 files changed, 67 insertions(+), 81 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index dfc41ab..a4380c1 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -42,6 +42,7 @@ import org.apache.cxf.common.annotation.AnnotationProcessor;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ClassHelper;
import org.apache.cxf.common.util.ReflectionUtil;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
@@ -277,13 +278,10 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
return setterMethod;
}
-
- private String resourceNameToSetter(String resName) {
-
- return "set" + Character.toUpperCase(resName.charAt(0)) + resName.substring(1);
+ private static String resourceNameToSetter(String resName) {
+ return "set" + StringUtils.capitalize(resName);
}
-
private void invokeSetter(Method method, Object resource) {
try {
ReflectionUtil.setAccessible(method);
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 848fa99..47a6d81 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -111,22 +111,25 @@ public final class StringUtils {
* @return capitalized form.
*/
public static String capitalize(String name) {
- if (name == null || name.isEmpty()) {
- return name;
- }
- char[] chars = name.toCharArray();
- chars[0] = Character.toUpperCase(chars[0]);
- return new String(chars);
+ return changeFirstCharacterCase(name, true);
}
public static String uncapitalize(String str) {
+ return changeFirstCharacterCase(str, false);
+ }
+
+ private static String changeFirstCharacterCase(String str, boolean capitalize) {
if (str == null || str.isEmpty()) {
return str;
}
- return new StringBuilder(str.length())
- .append(Character.toLowerCase(str.charAt(0)))
- .append(str.substring(1))
- .toString();
+ char baseChar = str.charAt(0);
+ char updatedChar = capitalize ? Character.toUpperCase(baseChar) : Character.toLowerCase(baseChar);
+ if (baseChar == updatedChar) {
+ return str;
+ }
+ char[] chars = str.toCharArray();
+ chars[0] = updatedChar;
+ return new String(chars);
}
public static byte[] toBytesUTF8(String str) {
diff --git a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
index 689f51b..607c197 100644
--- a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
@@ -56,4 +56,27 @@ public class StringUtilsTest {
assertEquals("http://localhost:9090",
StringUtils.addDefaultPortIfMissing("http://localhost", "9090"));
}
+
+ @Test
+ public void testCapitalize() {
+ assertEquals(null, StringUtils.capitalize(null));
+ assertEquals("", StringUtils.capitalize(""));
+ assertEquals("A", StringUtils.capitalize("A"));
+ assertEquals("A", StringUtils.capitalize("a"));
+ assertEquals("Aa", StringUtils.capitalize("aa"));
+ assertEquals("Aa", StringUtils.capitalize("Aa"));
+ assertEquals("AA", StringUtils.capitalize("AA"));
+ }
+
+ @Test
+ public void testUncapitalize() {
+ assertEquals(null, StringUtils.uncapitalize(null));
+ assertEquals("", StringUtils.uncapitalize(""));
+ assertEquals("a", StringUtils.uncapitalize("A"));
+ assertEquals("a", StringUtils.uncapitalize("a"));
+ assertEquals("aa", StringUtils.uncapitalize("aa"));
+ assertEquals("aa", StringUtils.uncapitalize("Aa"));
+ assertEquals("aA", StringUtils.uncapitalize("AA"));
+ }
+
}
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
index 564cb0e..ce890cb 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
@@ -35,6 +35,7 @@ import org.apache.cxf.aegis.type.collection.CollectionType;
import org.apache.cxf.aegis.type.collection.MapType;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.aegis.util.ServiceUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.constants.Constants;
@@ -349,9 +350,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
ns = HTTP_CXF_APACHE_ORG_ARRAYS;
}
- String first = type.getSchemaType().getLocalPart().substring(0, 1);
- String last = type.getSchemaType().getLocalPart().substring(1);
- String localName = "ArrayOf" + first.toUpperCase() + last;
+ String localName = "ArrayOf" + StringUtils.capitalize(type.getSchemaType().getLocalPart());
if (info.nonDefaultAttributes()) {
localName += "-";
if (info.getMinOccurs() >= 0) {
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
index 12b9de8..4f95d72 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
@@ -44,6 +44,7 @@ import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
@@ -314,7 +315,7 @@ public class BeanType extends AegisType {
*/
private Method getWriteMethodFromImplClass(Class<?> impl, PropertyDescriptor pd) throws Exception {
String name = pd.getName();
- name = "set" + name.substring(0, 1).toUpperCase() + name.substring(1);
+ name = "set" + StringUtils.capitalize(name);
return impl.getMethod(name, new Class[] {
pd.getPropertyType()
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index fcdb3a4..efa87eb 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -578,8 +578,7 @@ public final class JAXBEncoderDecoder {
Utils.setFieldValue(f, obj, o);
}
} else {
- String s = Character.toUpperCase(q.getLocalPart().charAt(0))
- + q.getLocalPart().substring(1);
+ String s = StringUtils.capitalize(q.getLocalPart());
Method m = Utils.getMethod(cls, accessType, "get" + s);
if (m == null) {
m = Utils.getMethod(cls, accessType, "is" + s);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index c8f1647..857c2f4 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -479,8 +479,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
methodsMap.put(m.getName(), m);
}
for (Map.Entry<String, List<String>> entry : props.entrySet()) {
- Method m = methodsMap.get("set" + Character.toUpperCase(entry.getKey().charAt(0))
- + entry.getKey().substring(1));
+ Method m = methodsMap.get("set" + StringUtils.capitalize(entry.getKey()));
if (m != null) {
Class<?> type = m.getParameterTypes()[0];
Object value;
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
index ce813c6..614b8c1 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
@@ -35,6 +35,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import org.apache.cxf.common.util.PropertyUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.search.Beanspector.TypeInfo;
import org.apache.cxf.jaxrs.ext.search.collections.CollectionCheck;
import org.apache.cxf.jaxrs.ext.search.collections.CollectionCheckInfo;
@@ -332,11 +333,8 @@ public abstract class AbstractSearchConditionParser<T> implements SearchConditio
return df.parse(dateValue);
}
- private String getMethodNameSuffix(String name) {
- if (name.length() == 1) {
- return name.toUpperCase();
- }
- return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+ private static String getMethodNameSuffix(String name) {
+ return StringUtils.capitalize(name);
}
private int getDotIndex(String setter) {
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
index d45e9b5..d9e6048 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
public class PrimitiveSearchCondition<T> implements SearchCondition<T> {
@@ -220,12 +221,7 @@ public class PrimitiveSearchCondition<T> implements SearchCondition<T> {
name = name.substring(index + 1);
if (value != null && !InjectionUtils.isPrimitive(value.getClass())) {
try {
- String nextPart = names[1];
- if (nextPart.length() == 1) {
- nextPart = nextPart.toUpperCase();
- } else {
- nextPart = Character.toUpperCase(nextPart.charAt(0)) + nextPart.substring(1);
- }
+ String nextPart = StringUtils.capitalize(names[1]);
Method m = value.getClass().getMethod("get" + nextPart, new Class[]{});
value = m.invoke(value, new Object[]{});
} catch (Throwable ex) {
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/visitor/AbstractSearchConditionVisitor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/visitor/AbstractSearchConditionVisitor.java
index 9c73101..83ccd75 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/visitor/AbstractSearchConditionVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/visitor/AbstractSearchConditionVisitor.java
@@ -27,6 +27,7 @@ import java.util.Set;
import javax.ws.rs.ext.ParamConverterProvider;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.search.DefaultParamConverterProvider;
import org.apache.cxf.jaxrs.ext.search.PrimitiveStatement;
import org.apache.cxf.jaxrs.ext.search.SearchConditionVisitor;
@@ -81,12 +82,7 @@ public abstract class AbstractSearchConditionVisitor <T, E> implements SearchCon
name = name.substring(index + 1);
if (value != null && !InjectionUtils.isPrimitive(actualCls)) {
try {
- String nextPart = names[1];
- if (nextPart.length() == 1) {
- nextPart = nextPart.toUpperCase();
- } else {
- nextPart = Character.toUpperCase(nextPart.charAt(0)) + nextPart.substring(1);
- }
+ String nextPart = StringUtils.capitalize(names[1]);
Method m = actualCls.getMethod("get" + nextPart, new Class[]{});
if (isCollection) {
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index eaf810b..8d0f5ba 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -161,10 +161,8 @@ public class JMSEndpoint {
}
}
- private String getPropSetterName(String name) {
- String first = name.substring(0, 1);
- String rest = name.substring(1);
- return "set" + first.toUpperCase() + rest;
+ private static String getPropSetterName(String name) {
+ return "set" + StringUtils.capitalize(name);
}
/**
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
index 082f800..47f93d4 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
@@ -22,6 +22,7 @@ package org.apache.cxf.tools.util;
import java.util.ArrayList;
import java.util.List;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.JavaUtils;
public final class NameUtil {
@@ -60,16 +61,6 @@ public final class NameUtil {
return c >= 'a' && c <= 'z' || Character.isLowerCase(c);
}
- public static String capitalize(String s) {
- if (!isLower(s.charAt(0))) {
- return s;
- }
- StringBuilder sb = new StringBuilder(s.length());
- sb.append(Character.toUpperCase(s.charAt(0)));
- sb.append(s.substring(1).toLowerCase());
- return sb.toString();
- }
-
private static int nextBreak(String s, int start, boolean allowUnderscore) {
int n = s.length();
@@ -165,7 +156,7 @@ public final class NameUtil {
int b = nextBreak(s, i, allowUnderscore);
String w = (b == -1) ? s.substring(i) : s.substring(i, b);
- ss.add(escape(capitalize(w)));
+ ss.add(escape(StringUtils.capitalize(w)));
if (b == -1) {
break;
}
@@ -191,7 +182,7 @@ public final class NameUtil {
boolean cdrUpper) {
if (cdrUpper) {
for (int i = 1; i < ss.length; i++) {
- ss[i] = capitalize(ss[i]);
+ ss[i] = StringUtils.capitalize(ss[i]);
}
}
StringBuilder sb = new StringBuilder();
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
index 41814a3..a70cec5 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
@@ -26,13 +26,13 @@ import java.util.List;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.frontend.AbstractServiceFactory;
import org.apache.cxf.service.ServiceBuilder;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory;
-import org.apache.cxf.tools.util.NameUtil;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
@@ -65,7 +65,7 @@ public final class SpringServiceBuilderFactory extends ServiceBuilderFactory {
* @return
*/
public static String databindingNameToBeanName(String dbName) {
- return NameUtil.capitalize(dbName.toLowerCase()) + ToolConstants.DATABIND_BEAN_NAME_SUFFIX;
+ return StringUtils.capitalize(dbName.toLowerCase()) + ToolConstants.DATABIND_BEAN_NAME_SUFFIX;
}
@Override
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 10726f0..05773bc 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -443,7 +443,7 @@ public class SourceGenerator {
StringBuilder builder = new StringBuilder(resourceId);
for (int i = 0; i < split.length; i++) {
if (!split[i].isEmpty()) {
- builder.append(split[i].toUpperCase().charAt(0)).append(split[i].substring(1));
+ builder.append(StringUtils.capitalize(split[i]));
}
}
resourceId = builder.toString();
@@ -538,10 +538,9 @@ public class SourceGenerator {
} else {
name = generateInterfaces ? clsName + "Impl" : clsName;
}
- name = firstCharToUpperCase(name);
+ name = StringUtils.capitalize(name);
for (String typeName : typeClassNames) {
- String localName = typeName.contains(".")
- ? typeName.substring(typeName.lastIndexOf('.') + 1) : typeName;
+ String localName = typeName.substring(typeName.lastIndexOf('.') + 1);
if (name.equalsIgnoreCase(localName)) {
name += "Resource";
}
@@ -549,20 +548,6 @@ public class SourceGenerator {
return name;
}
- private String firstCharToUpperCase(String name) {
- if (!name.isEmpty() && Character.isLowerCase(name.charAt(0))) {
- return StringUtils.capitalize(name);
- }
- return name;
- }
-
- private String firstCharToLowerCase(String name) {
- if (!name.isEmpty() && Character.isUpperCase(name.charAt(0))) {
- return StringUtils.uncapitalize(name);
- }
- return name;
- }
-
private boolean writeAnnotations(boolean interfaceIsGenerated) {
if (interfaceIsGenerated) {
return true;
@@ -769,7 +754,7 @@ public class SourceGenerator {
}
sb.append(pathSeg);
}
- genMethodName += firstCharToUpperCase(sb.toString());
+ genMethodName += StringUtils.capitalize(sb.toString());
}
genMethodName = genMethodName.replace("-", "");
@@ -1267,7 +1252,7 @@ public class SourceGenerator {
} else {
paramName = name.replaceAll("[:\\.\\-]", "_");
}
- String javaParamName = firstCharToLowerCase(paramName);
+ String javaParamName = StringUtils.uncapitalize(paramName);
sbCode.append(type).append(' ').append(javaParamName);
if (i + 1 < inParamEls.size()) {
sbCode.append(", ");
@@ -1432,7 +1417,7 @@ public class SourceGenerator {
return sb;
}
- private String getTypicalClassName(String name) {
+ private static String getTypicalClassName(String name) {
String theName = name.toUpperCase();
if (theName.length() == 1) {
return theName;
diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java
index d371431..a948629 100644
--- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java
+++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java
@@ -25,8 +25,8 @@ import java.util.logging.Logger;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.util.NameUtil;
public final class AddressFactory {
private static final Logger LOG = LogUtils.getL7dLogger(AddressFactory.class);
@@ -52,7 +52,7 @@ public final class AddressFactory {
StringBuilder sb = new StringBuilder();
sb.append(PREFIX);
sb.append('.');
- sb.append(NameUtil.capitalize(name));
+ sb.append(StringUtils.capitalize(name));
sb.append("Address");
try {
address = (Address) Class.forName(sb.toString()).newInstance();