You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/03/08 18:15:05 UTC
svn commit: r516103 [2/11] - in /incubator/cxf/trunk: ./
common/common/src/test/java/org/apache/cxf/common/annotation/
common/common/src/test/java/org/apache/cxf/common/classloader/
common/common/src/test/java/org/apache/cxf/common/commands/ common/com...
Modified: incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/MtomTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/MtomTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/MtomTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/mtom/MtomTest.java Thu Mar 8 09:14:44 2007
@@ -32,9 +32,11 @@
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.person.Person;
import org.apache.cxf.service.invoker.BeanInvoker;
+import org.junit.Test;
public class MtomTest extends AbstractRestTest {
+ @Test
public void testService() throws Exception {
BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class);
bfm.registerBindingFactory(HttpBindingFactory.HTTP_BINDING_ID, new HttpBindingFactory());
Modified: incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/wrapped/WrappedServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/wrapped/WrappedServiceTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/wrapped/WrappedServiceTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/wrapped/WrappedServiceTest.java Thu Mar 8 09:14:44 2007
@@ -32,9 +32,11 @@
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.model.BindingOperationInfo;
+import org.junit.Test;
public class WrappedServiceTest extends AbstractRestTest {
+ @Test
public void testConvention() throws Exception {
HttpBindingInfoFactoryBean hbif = new HttpBindingInfoFactoryBean();
hbif.getStrategies().clear();
@@ -43,6 +45,7 @@
testService(hbif);
}
+ @Test
public void testJRA() throws Exception {
testService(new HttpBindingInfoFactoryBean());
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java Thu Mar 8 09:14:44 2007
@@ -37,8 +37,11 @@
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.test.AbstractCXFTest;
+import org.junit.Test;
public class SoapFaultSerializerTest extends AbstractCXFTest {
+
+ @Test
public void testSoap11Out() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap11.getInstance().getSender());
@@ -79,6 +82,7 @@
assertEquals(Soap11.getInstance().getSender(), fault2.getFaultCode());
}
+ @Test
public void testSoap12Out() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap12.getInstance().getSender());
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java Thu Mar 8 09:14:44 2007
@@ -35,8 +35,6 @@
import org.xml.sax.SAXParseException;
-import junit.framework.TestCase;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
@@ -49,11 +47,14 @@
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.MessageObserver;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
/**
* A basic test case meant for helping users unit test their services.
*/
-public class AbstractCXFTest extends TestCase {
+public class AbstractCXFTest extends Assert {
private static String basedirPath;
@@ -64,26 +65,30 @@
private Map<String, String> namespaces = new HashMap<String, String>();
-
- public void setUp() throws Exception {
- bus = createBus();
-
- addNamespace("s", "http://schemas.xmlsoap.org/soap/envelope/");
- addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
- addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
- addNamespace("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
- addNamespace("soap", "http://schemas.xmlsoap.org/soap/");
- addNamespace("soap12env", "http://www.w3.org/2003/05/soap-envelope");
- addNamespace("xml", "http://www.w3.org/XML/1998/namespace");
+ @Before
+ public void setUpBus() throws Exception {
+ if (bus == null) {
+ bus = createBus();
+
+ addNamespace("s", "http://schemas.xmlsoap.org/soap/envelope/");
+ addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
+ addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
+ addNamespace("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
+ addNamespace("soap", "http://schemas.xmlsoap.org/soap/");
+ addNamespace("soap12env", "http://www.w3.org/2003/05/soap-envelope");
+ addNamespace("xml", "http://www.w3.org/XML/1998/namespace");
+ }
}
public Bus getBus() {
return bus;
}
- public void tearDown() {
+ @After
+ public void shutdownBus() {
if (bus != null) {
bus.shutdown(false);
+ bus = null;
}
BusFactory.setDefaultBus(null);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Thu Mar 8 09:14:44 2007
@@ -33,10 +33,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <properties>
- <topDirectoryLocation>../../..</topDirectoryLocation>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -94,7 +90,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
@@ -152,31 +147,6 @@
</configuration>
<goals>
<goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
</goals>
</execution>
</executions>
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Aegis.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Aegis.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Aegis.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Aegis.java Thu Mar 8 09:14:44 2007
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class Aegis {
+public final class Aegis {
public static final Log LOG = LogFactory.getLog(Aegis.class);
public static final String CURRENT_MESSAGE_PART = "currentMessagePart";
@@ -45,6 +45,10 @@
public static final String OVERRIDE_TYPES_KEY = "overrideTypesList";
+ private Aegis() {
+ //utility class
+ }
+
public static Type getReadType(XMLStreamReader xsr, Context context, Type type) {
String overrideType = xsr.getAttributeValue(XmlConstants.XSI_NS, "type");
if (overrideType != null) {
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java Thu Mar 8 09:14:44 2007
@@ -20,7 +20,6 @@
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.message.Attachment;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java Thu Mar 8 09:14:44 2007
@@ -28,8 +28,10 @@
* @since Feb 14, 2004
*/
public class DatabindingException extends RuntimeException {
+
private final Throwable cause;
private String message2;
+
/**
* Constructs a new exception with the specified detail
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java Thu Mar 8 09:14:44 2007
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.aegis.databinding;
-import java.lang.reflect.Method;
-
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.service.factory.AbstractServiceConfiguration;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceFactoryBean.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceFactoryBean.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cxf.aegis.databinding;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java Thu Mar 8 09:14:44 2007
@@ -19,7 +19,6 @@
package org.apache.cxf.aegis.databinding;
import java.util.Collection;
-import java.util.List;
import java.util.logging.Logger;
import javax.xml.stream.XMLStreamWriter;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java Thu Mar 8 09:14:44 2007
@@ -111,15 +111,12 @@
}
- protected boolean isHolder(Class javaType)
- {
+ protected boolean isHolder(Class javaType) {
return javaType.equals(Holder.class);
}
- protected Type createHolderType(TypeClassInfo info)
- {
- if (info.getGenericType() == null)
- {
+ protected Type createHolderType(TypeClassInfo info) {
+ if (info.getGenericType() == null) {
throw new UnsupportedOperationException("To use holder types "
+ "you must have an XML descriptor declaring the component type.");
}
@@ -346,8 +343,8 @@
return typeConfiguration;
}
- public void setConfiguration(Configuration typeConfiguration) {
- this.typeConfiguration = typeConfiguration;
+ public void setConfiguration(Configuration tpConfiguration) {
+ this.typeConfiguration = tpConfiguration;
}
public static class TypeClassInfo {
@@ -369,7 +366,7 @@
long minOccurs = -1;
long maxOccurs = -1;
- boolean flat = false;
+ boolean flat;
public String getDescription() {
return description;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Configuration.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Configuration.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Configuration.java Thu Mar 8 09:14:44 2007
@@ -19,13 +19,13 @@
package org.apache.cxf.aegis.type;
public class Configuration {
- private boolean defaultExtensibleElements = false;
+ private boolean defaultExtensibleElements;
- private boolean defaultExtensibleAttributes = false;
+ private boolean defaultExtensibleAttributes;
private boolean defaultNillable = true;
- private int defaultMinOccurs = 0;
+ private int defaultMinOccurs;
public boolean isDefaultExtensibleAttributes() {
return defaultExtensibleAttributes;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/CustomTypeMapping.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/CustomTypeMapping.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/CustomTypeMapping.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/CustomTypeMapping.java Thu Mar 8 09:14:44 2007
@@ -104,7 +104,8 @@
LOG
.warn("The type "
+ type.getClass().getName()
- + " supports neither serialization (non-null TypeClass) nor deserialization (non-null SchemaType).");
+ + " supports neither serialization (non-null TypeClass)"
+ + " nor deserialization (non-null SchemaType).");
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMappingRegistry.java Thu Mar 8 09:14:44 2007
@@ -77,50 +77,54 @@
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
* @since Feb 22, 2004
*/
-public class DefaultTypeMappingRegistry implements TypeMappingRegistry {
- private static final Log logger = LogFactory.getLog(DefaultTypeMappingRegistry.class);
-
- protected static final QName XSD_STRING = new QName(XmlConstants.XSD, "string", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_LONG = new QName(XmlConstants.XSD, "long", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_FLOAT = new QName(XmlConstants.XSD, "float", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_DOUBLE = new QName(XmlConstants.XSD, "double", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_INT = new QName(XmlConstants.XSD, "int", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_SHORT = new QName(XmlConstants.XSD, "short", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_BOOLEAN = new QName(XmlConstants.XSD, "boolean", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_DATETIME = new QName(XmlConstants.XSD, "dateTime",
+public final class DefaultTypeMappingRegistry implements TypeMappingRegistry {
+ static final QName XSD_STRING = new QName(XmlConstants.XSD, "string", XmlConstants.XSD_PREFIX);
+ static final QName XSD_LONG = new QName(XmlConstants.XSD, "long", XmlConstants.XSD_PREFIX);
+ static final QName XSD_FLOAT = new QName(XmlConstants.XSD, "float", XmlConstants.XSD_PREFIX);
+ static final QName XSD_DOUBLE = new QName(XmlConstants.XSD, "double", XmlConstants.XSD_PREFIX);
+ static final QName XSD_INT = new QName(XmlConstants.XSD, "int", XmlConstants.XSD_PREFIX);
+ static final QName XSD_SHORT = new QName(XmlConstants.XSD, "short", XmlConstants.XSD_PREFIX);
+ static final QName XSD_BOOLEAN = new QName(XmlConstants.XSD,
+ "boolean", XmlConstants.XSD_PREFIX);
+ static final QName XSD_DATETIME = new QName(XmlConstants.XSD, "dateTime",
XmlConstants.XSD_PREFIX);
- protected static final QName XSD_TIME = new QName(XmlConstants.XSD, "dateTime", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_BASE64 = new QName(XmlConstants.XSD, "base64Binary",
+ static final QName XSD_TIME = new QName(XmlConstants.XSD, "dateTime", XmlConstants.XSD_PREFIX);
+ static final QName XSD_BASE64 = new QName(XmlConstants.XSD, "base64Binary",
XmlConstants.XSD_PREFIX);
- protected static final QName XSD_DECIMAL = new QName(XmlConstants.XSD, "decimal", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_INTEGER = new QName(XmlConstants.XSD, "integer", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_URI = new QName(XmlConstants.XSD, "anyURI", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_ANY = new QName(XmlConstants.XSD, "anyType", XmlConstants.XSD_PREFIX);
+ static final QName XSD_DECIMAL = new QName(XmlConstants.XSD,
+ "decimal", XmlConstants.XSD_PREFIX);
+ static final QName XSD_INTEGER = new QName(XmlConstants.XSD,
+ "integer", XmlConstants.XSD_PREFIX);
+ static final QName XSD_URI = new QName(XmlConstants.XSD, "anyURI", XmlConstants.XSD_PREFIX);
+ static final QName XSD_ANY = new QName(XmlConstants.XSD, "anyType", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_DATE = new QName(XmlConstants.XSD, "date", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_DURATION = new QName(XmlConstants.XSD, "duration",
+ static final QName XSD_DATE = new QName(XmlConstants.XSD, "date", XmlConstants.XSD_PREFIX);
+ static final QName XSD_DURATION = new QName(XmlConstants.XSD, "duration",
XmlConstants.XSD_PREFIX);
- protected static final QName XSD_G_YEAR_MONTH = new QName(XmlConstants.XSD, "gYearMonth",
+ static final QName XSD_G_YEAR_MONTH = new QName(XmlConstants.XSD, "gYearMonth",
XmlConstants.XSD_PREFIX);
- protected static final QName XSD_G_MONTH_DAY = new QName(XmlConstants.XSD, "gMonthDay",
+ static final QName XSD_G_MONTH_DAY = new QName(XmlConstants.XSD, "gMonthDay",
XmlConstants.XSD_PREFIX);
- protected static final QName XSD_G_YEAR = new QName(XmlConstants.XSD, "gYear", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_G_MONTH = new QName(XmlConstants.XSD, "gMonth", XmlConstants.XSD_PREFIX);
- protected static final QName XSD_G_DAY = new QName(XmlConstants.XSD, "gDay", XmlConstants.XSD_PREFIX);
-
- protected static final String ENCODED_NS = Soap11.getInstance().getSoapEncodingStyle();
- protected static final QName ENCODED_STRING = new QName(ENCODED_NS, "string");
- protected static final QName ENCODED_LONG = new QName(ENCODED_NS, "long");
- protected static final QName ENCODED_FLOAT = new QName(ENCODED_NS, "float");
- protected static final QName ENCODED_CHAR = new QName(ENCODED_NS, "char");
- protected static final QName ENCODED_DOUBLE = new QName(ENCODED_NS, "double");
- protected static final QName ENCODED_INT = new QName(ENCODED_NS, "int");
- protected static final QName ENCODED_SHORT = new QName(ENCODED_NS, "short");
- protected static final QName ENCODED_BOOLEAN = new QName(ENCODED_NS, "boolean");
- protected static final QName ENCODED_DATETIME = new QName(ENCODED_NS, "dateTime");
- protected static final QName ENCODED_BASE64 = new QName(ENCODED_NS, "base64Binary");
- protected static final QName ENCODED_DECIMAL = new QName(ENCODED_NS, "decimal");
- protected static final QName ENCODED_INTEGER = new QName(ENCODED_NS, "integer");
+ static final QName XSD_G_YEAR = new QName(XmlConstants.XSD, "gYear", XmlConstants.XSD_PREFIX);
+ static final QName XSD_G_MONTH = new QName(XmlConstants.XSD, "gMonth", XmlConstants.XSD_PREFIX);
+ static final QName XSD_G_DAY = new QName(XmlConstants.XSD, "gDay", XmlConstants.XSD_PREFIX);
+
+ static final String ENCODED_NS = Soap11.getInstance().getSoapEncodingStyle();
+ static final QName ENCODED_STRING = new QName(ENCODED_NS, "string");
+ static final QName ENCODED_LONG = new QName(ENCODED_NS, "long");
+ static final QName ENCODED_FLOAT = new QName(ENCODED_NS, "float");
+ static final QName ENCODED_CHAR = new QName(ENCODED_NS, "char");
+ static final QName ENCODED_DOUBLE = new QName(ENCODED_NS, "double");
+ static final QName ENCODED_INT = new QName(ENCODED_NS, "int");
+ static final QName ENCODED_SHORT = new QName(ENCODED_NS, "short");
+ static final QName ENCODED_BOOLEAN = new QName(ENCODED_NS, "boolean");
+ static final QName ENCODED_DATETIME = new QName(ENCODED_NS, "dateTime");
+ static final QName ENCODED_BASE64 = new QName(ENCODED_NS, "base64Binary");
+ static final QName ENCODED_DECIMAL = new QName(ENCODED_NS, "decimal");
+ static final QName ENCODED_INTEGER = new QName(ENCODED_NS, "integer");
+
+ private static final Log LOG = LogFactory.getLog(DefaultTypeMappingRegistry.class);
+
private Map<String, TypeMapping> registry;
@@ -236,11 +240,11 @@
j5Creator.setConfiguration(getConfiguration());
xmlCreator.setNextCreator(j5Creator);
} catch (Throwable t) {
- logger
- .info("Couldn't find Java 5 module on classpath. Annotation mappings will not be supported.");
+ LOG.info("Couldn't find Java 5 module on classpath. Annotation"
+ + " mappings will not be supported.");
if (!(t instanceof ClassNotFoundException)) {
- logger.debug("Error loading Java 5 module", t);
+ LOG.debug("Error loading Java 5 module", t);
}
}
}
@@ -250,7 +254,7 @@
boolean isJDK5andAbove() {
String v = System.getProperty("java.class.version", "44.0");
- return ("49.0".compareTo(v) <= 0);
+ return "49.0".compareTo(v) <= 0;
}
protected AbstractTypeCreator createRootTypeCreator() {
@@ -284,7 +288,7 @@
}
}
- return (n > 0);
+ return n > 0;
}
/**
@@ -419,7 +423,8 @@
}
}
- protected void registerIfAvailable(TypeMapping tm, String className, QName typeName, String typeClassName) {
+ protected void registerIfAvailable(TypeMapping tm, String className,
+ QName typeName, String typeClassName) {
try {
Class cls = ClassLoaderUtils.loadClass(className, getClass());
Class typeCls = ClassLoaderUtils.loadClass(typeClassName, getClass());
@@ -433,7 +438,7 @@
throw new DatabindingException("Couldn't instantiate Type ", e);
}
} catch (ClassNotFoundException e) {
- logger.debug("Could not find optional Type " + className + ". Skipping.");
+ LOG.debug("Could not find optional Type " + className + ". Skipping.");
}
}
@@ -450,8 +455,8 @@
return typeConfiguration;
}
- public void setConfiguration(Configuration typeConfiguration) {
- this.typeConfiguration = typeConfiguration;
+ public void setConfiguration(Configuration tpConfiguration) {
+ this.typeConfiguration = tpConfiguration;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Type.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Type.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Type.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/Type.java Thu Mar 8 09:14:44 2007
@@ -117,8 +117,8 @@
return abstrct;
}
- public void setAbstract(boolean abstrct) {
- this.abstrct = abstrct;
+ public void setAbstract(boolean ab) {
+ this.abstrct = ab;
}
public boolean isNillable() {
@@ -201,10 +201,10 @@
StringBuffer sb = new StringBuffer(getClass().getName());
sb.append("[class=");
Class c = getTypeClass();
- sb.append((c == null) ? ("<null>") : (c.getName()));
+ sb.append((c == null) ? "<null>" : c.getName());
sb.append(",\nQName=");
QName q = getSchemaType();
- sb.append((q == null) ? ("<null>") : (q.toString()));
+ sb.append((q == null) ? "<null>" : q.toString());
sb.append("]");
return sb.toString();
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java Thu Mar 8 09:14:44 2007
@@ -35,25 +35,25 @@
* specified XML type and Java type is registered; otherwise
* <code>false</code>
*/
- public boolean isRegistered(Class javaType);
+ boolean isRegistered(Class javaType);
- public boolean isRegistered(QName xmlType);
+ boolean isRegistered(QName xmlType);
- public void register(Class javaType, QName xmlType, Type type);
+ void register(Class javaType, QName xmlType, Type type);
- public void register(Type type);
+ void register(Type type);
- public void removeType(Type type);
+ void removeType(Type type);
- public Type getType(Class javaType);
+ Type getType(Class javaType);
- public Type getType(QName xmlType);
+ Type getType(QName xmlType);
- public QName getTypeQName(Class clazz);
+ QName getTypeQName(Class clazz);
- public String getEncodingStyleURI();
+ String getEncodingStyleURI();
- public void setEncodingStyleURI(String encodingStyleURI);
+ void setEncodingStyleURI(String encodingStyleURI);
- public TypeCreator getTypeCreator();
+ TypeCreator getTypeCreator();
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMappingRegistry.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMappingRegistry.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMappingRegistry.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMappingRegistry.java Thu Mar 8 09:14:44 2007
@@ -29,11 +29,11 @@
/**
*/
- public TypeMapping register(String encodingStyleURI, TypeMapping mapping);
+ TypeMapping register(String encodingStyleURI, TypeMapping mapping);
/**
*/
- public void registerDefault(TypeMapping mapping);
+ void registerDefault(TypeMapping mapping);
/**
* Gets the registered default <code>TypeMapping</code> instance. This
@@ -43,7 +43,7 @@
* @return The registered default <code>TypeMapping</code> instance or
* <code>null</code>.
*/
- public TypeMapping getDefaultTypeMapping();
+ TypeMapping getDefaultTypeMapping();
/**
* Returns a list of registered encodingStyle URIs in this
@@ -51,7 +51,7 @@
*
* @return Array of the registered encodingStyle URIs
*/
- public String[] getRegisteredEncodingStyleURIs();
+ String[] getRegisteredEncodingStyleURIs();
/**
* Returns the registered <code>TypeMapping</code> for the specified
@@ -63,14 +63,14 @@
* @return TypeMapping for the specified encodingStyleURI or
* <code>null</code>
*/
- public TypeMapping getTypeMapping(String encodingStyleURI);
+ TypeMapping getTypeMapping(String encodingStyleURI);
/**
* Creates a new empty <code>TypeMapping</code> object.
*
* @return TypeMapping instance.
*/
- public TypeMapping createTypeMapping(boolean autoTypes);
+ TypeMapping createTypeMapping(boolean autoTypes);
/**
* Create a type mapping with the specified encodying style.
@@ -80,7 +80,7 @@
* @param autoTypes Should this mapping auto-generate types where possible
* @return TypeMapping instance
*/
- public TypeMapping createTypeMapping(String parentEncodingStyleURI, boolean autoTypes);
+ TypeMapping createTypeMapping(String parentEncodingStyleURI, boolean autoTypes);
/**
* Unregisters a TypeMapping instance, if present, from the specified
@@ -91,7 +91,7 @@
* <code>null</code> if there was no TypeMapping registered for
* the specified <code>encodingStyleURI</code>
*/
- public TypeMapping unregisterTypeMapping(String encodingStyleURI);
+ TypeMapping unregisterTypeMapping(String encodingStyleURI);
/**
* Removes a <code>TypeMapping</code> from the TypeMappingRegistry. A
@@ -107,11 +107,11 @@
* specified <code>TypeMapping</code> was not in the
* <code>TypeMappingRegistry</code>
*/
- public boolean removeTypeMapping(TypeMapping mapping);
+ boolean removeTypeMapping(TypeMapping mapping);
/**
* Removes all registered TypeMappings and encodingStyleURIs from this
* TypeMappingRegistry.
*/
- public void clear();
+ void clear();
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java Thu Mar 8 09:14:44 2007
@@ -80,16 +80,9 @@
* apply to both method 1 and method 2, since the parameter at index 0 is not
* specified.
*
- * @author Hani Suleiman Date: Jun 14, 2005 Time: 7:47:56 PM
- * @author <a href="mailto:mikagoeckel@codehaus.org">Mika Göckel</a>
- * @author Øyvind Matheson Wergeland
*/
public class XMLTypeCreator extends AbstractTypeCreator {
- private static final Log log = LogFactory.getLog(XMLTypeCreator.class);
-
- // cache of classes to documents
- private Map<String, Document> documents = new HashMap<String, Document>();
-
+ private static final Log LOG = LogFactory.getLog(XMLTypeCreator.class);
private static List<Class> stopClasses = new ArrayList<Class>();
static {
stopClasses.add(Object.class);
@@ -98,6 +91,10 @@
stopClasses.add(Throwable.class);
}
+ // cache of classes to documents
+ private Map<String, Document> documents = new HashMap<String, Document>();
+
+
protected Document getDocument(Class clazz) {
if (clazz == null) {
return null;
@@ -109,16 +106,16 @@
String path = '/' + clazz.getName().replace('.', '/') + ".aegis.xml";
InputStream is = clazz.getResourceAsStream(path);
if (is == null) {
- log.debug("Mapping file : " + path + " not found.");
+ LOG.debug("Mapping file : " + path + " not found.");
return null;
}
- log.debug("Found mapping file : " + path);
+ LOG.debug("Found mapping file : " + path);
try {
doc = new StaxBuilder().build(is);
documents.put(clazz.getName(), doc);
return doc;
} catch (XMLStreamException e) {
- log.error("Error loading file " + path, e);
+ LOG.error("Error loading file " + path, e);
}
return null;
}
@@ -298,7 +295,9 @@
TypeClassInfo info = new TypeClassInfo();
if (index >= 0) {
if (index >= m.getParameterTypes().length) {
- throw new DatabindingException("Method " + m + " does not have a parameter at index " + index);
+ throw new DatabindingException("Method " + m
+ + " does not have a parameter at index "
+ + index);
}
// we don't want nodes for which the specified index is not
// specified
@@ -497,15 +496,14 @@
Element element = (Element)iterator.next();
// first we check if the parameter index is specified
Element match = getMatch(element, "parameter[@index='" + i + "']");
- if (match != null) {
+ if (match != null
// we check if the type is specified and matches
- if (match.getAttributeValue("class") != null) {
- // if it doesn't match, then we can definitely rule out
- // this result
- if (!match.getAttributeValue("class").equals(parameterType.getName())) {
- iterator.remove();
- }
- }
+ && match.getAttributeValue("class") != null
+ // if it doesn't match, then we can definitely rule out
+ // this result
+ && !match.getAttributeValue("class").equals(parameterType.getName())) {
+
+ iterator.remove();
}
}
}
@@ -542,8 +540,7 @@
private List<Element> getMatches(Object doc, String xpath) {
try {
XPath path = XPath.newInstance(xpath);
- List<Element> result = path.selectNodes(doc);
- return result;
+ return path.selectNodes(doc);
} catch (JDOMException e) {
throw new DatabindingException("Error evaluating xpath " + xpath, e);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Thu Mar 8 09:14:44 2007
@@ -45,9 +45,10 @@
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
public class ArrayType extends Type {
+ private static final Log LOG = LogFactory.getLog(ArrayType.class);
+
private QName componentName;
- private static final Log logger = LogFactory.getLog(ArrayType.class);
- private long minOccurs = 0;
+ private long minOccurs;
private long maxOccurs = Long.MAX_VALUE;
private boolean flat;
@@ -103,59 +104,61 @@
@SuppressWarnings("unchecked")
protected Object makeArray(Class arrayType, Collection values) {
+ int i;
+ int n;
if (Integer.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Integer.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Long.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Long.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Short.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Short.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Double.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Double.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Float.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Float.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Byte.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Byte.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Boolean.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Boolean.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
} else if (Character.TYPE.equals(arrayType)) {
Object[] objects = values.toArray();
Object array = Array.newInstance(Character.TYPE, objects.length);
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
Array.set(array, i, objects[i]);
}
return array;
@@ -164,7 +167,9 @@
}
@Override
- public void writeObject(Object values, MessageWriter writer, Context context) throws DatabindingException {
+ public void writeObject(Object values,
+ MessageWriter writer,
+ Context context) throws DatabindingException {
if (values == null) {
return;
}
@@ -186,49 +191,51 @@
Class arrayType = type.getTypeClass();
+ int i;
+ int n;
if (Object.class.isAssignableFrom(arrayType)) {
Object[] objects = (Object[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(objects[i], writer, context, type, name, ns);
}
} else if (Integer.TYPE.equals(arrayType)) {
int[] objects = (int[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Integer(objects[i]), writer, context, type, name, ns);
}
} else if (Long.TYPE.equals(arrayType)) {
long[] objects = (long[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Long(objects[i]), writer, context, type, name, ns);
}
} else if (Short.TYPE.equals(arrayType)) {
short[] objects = (short[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Short(objects[i]), writer, context, type, name, ns);
}
} else if (Double.TYPE.equals(arrayType)) {
double[] objects = (double[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Double(objects[i]), writer, context, type, name, ns);
}
} else if (Float.TYPE.equals(arrayType)) {
float[] objects = (float[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Float(objects[i]), writer, context, type, name, ns);
}
} else if (Byte.TYPE.equals(arrayType)) {
byte[] objects = (byte[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Byte(objects[i]), writer, context, type, name, ns);
}
} else if (Boolean.TYPE.equals(arrayType)) {
boolean[] objects = (boolean[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
- writeValue(new Boolean(objects[i]), writer, context, type, name, ns);
+ for (i = 0, n = objects.length; i < n; i++) {
+ writeValue(Boolean.valueOf(objects[i]), writer, context, type, name, ns);
}
} else if (Character.TYPE.equals(arrayType)) {
char[] objects = (char[])values;
- for (int i = 0, n = objects.length; i < n; i++) {
+ for (i = 0, n = objects.length; i < n; i++) {
writeValue(new Character(objects[i]), writer, context, type, name, ns);
}
}
@@ -274,12 +281,12 @@
element.setAttribute(new Attribute("nillable", "true"));
}
- element.setAttribute(new Attribute("minOccurs", new Long(getMinOccurs()).toString()));
+ element.setAttribute(new Attribute("minOccurs", Long.valueOf(getMinOccurs()).toString()));
if (maxOccurs == Long.MAX_VALUE) {
element.setAttribute(new Attribute("maxOccurs", "unbounded"));
} else {
- element.setAttribute(new Attribute("maxOccurs", new Long(getMaxOccurs()).toString()));
+ element.setAttribute(new Attribute("maxOccurs", Long.valueOf(getMaxOccurs()).toString()));
}
} catch (IllegalArgumentException e) {
@@ -335,7 +342,7 @@
// We couldn't find the type the user specified. One is created
// below instead.
if (type == null) {
- logger.debug("Couldn't find array component type " + componentName
+ LOG.debug("Couldn't find array component type " + componentName
+ ". Creating one instead.");
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java Thu Mar 8 09:14:44 2007
@@ -101,7 +101,9 @@
}
@Override
- public void writeObject(Object object, MessageWriter writer, Context context) throws DatabindingException {
+ public void writeObject(Object object,
+ MessageWriter writer,
+ Context context) throws DatabindingException {
boolean mtomEnabled = Boolean.valueOf((String)context.get(XmlConstants.MTOM_ENABLED)).booleanValue();
if (mtomEnabled) {
optimizedType.writeObject(object, writer, context);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Thu Mar 8 09:14:44 2007
@@ -49,7 +49,7 @@
* @author <a href="mailto:jack.xu.hong@gmail.com">Jack Hong</a>
*/
public class BeanType extends Type {
- private BeanTypeInfo _info;
+ private BeanTypeInfo info;
private boolean isInterface;
@@ -60,7 +60,7 @@
}
public BeanType(BeanTypeInfo info) {
- this._info = info;
+ this.info = info;
this.typeClass = info.getTypeClass();
this.isInterface = typeClass.isInterface();
}
@@ -83,7 +83,7 @@
*/
@Override
public Object readObject(MessageReader reader, Context context) throws DatabindingException {
- BeanTypeInfo info = getTypeInfo();
+ BeanTypeInfo inf = getTypeInfo();
try {
Class clazz = getTypeClass();
@@ -108,12 +108,10 @@
+ " for class " + clazz.getName());
}
}
- }
- // else if (isException)
- // {
+ //} else if (isException) {
// object = createFromFault(context);
// }
- else {
+ } else {
object = clazz.newInstance();
}
@@ -122,14 +120,14 @@
MessageReader childReader = reader.getNextAttributeReader();
QName name = childReader.getName();
- Type type = info.getType(name);
+ Type type = inf.getType(name);
if (type != null) {
Object writeObj = type.readObject(childReader, context);
if (isProxy) {
delegate.writeProperty(name.getLocalPart(), writeObj);
} else {
- writeProperty(name, object, writeObj, clazz, info);
+ writeProperty(name, object, writeObj, clazz, inf);
}
}
}
@@ -153,8 +151,8 @@
if (type == null) {
parent = getBeanTypeWithProperty(name);
if (parent != null) {
- info = parent.getTypeInfo();
- type = info.getType(name);
+ inf = parent.getTypeInfo();
+ type = inf.getType(name);
} else {
type = null;
}
@@ -167,11 +165,12 @@
if (isProxy) {
delegate.writeProperty(name.getLocalPart(), writeObj);
} else {
- writeProperty(name, object, writeObj, clazz, info);
+ writeProperty(name, object, writeObj, clazz, inf);
}
} else {
- if (!info.isNillable(name)) {
- throw new DatabindingException(name.getLocalPart() + " is nil, but not nillable.");
+ if (!inf.isNillable(name)) {
+ throw new DatabindingException(name.getLocalPart()
+ + " is nil, but not nillable.");
}
childReader.readToEnd();
@@ -196,10 +195,11 @@
/**
* Write the specified property to a field.
*/
- protected void writeProperty(QName name, Object object, Object property, Class impl, BeanTypeInfo info)
+ protected void writeProperty(QName name, Object object,
+ Object property, Class impl, BeanTypeInfo inf)
throws DatabindingException {
try {
- PropertyDescriptor desc = info.getPropertyDescriptorFromMappedName(name);
+ PropertyDescriptor desc = inf.getPropertyDescriptorFromMappedName(name);
Method m = desc.getWriteMethod();
@@ -245,12 +245,13 @@
* org.apache.cxf.aegis.Context)
*/
@Override
- public void writeObject(Object object, MessageWriter writer, Context context) throws DatabindingException {
+ public void writeObject(Object object, MessageWriter writer,
+ Context context) throws DatabindingException {
if (object == null) {
return;
}
- BeanTypeInfo info = getTypeInfo();
+ BeanTypeInfo inf = getTypeInfo();
if (getSuperType() != null) {
writer.writeXsiType(getSchemaType());
@@ -261,12 +262,12 @@
* can front-load the attributes and traverse down the list of super
* classes.
*/
- for (Iterator itr = info.getAttributes(); itr.hasNext();) {
+ for (Iterator itr = inf.getAttributes(); itr.hasNext();) {
QName name = (QName)itr.next();
Object value = readProperty(object, name);
if (value != null) {
- Type type = getType(info, name);
+ Type type = getType(inf, name);
if (type == null) {
throw new DatabindingException("Couldn't find type for " + value.getClass()
@@ -281,17 +282,17 @@
}
}
- for (Iterator itr = info.getElements(); itr.hasNext();) {
+ for (Iterator itr = inf.getElements(); itr.hasNext();) {
QName name = (QName)itr.next();
- if (info.isExtension()
- && info.getPropertyDescriptorFromMappedName(name).getReadMethod().getDeclaringClass() != info
+ if (inf.isExtension()
+ && inf.getPropertyDescriptorFromMappedName(name).getReadMethod().getDeclaringClass() != inf
.getTypeClass()) {
continue;
}
Object value = readProperty(object, name);
- Type type = getType(info, name);
+ Type type = getType(inf, name);
type = Aegis.getWriteType(context, value, type);
MessageWriter cwriter;
@@ -307,7 +308,7 @@
type.writeObject(value, cwriter, context);
cwriter.close();
- } else if (info.isNillable(name)) {
+ } else if (inf.isNillable(name)) {
cwriter = getWriter(writer, name, type);
// Write the xsi:nil if it is null.
@@ -316,7 +317,7 @@
cwriter.close();
}
}
- if (info.isExtension()) {
+ if (inf.isExtension()) {
Type t = getSuperType();
if (t != null) {
t.writeObject(object, writer, context);
@@ -356,14 +357,14 @@
*/
@Override
public void writeSchema(Element root) {
- BeanTypeInfo info = getTypeInfo();
+ BeanTypeInfo inf = getTypeInfo();
Element complex = new Element("complexType", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
complex.setAttribute(new Attribute("name", getSchemaType().getLocalPart()));
root.addContent(complex);
Type sooperType = getSuperType();
- if (info.isExtension() && sooperType != null) {
+ if (inf.isExtension() && sooperType != null) {
Element complexContent = new Element("complexContent", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
complex.addContent(complexContent);
complex = complexContent;
@@ -373,8 +374,8 @@
* See Java Virtual Machine specification:
* http://java.sun.com/docs/books/vmspec/2nd-edition/html/ClassFile.doc.html#75734
*/
- if (((info.getTypeClass().getModifiers() & Modifier.ABSTRACT) != 0)
- && !info.getTypeClass().isInterface()) {
+ if (((inf.getTypeClass().getModifiers() & Modifier.ABSTRACT) != 0)
+ && !inf.getTypeClass().isInterface()) {
complex.setAttribute(new Attribute("abstract", "true"));
}
@@ -382,7 +383,7 @@
* Decide if we're going to extend another type. If we are going to
* defer, then make sure that we extend the type for our superclass.
*/
- boolean isExtension = info.isExtension();
+ boolean isExtension = inf.isExtension();
Element dummy = complex;
@@ -400,15 +401,15 @@
Element seq = null;
// Write out schema for elements
- for (Iterator itr = info.getElements(); itr.hasNext();) {
+ for (Iterator itr = inf.getElements(); itr.hasNext();) {
QName name = (QName)itr.next();
if (isExtension) {
- PropertyDescriptor pd = info.getPropertyDescriptorFromMappedName(name);
+ PropertyDescriptor pd = inf.getPropertyDescriptorFromMappedName(name);
assert pd.getReadMethod() != null && pd.getWriteMethod() != null;
- if (pd.getReadMethod().getDeclaringClass() != info.getTypeClass()) {
+ if (pd.getReadMethod().getDeclaringClass() != inf.getTypeClass()) {
continue;
}
}
@@ -421,7 +422,7 @@
Element element = new Element("element", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
seq.addContent(element);
- Type type = getType(info, name);
+ Type type = getType(inf, name);
String nameNS = name.getNamespaceURI();
String nameWithPrefix = getNameWithPrefix(root, nameNS, name.getLocalPart());
@@ -434,7 +435,7 @@
/**
* if future proof then add <xsd:any/> element
*/
- if (info.isExtensibleElements()) {
+ if (inf.isExtensibleElements()) {
if (seq == null) {
seq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
dummy.addContent(seq);
@@ -443,13 +444,13 @@
}
// Write out schema for attributes
- for (Iterator itr = info.getAttributes(); itr.hasNext();) {
+ for (Iterator itr = inf.getAttributes(); itr.hasNext();) {
QName name = (QName)itr.next();
Element element = new Element("attribute", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
dummy.addContent(element);
- Type type = getType(info, name);
+ Type type = getType(inf, name);
String nameNS = name.getNamespaceURI();
String nameWithPrefix = getNameWithPrefix(root, nameNS, name.getLocalPart());
@@ -463,7 +464,7 @@
/**
* If extensible attributes then add <xsd:anyAttribute/>
*/
- if (info.isExtensibleAttributes()) {
+ if (inf.isExtensibleAttributes()) {
dummy.addContent(createAnyAttribute());
}
}
@@ -491,8 +492,8 @@
return prefix + ":" + localName;
}
- private Type getType(BeanTypeInfo info, QName name) {
- Type type = info.getType(name);
+ private Type getType(BeanTypeInfo inf, QName name) {
+ Type type = inf.getType(name);
if (type == null) {
throw new NullPointerException("Couldn't find type for" + name + " in class "
@@ -510,7 +511,7 @@
int minOccurs = getTypeInfo().getMinOccurs(name);
if (minOccurs != 1) {
- element.setAttribute(new Attribute("minOccurs", new Integer(minOccurs).toString()));
+ element.setAttribute(new Attribute("minOccurs", Integer.valueOf(minOccurs).toString()));
}
if (getTypeInfo().isNillable(name)) {
@@ -543,27 +544,27 @@
public Set<Type> getDependencies() {
Set<Type> deps = new HashSet<Type>();
- BeanTypeInfo info = getTypeInfo();
+ BeanTypeInfo inf = getTypeInfo();
- for (Iterator itr = info.getAttributes(); itr.hasNext();) {
+ for (Iterator itr = inf.getAttributes(); itr.hasNext();) {
QName name = (QName)itr.next();
- deps.add(info.getType(name));
+ deps.add(inf.getType(name));
}
- for (Iterator itr = info.getElements(); itr.hasNext();) {
+ for (Iterator itr = inf.getElements(); itr.hasNext();) {
QName name = (QName)itr.next();
- if (info.isExtension()
- && info.getPropertyDescriptorFromMappedName(name).getReadMethod().getDeclaringClass() != info
+ if (inf.isExtension()
+ && inf.getPropertyDescriptorFromMappedName(name).getReadMethod().getDeclaringClass() != inf
.getTypeClass()) {
continue;
}
- deps.add(info.getType(name));
+ deps.add(inf.getType(name));
}
/*
* Automagically add chain of superclasses *if* this is an an extension.
*/
- if (info.isExtension()) {
+ if (inf.isExtension()) {
Type sooperType = getSuperType();
if (sooperType != null) {
deps.add(sooperType);
@@ -589,13 +590,13 @@
}
private BeanType getSuperType() {
- BeanTypeInfo info = getTypeInfo();
- Class c = info.getTypeClass().getSuperclass();
+ BeanTypeInfo inf = getTypeInfo();
+ Class c = inf.getTypeClass().getSuperclass();
/*
* Don't dig any deeper than Object or Exception
*/
if (c != null && c != Object.class && c != Exception.class && c != RuntimeException.class) {
- TypeMapping tm = info.getTypeMapping();
+ TypeMapping tm = inf.getTypeMapping();
BeanType superType = (BeanType)tm.getType(c);
if (superType == null) {
superType = (BeanType)getTypeMapping().getTypeCreator().createType(c);
@@ -612,25 +613,25 @@
}
public BeanTypeInfo getTypeInfo() {
- if (_info == null) {
- _info = createTypeInfo();
+ if (info == null) {
+ info = createTypeInfo();
}
// Delay initialization so things work in recursive scenarios
// (XFIRE-117)
- if (!_info.isInitialized()) {
- _info.initialize();
+ if (!info.isInitialized()) {
+ info.initialize();
}
- return _info;
+ return info;
}
public BeanTypeInfo createTypeInfo() {
- BeanTypeInfo info = new BeanTypeInfo(getTypeClass(), getSchemaType().getNamespaceURI());
+ BeanTypeInfo inf = new BeanTypeInfo(getTypeClass(), getSchemaType().getNamespaceURI());
- info.setTypeMapping(getTypeMapping());
+ inf.setTypeMapping(getTypeMapping());
- return info;
+ return inf;
}
/**
@@ -652,10 +653,10 @@
sb.append(getClass().getName());
sb.append(": [class=");
Class c = getTypeClass();
- sb.append((c == null) ? ("<null>") : (c.getName()));
+ sb.append((c == null) ? "<null>" : c.getName());
sb.append(",\nQName=");
QName q = getSchemaType();
- sb.append((q == null) ? ("<null>") : (q.toString()));
+ sb.append((q == null) ? "<null>" : q.toString());
sb.append(",\ninfo=");
sb.append(getTypeInfo().toString());
sb.append("]");
@@ -669,8 +670,7 @@
* @return
*/
private Element createAnyAttribute() {
- Element result = new Element("anyAttribute", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
- return result;
+ return new Element("anyAttribute", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java Thu Mar 8 09:14:44 2007
@@ -29,7 +29,7 @@
public class BooleanType extends Type {
@Override
public Object readObject(MessageReader reader, Context context) {
- return new Boolean(reader.getValueAsBoolean());
+ return Boolean.valueOf(reader.getValueAsBoolean());
}
@Override
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cxf.aegis.type.basic;
import java.text.ParseException;
@@ -33,8 +51,7 @@
}
try {
- Calendar c = (Calendar)format.parseObject(value);
- return c.getTime();
+ return ((Calendar)format.parseObject(value)).getTime();
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dateTime: " + e.getMessage(), e);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cxf.aegis.type.basic;
import java.text.ParseException;
@@ -29,8 +47,7 @@
}
try {
- Calendar c = (Calendar)format.parseObject(value);
- return c.getTime();
+ return ((Calendar)format.parseObject(value)).getTime();
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dat: " + e.getMessage(), e);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java Thu Mar 8 09:14:44 2007
@@ -27,10 +27,11 @@
import java.util.Map;
class InterfaceInvocationHandler implements InvocationHandler {
+ private Map<Object, Object> attributes = new HashMap<Object, Object>();
+
InterfaceInvocationHandler() {
}
- private Map<Object, Object> attributes = new HashMap<Object, Object>();
public void writeProperty(Object key, Object value) {
attributes.put(key, value);
@@ -67,16 +68,14 @@
if (methodName.startsWith("get") && methodName.length() > 3) {
return true;
- } else if (methodName.startsWith("is") && methodName.length() > 2) {
- return true;
+ }
+
+ return methodName.length() > 2 && methodName.startsWith("is");
/*
* // should "hasXXX()" be considered a getter method? else if
* (methodName.startsWith("has") && methodName.length() > 3) { return
* true; }
*/
- } else {
- return false;
- }
}
protected boolean isSetterMethod(Method method, Object[] args) {
@@ -90,11 +89,7 @@
String methodName = method.getName();
- if (methodName.startsWith("set") && methodName.length() > 3) {
- return true;
- } else {
- return false;
- }
+ return methodName.startsWith("set") && methodName.length() > 3;
}
protected Object doGetter(Method method, Object[] args) throws Throwable {
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java Thu Mar 8 09:14:44 2007
@@ -59,7 +59,7 @@
private Set<Type> dependencies;
private boolean serializedWhenUnknown;
- private boolean readToDocument = false;
+ private boolean readToDocument;
@SuppressWarnings("unchecked")
public ObjectType() {
@@ -164,7 +164,9 @@
}
@Override
- public void writeObject(Object object, MessageWriter writer, Context context) throws DatabindingException {
+ public void writeObject(Object object,
+ MessageWriter writer,
+ Context context) throws DatabindingException {
if (null == object) {
MessageWriter nilWriter = writer.getAttributeWriter(XSI_NIL);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java Thu Mar 8 09:14:44 2007
@@ -34,7 +34,7 @@
public class SqlDateType extends DateType {
@Override
public Object readObject(MessageReader reader, Context context) throws DatabindingException {
- Date date = ((Date)super.readObject(reader, context));
+ Date date = (Date)super.readObject(reader, context);
if (date == null) {
return null;
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cxf.aegis.type.basic;
import java.sql.Time;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cxf.aegis.type.basic;
import java.sql.Timestamp;
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java Thu Mar 8 09:14:44 2007
@@ -33,7 +33,7 @@
import org.jdom.Element;
public class XMLBeanTypeInfo extends BeanTypeInfo {
- private static final Log logger = LogFactory.getLog(XMLBeanTypeInfo.class);
+ private static final Log LOG = LogFactory.getLog(XMLBeanTypeInfo.class);
private List mappings;
/**
@@ -69,7 +69,7 @@
return;
}
- logger.debug("Found mapping for property " + pd.getName());
+ LOG.debug("Found mapping for property " + pd.getName());
style = e.getAttributeValue("style");
mappedName = NamespaceHelper.createQName(e, e.getAttributeValue("mappedName"),
@@ -104,9 +104,9 @@
try {
// logger.debug("Mapped " + pd.getName() + " as " + style + " with
// name " + mappedName);
- if (style.equals("element")) {
+ if ("element".equals(style)) {
mapElement(pd.getName(), mappedName);
- } else if (style.equals("attribute")) {
+ } else if ("attribute".equals(style)) {
mapAttribute(pd.getName(), mappedName);
} else {
throw new DatabindingException("Invalid style: " + style);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java Thu Mar 8 09:14:44 2007
@@ -77,7 +77,9 @@
}
@Override
- public void writeObject(Object object, MessageWriter writer, Context context) throws DatabindingException {
+ public void writeObject(Object object,
+ MessageWriter writer,
+ Context context) throws DatabindingException {
if (object == null) {
return;
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java Thu Mar 8 09:14:44 2007
@@ -52,17 +52,17 @@
this.valueType = valueType;
setSchemaType(schemaType);
- setKeyName(new QName(schemaType.getNamespaceURI(), "key"));
- setValueName(new QName(schemaType.getNamespaceURI(), "value"));
- setEntryName(new QName(schemaType.getNamespaceURI(), "entry"));
+ keyName = new QName(schemaType.getNamespaceURI(), "key");
+ valueName = new QName(schemaType.getNamespaceURI(), "value");
+ entryName = new QName(schemaType.getNamespaceURI(), "entry");
}
@Override
public Object readObject(MessageReader reader, Context context) throws DatabindingException {
Map<Object, Object> map = instantiateMap();
try {
- Type keyType = getKeyType();
- Type valueType = getValueType();
+ Type kType = getKeyType();
+ Type vType = getValueType();
Object key = null;
Object value = null;
@@ -75,9 +75,9 @@
MessageReader evReader = entryReader.getNextElementReader();
if (evReader.getName().equals(getKeyName())) {
- key = keyType.readObject(evReader, context);
+ key = kType.readObject(evReader, context);
} else if (evReader.getName().equals(getValueName())) {
- value = valueType.readObject(evReader, context);
+ value = vType.readObject(evReader, context);
} else {
readToEnd(evReader);
}
@@ -132,7 +132,9 @@
}
@Override
- public void writeObject(Object object, MessageWriter writer, Context context) throws DatabindingException {
+ public void writeObject(Object object,
+ MessageWriter writer,
+ Context context) throws DatabindingException {
if (object == null) {
return;
}
@@ -140,32 +142,33 @@
try {
Map map = (Map)object;
- Type keyType = getKeyType();
- Type valueType = getValueType();
+ Type kType = getKeyType();
+ Type vType = getValueType();
for (Iterator itr = map.entrySet().iterator(); itr.hasNext();) {
Map.Entry entry = (Map.Entry)itr.next();
- writeEntry(writer, context, keyType, valueType, entry);
+ writeEntry(writer, context, kType, vType, entry);
}
} catch (IllegalArgumentException e) {
throw new DatabindingException("Illegal argument.", e);
}
}
- private void writeEntry(MessageWriter writer, Context context, Type keyType, Type valueType,
+ private void writeEntry(MessageWriter writer, Context context,
+ Type kType, Type vType,
Map.Entry entry) throws DatabindingException {
- keyType = Aegis.getWriteType(context, entry.getKey(), keyType);
- valueType = Aegis.getWriteType(context, entry.getValue(), valueType);
+ kType = Aegis.getWriteType(context, entry.getKey(), kType);
+ vType = Aegis.getWriteType(context, entry.getValue(), vType);
MessageWriter entryWriter = writer.getElementWriter(getEntryName());
MessageWriter keyWriter = entryWriter.getElementWriter(getKeyName());
- keyType.writeObject(entry.getKey(), keyWriter, context);
+ kType.writeObject(entry.getKey(), keyWriter, context);
keyWriter.close();
MessageWriter valueWriter = entryWriter.getElementWriter(getValueName());
- valueType.writeObject(entry.getValue(), valueWriter, context);
+ vType.writeObject(entry.getValue(), valueWriter, context);
valueWriter.close();
entryWriter.close();
@@ -180,8 +183,8 @@
Element seq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
complex.addContent(seq);
- Type keyType = getKeyType();
- Type valueType = getValueType();
+ Type kType = getKeyType();
+ Type vType = getValueType();
Element element = new Element("element", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
seq.addContent(element);
@@ -196,8 +199,8 @@
Element evseq = new Element("sequence", XmlConstants.XSD_PREFIX, XmlConstants.XSD);
evComplex.addContent(evseq);
- createElement(root, evseq, getKeyName(), keyType);
- createElement(root, evseq, getValueName(), valueType);
+ createElement(root, evseq, getKeyName(), kType);
+ createElement(root, evseq, getValueName(), vType);
}
/**
@@ -220,7 +223,7 @@
@Override
public Set<Type> getDependencies() {
- HashSet<Type> deps = new HashSet<Type>();
+ Set<Type> deps = new HashSet<Type>();
deps.add(getKeyType());
deps.add(getValueType());
return deps;