Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1470: remove commons-lang dependency

Browse Source
This commit is contained in:
dsyer
2009-12-30 11:04:11 +00:00
parent 99aeb7fe62
commit e1fe74b3f9
40 changed files with 1343 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-infrastructure/pom.xml
View File

@@ -78,11 +78,6 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java
View File

@@ -32,7 +32,6 @@ import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.ExecutionContext;
@@ -52,6 +51,7 @@ import org.springframework.oxm.XmlMappingException;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.xml.transform.StaxResult;
/**
@@ -431,7 +431,7 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
// write root tag
writer.add(factory.createStartElement(getRootTagNamespacePrefix(), getRootTagNamespace(), getRootTagName()));
if (!StringUtils.isBlank(getRootTagNamespace())) {
if (StringUtils.hasText(getRootTagNamespace())) {
writer.add(factory.createNamespace(getRootTagNamespacePrefix(), getRootTagNamespace()));
}
@@ -458,8 +458,8 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
// writer.writeEndDocument(); <- this doesn't work after restart
// we need to write end tag of the root element manually
String nsPrefix = StringUtils.isBlank(getRootTagNamespacePrefix()) ? "" : getRootTagNamespacePrefix() + ":";
String nsPrefix = !StringUtils.hasText(getRootTagNamespacePrefix()) ? "" : getRootTagNamespacePrefix() + ":";
try {
bufferedWriter.write("</" + nsPrefix + getRootTagName() + ">");
}

78
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SerializationUtils.java Normal file
View File

@@ -0,0 +1,78 @@
/*
* Copyright 2006-2010 the original author or authors.
*
* Licensed 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.springframework.batch.support;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
/**
* Static utility to help with serialization.
*
* @author Dave Syer
*
*/
public class SerializationUtils {
/**
* Serialize the object provided.
*
* @param object the object to serialize
* @return an array of bytes representing the object in a portable fashion
*/
public static byte[] serialize(Object object) {
if (object==null) {
return null;
}
ByteArrayOutputStream stream = new ByteArrayOutputStream();
try {
new ObjectOutputStream(stream).writeObject(object);
} catch (IOException e) {
throw new IllegalStateException("Could not serialize object of type: "+object.getClass(), e);
}
return stream.toByteArray();
}
/**
* @param bytes a serialized object created
* @return the result of deserializing the bytes
*/
public static Object deserialize(byte[] bytes) {
if (bytes==null) {
return null;
}
try {
return new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject();
}
catch (IOException e) {
throw new IllegalStateException("Could not deserialize object", e);
}
catch (ClassNotFoundException e) {
throw new IllegalStateException("Could not deserialize object type", e);
}
}
}

34
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java
View File

