Author: coheigea
Date: Mon Oct 8 11:04:07 2012
New Revision: 1395513
URL: http://svn.apache.org/viewvc?rev=1395513&view=rev
Log:
Some more cleanup work.
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlPrimitive.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
(original)
+++
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
Mon Oct 8 11:04:07 2012
@@ -43,6 +43,7 @@ public class Context {
public Context(AegisContext aegisContext) {
this.globalContext = aegisContext;
this.properties = new HashMap<Class<?>, Object>();
+ this.namedProperties = new HashMap<String, Object>();
}
public TypeMapping getTypeMapping() {
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java
(original)
+++
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java
Mon Oct 8 11:04:07 2012
@@ -29,7 +29,7 @@ import org.apache.cxf.aegis.xml.MessageW
public class DoubleType extends AegisType {
@Override
public Object readObject(MessageReader reader, Context context) {
- return new Double(reader.getValueAsDouble());
+ return Double.valueOf(reader.getValueAsDouble());
}
@Override
@@ -37,7 +37,7 @@ public class DoubleType extends AegisTyp
if (object instanceof Double) {
writer.writeValueAsDouble((Double)object);
} else {
- writer.writeValueAsDouble(new
Double(((Number)object).doubleValue()));
+
writer.writeValueAsDouble(Double.valueOf(((Number)object).doubleValue()));
}
}
}
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java
(original)
+++
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java
Mon Oct 8 11:04:07 2012
@@ -30,7 +30,7 @@ public class FloatType extends AegisType
@Override
public Object readObject(MessageReader reader, Context context) {
- return new Float(reader.getValueAsFloat());
+ return Float.valueOf(reader.getValueAsFloat());
}
@Override
@@ -38,7 +38,7 @@ public class FloatType extends AegisType
if (object instanceof Float) {
writer.writeValueAsFloat((Float)object);
} else {
- writer.writeValueAsFloat(new Float(((Number)object).floatValue()));
+
writer.writeValueAsFloat(Float.valueOf(((Number)object).floatValue()));
}
}
}
Modified:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
(original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
Mon Oct 8 11:04:07 2012
@@ -121,7 +121,7 @@ public class WrappedEndpoint implements
}
public Object get(Object key) {
- if (MAPAggregator.USING_ADDRESSING == key) {
+ if (MAPAggregator.USING_ADDRESSING.equals(key)) {
return usingAddressing;
}
return wrappedEndpoint.get(key);
@@ -136,7 +136,7 @@ public class WrappedEndpoint implements
}
public Object put(String key, Object value) {
- if (MAPAggregator.USING_ADDRESSING == key) {
+ if (MAPAggregator.USING_ADDRESSING.equals(key)) {
usingAddressing = (Boolean)value;
return null;
}
Modified:
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
---
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
(original)
+++
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java
Mon Oct 8 11:04:07 2012
@@ -114,7 +114,7 @@ public class SymmetricKeyHandler {
if (((long)secretValue.length * 8L) <
signatureProperties.getMinimumKeySize()
|| ((long)secretValue.length * 8L) >
signatureProperties.getMaximumKeySize()) {
LOG.log(
- Level.WARNING, "Received secret of length " +
secret.length
+ Level.WARNING, "Received secret of length " +
secretValue.length
+ " bits is not accepted"
);
LOG.log(Level.WARNING, "User Entropy rejected");
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlPrimitive.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlPrimitive.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlPrimitive.java
(original)
+++
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlPrimitive.java
Mon Oct 8 11:04:07 2012
@@ -54,92 +54,92 @@ public final class IdlPrimitive extends
switch (type) {
case LONG:
- name = new String("long");
- wsdlName = new String("long");
+ name = "long";
+ wsdlName = "long";
break;
case ULONG:
- name = new String("unsigned long");
- wsdlName = new String("ulong");
+ name = "unsigned long";
+ wsdlName = "ulong";
break;
case LONGLONG:
- name = new String("long long");
- wsdlName = new String("longlong");
+ name = "long long";
+ wsdlName = "longlong";
break;
case ULONGLONG:
- name = new String("unsigned long long");
- wsdlName = new String("ulonglong");
+ name = "unsigned long long";
+ wsdlName = "ulonglong";
break;
case SHORT:
- name = new String("short");
- wsdlName = new String("short");
+ name = "short";
+ wsdlName = "short";
break;
case USHORT:
- name = new String("unsigned short");
- wsdlName = new String("ushort");
+ name = "unsigned short";
+ wsdlName = "ushort";
break;
case FLOAT:
- name = new String("float");
- wsdlName = new String("float");
+ name = "float";
+ wsdlName = "float";
break;
case DOUBLE:
- name = new String("double");
- wsdlName = new String("double");
+ name = "double";
+ wsdlName = "double";
break;
case LONGDOUBLE:
- name = new String("long double");
- wsdlName = new String("longdouble");
+ name = "long double";
+ wsdlName = "longdouble";
break;
case CHAR:
- name = new String("char");
- wsdlName = new String("char");
+ name = "char";
+ wsdlName = "char";
break;
case WCHAR:
- name = new String("wchar");
- wsdlName = new String("wchar");
+ name = "wchar";
+ wsdlName = "wchar";
break;
case BOOLEAN:
- name = new String("boolean");
- wsdlName = new String("boolean");
+ name = "boolean";
+ wsdlName = "boolean";
break;
case OCTET:
- name = new String("octet");
- wsdlName = new String("octet");
+ name = "octet";
+ wsdlName = "octet";
break;
case ANY:
- name = new String("any");
- wsdlName = new String("any");
+ name = "any";
+ wsdlName = "any";
break;
case DATETIME:
- name = new String("TimeBase::UtcT");
- wsdlName = new String("dateTime");
+ name = "TimeBase::UtcT";
+ wsdlName = "dateTime";
break;
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java?rev=1395513&r1=1395512&r2=1395513&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
(original)
+++
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
Mon Oct 8 11:04:07 2012
@@ -263,7 +263,7 @@ public class WSDLToCorbaBinding {
// jwsdl model should have all other bindings in it.
String pfx = definition.getPrefix(CorbaConstants.NU_WSDL_CORBA);
if (pfx == null) {
- pfx = new String("corba");
+ pfx = "corba";
def.addNamespace(pfx, CorbaConstants.NU_WSDL_CORBA);
}
@@ -322,7 +322,7 @@ public class WSDLToCorbaBinding {
String corbaPrefix =
definition.getPrefix(CorbaConstants.NU_WSDL_CORBA);
if (corbaPrefix == null) {
- corbaPrefix = new String("corba");
+ corbaPrefix = "corba";
def.addNamespace(corbaPrefix, CorbaConstants.NU_WSDL_CORBA);
}