@@ -15,15 +15,17 @@
*/
package org.springframework.batch.item;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.Serializable;
import static org.junit.Assert.*;
import org.apache.commons.lang.SerializationUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.support.SerializationUtils;
/**
* @author Lucas Ward
@@ -172,12 +174,26 @@ public class ExecutionContextTests {
int value;
public boolean equals(Object obj) {
return EqualsBuilder.reflectionEquals(this, obj);
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + value;
return result;
}
public int hashCode() {
return HashCodeBuilder.reflectionHashCode(this);
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
TestSerializable other = (TestSerializable) obj;
if (value != other.value)
return false;
return true;
}
}

39
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/Name.java
View File

@@ -1,6 +1,5 @@
package org.springframework.batch.item.file.transform;
import org.apache.commons.lang.builder.EqualsBuilder;
public class Name {
private String first;
@@ -41,7 +40,41 @@ public class Name {
this.born = born;
}
public boolean equals(Object o) {
return EqualsBuilder.reflectionEquals(this, o);
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + born;
result = prime * result + ((first == null) ? 0 : first.hashCode());
result = prime * result + ((last == null) ? 0 : last.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Name other = (Name) obj;
if (born != other.born)
return false;
if (first == null) {
if (other.first != null)
return false;
}
else if (!first.equals(other.first))
return false;
if (last == null) {
if (other.last != null)
return false;
}
else if (!last.equals(other.last))
return false;
return true;
}
}

53
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Customer.java
View File

@@ -16,9 +16,6 @@
package org.springframework.batch.item.sample;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
/**
* An XML customer.
@@ -76,15 +73,51 @@ public class Customer {
this.poo = poo;
}
public boolean equals(Object obj) {
return EqualsBuilder.reflectionEquals(obj, this);
}
@Override
public int hashCode() {
return HashCodeBuilder.reflectionHashCode(this);
final int prime = 31;
int result = 1;
result = prime * result + ((address == null) ? 0 : address.hashCode());
result = prime * result + age;
result = prime * result + moo;
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + poo;
return result;
}
public String toString() {
return ToStringBuilder.reflectionToString(this);
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Customer other = (Customer) obj;
if (address == null) {
if (other.address != null)
return false;
}
else if (!address.equals(other.address))
return false;
if (age != other.age)
return false;
if (moo != other.moo)
return false;
if (name == null) {
if (other.name != null)
return false;
}
else if (!name.equals(other.name))
return false;
if (poo != other.poo)
return false;
return true;
}
@Override
public String toString() {
return "Customer [address=" + address + ", age=" + age + ", name=" + name + "]";
}
}

41
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Foo.java
View File

@@ -1,11 +1,8 @@
package org.springframework.batch.item.sample;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* Simple domain object for testing purposes.
@@ -54,14 +51,38 @@ public class Foo {
return "Foo[id=" +id +",name=" + name + ",value=" + value + "]";
}
public boolean equals(Object obj) {
return EqualsBuilder.reflectionEquals(this, obj);
}
@Override
public int hashCode() {
return HashCodeBuilder.reflectionHashCode(this);
final int prime = 31;
int result = 1;
result = prime * result + id;
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + value;
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Foo other = (Foo) obj;
if (id != other.id)
return false;
if (name == null) {
if (other.name != null)
return false;
}
else if (!name.equals(other.name))
return false;
if (value != other.value)
return false;
return true;
}
public void fail() throws Exception {
throw new Exception(FAILURE_MESSAGE);
}

50
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/LineItem.java
View File

@@ -16,9 +16,6 @@
package org.springframework.batch.item.sample;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
/**
* An XML line-item.
@@ -66,15 +63,48 @@ public class LineItem {
this.quantity = quantity;
}
public boolean equals(Object obj) {
return EqualsBuilder.reflectionEquals(obj, this);
}
@Override
public int hashCode() {
return HashCodeBuilder.reflectionHashCode(this);
final int prime = 31;
int result = 1;
result = prime * result + ((description == null) ? 0 : description.hashCode());
long temp;
temp = Double.doubleToLongBits(perUnitOunces);
result = prime * result + (int) (temp ^ (temp >>> 32));
temp = Double.doubleToLongBits(price);
result = prime * result + (int) (temp ^ (temp >>> 32));
result = prime * result + quantity;
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
LineItem other = (LineItem) obj;
if (description == null) {
if (other.description != null)
return false;
}
else if (!description.equals(other.description))
return false;
if (Double.doubleToLongBits(perUnitOunces) != Double.doubleToLongBits(other.perUnitOunces))
return false;
if (Double.doubleToLongBits(price) != Double.doubleToLongBits(other.price))
return false;
if (quantity != other.quantity)
return false;
return true;
}
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
return "LineItem [description=" + description + ", perUnitOunces=" + perUnitOunces + ", price=" + price
+ ", quantity=" + quantity + "]";
}
}

62
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java
View File

@@ -19,10 +19,6 @@ package org.springframework.batch.item.sample;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
/**
* An XML order.
*
@@ -68,16 +64,58 @@ public class Order {
public void setShipper(Shipper shipper) {
this.shipper = shipper;
}
public boolean equals(Object obj) {
return EqualsBuilder.reflectionEquals(obj, this);
}
@Override
public int hashCode() {
return HashCodeBuilder.reflectionHashCode(this);
final int prime = 31;
int result = 1;
result = prime * result + ((customer == null) ? 0 : customer.hashCode());
result = prime * result + ((date == null) ? 0 : date.hashCode());
result = prime * result + ((lineItems == null) ? 0 : lineItems.hashCode());
result = prime * result + ((shipper == null) ? 0 : shipper.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Order other = (Order) obj;
if (customer == null) {
if (other.customer != null)
return false;
}
else if (!customer.equals(other.customer))
return false;
if (date == null) {
if (other.date != null)
return false;
}
else if (!date.equals(other.date))
return false;
if (lineItems == null) {
if (other.lineItems != null)
return false;
}
else if (!lineItems.equals(other.lineItems))
return false;
if (shipper == null) {
if (other.shipper != null)
return false;
}
else if (!shipper.equals(other.shipper))
return false;
return true;
}
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
return "Order [customer=" + customer + ", date=" + date + ", lineItems=" + lineItems + ", shipper=" + shipper
+ "]";
}
}

42
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Shipper.java
View File

@@ -16,9 +16,6 @@
package org.springframework.batch.item.sample;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
/**
* An XML shipper.
@@ -46,15 +43,40 @@ public class Shipper {
this.perOunceRate = perOunceRate;
}
public boolean equals(Object obj) {
return EqualsBuilder.reflectionEquals(obj, this);
}
@Override
public int hashCode() {
return HashCodeBuilder.reflectionHashCode(this);
final int prime = 31;
int result = 1;
result = prime * result + ((name == null) ? 0 : name.hashCode());
long temp;
temp = Double.doubleToLongBits(perOunceRate);
result = prime * result + (int) (temp ^ (temp >>> 32));
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Shipper other = (Shipper) obj;
if (name == null) {
if (other.name != null)
return false;
}
else if (!name.equals(other.name))
return false;
if (Double.doubleToLongBits(perOunceRate) != Double.doubleToLongBits(other.perOunceRate))
return false;
return true;
}
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
return "Shipper [name=" + name + ", perOunceRate=" + perOunceRate + "]";
}
}