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

RESOLVED - issue BATCH-789: Remove mark/reset from ItemReader

Browse Source 
Remove AbstractItemReader.  All done (with remaining issues moved to BATCH-220).
This commit is contained in:
dsyer
2008-08-21 12:11:22 +00:00
parent 300e726909
commit fcf96a954f
16 changed files with 43 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
archetypes/simple-cli/src/main/java/example/ExampleItemReader.java
View File

@@ -1,12 +1,11 @@
package example;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.support.AbstractItemReader;
/**
* {@link ItemReader} with hard-coded input data.
*/
public class ExampleItemReader extends AbstractItemReader<String> {
public class ExampleItemReader implements ItemReader<String> {
private String[] input = {"Hello world!", null};

4
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepHandlerTests.java
View File

@@ -27,11 +27,11 @@ import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.NoWorkFoundException;
import org.springframework.batch.item.ParseException;
import org.springframework.batch.item.UnexpectedInputException;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.item.support.PassthroughItemProcessor;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
import org.springframework.batch.repeat.support.RepeatTemplate;
@@ -114,7 +114,7 @@ public class ItemOrientedStepHandlerTests {
* @author Dave Syer
*
*/
private final class StubItemReader extends AbstractItemReader<String> {
private final class StubItemReader implements ItemReader<String> {
private int count = 0;
public String read() throws Exception, UnexpectedInputException, NoWorkFoundException, ParseException {

3
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
View File

@@ -45,7 +45,6 @@ import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.core.step.skip.SkipLimitExceededException;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.item.support.ListItemReader;
import org.springframework.batch.retry.RetryException;
import org.springframework.batch.retry.policy.RetryCacheCapacityExceededException;
@@ -339,7 +338,7 @@ public class StatefulRetryStepFactoryBeanTests {
// set the cache limit lower than the number of unique un-recovered
// errors expected
factory.setCacheCapacity(2);
ItemReader<String> provider = new AbstractItemReader<String>() {
ItemReader<String> provider = new ItemReader<String>() {
public String read() {
String item = ""+count;
provided.add(item);

8
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
View File

@@ -33,8 +33,8 @@ import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.step.StepExecutionSynchronizer;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
import org.springframework.batch.repeat.support.RepeatTemplate;
import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
@@ -78,7 +78,7 @@ public class StepExecutorInterruptionTests extends TestCase {
RepeatTemplate template = new RepeatTemplate();
// N.B, If we don't set the completion policy it might run forever
template.setCompletionPolicy(new SimpleCompletionPolicy(2));
step.setItemHandler(new SimpleStepHandler<Object>(new AbstractItemReader<Object>() {
step.setItemHandler(new SimpleStepHandler<Object>(new ItemReader<Object>() {
public Object read() throws Exception {
// do something non-trivial (and not Thread.sleep())
double foo = 1;
@@ -115,7 +115,7 @@ public class StepExecutorInterruptionTests extends TestCase {
Thread processingThread = createThread(stepExecution);
step.setItemHandler(new SimpleStepHandler<Object>(new AbstractItemReader<Object>() {
step.setItemHandler(new SimpleStepHandler<Object>(new ItemReader<Object>() {
public Object read() throws Exception {
return null;
}
@@ -152,7 +152,7 @@ public class StepExecutorInterruptionTests extends TestCase {
public void testLockNotReleasedIfChunkFails() throws Exception {
step.setItemHandler(new SimpleStepHandler<Object>(new AbstractItemReader<Object>() {
step.setItemHandler(new SimpleStepHandler<Object>(new ItemReader<Object>() {
public Object read() throws Exception {
throw new RuntimeException("Planned!");
}

17
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepHandlerStepTests.java
View File

@@ -50,7 +50,6 @@ import org.springframework.batch.item.ItemStreamSupport;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.MarkFailedException;
import org.springframework.batch.item.ResetFailedException;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.item.support.ListItemReader;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.policy.DefaultResultCompletionPolicy;
@@ -192,7 +191,7 @@ public class StepHandlerStepTests extends TestCase {
public void testIncrementRollbackCount() {
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
throw new RuntimeException();
@@ -215,7 +214,7 @@ public class StepHandlerStepTests extends TestCase {
public void testExitCodeDefaultClassification() throws Exception {
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
throw new RuntimeException();
@@ -239,7 +238,7 @@ public class StepHandlerStepTests extends TestCase {
public void testExitCodeCustomClassification() throws Exception {
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
throw new RuntimeException();
@@ -352,7 +351,7 @@ public class StepHandlerStepTests extends TestCase {
* Restartable.
*/
public void testRestartJobOnNonRestartableTasklet() throws Exception {
step.setItemHandler(new SimpleStepHandler<String>(new AbstractItemReader<String>() {
step.setItemHandler(new SimpleStepHandler<String>(new ItemReader<String>() {
public String read() throws Exception {
return "foo";
}
@@ -520,7 +519,7 @@ public class StepHandlerStepTests extends TestCase {
step.setInterruptionPolicy(interruptionPolicy);
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
throw new RuntimeException();
@@ -550,7 +549,7 @@ public class StepHandlerStepTests extends TestCase {
public void testStatusForNormalFailure() throws Exception {
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
// Trigger a rollback
throw new RuntimeException("Foo");
@@ -577,7 +576,7 @@ public class StepHandlerStepTests extends TestCase {
public void testStatusForErrorFailure() throws Exception {
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
// Trigger a rollback
throw new Error("Foo");
@@ -604,7 +603,7 @@ public class StepHandlerStepTests extends TestCase {
public void testStatusForResetFailedException() throws Exception {
ItemReader<String> itemReader = new AbstractItemReader<String>() {
ItemReader<String> itemReader = new ItemReader<String>() {
public String read() throws Exception {
// Trigger a rollback
throw new RuntimeException("Foo");

21
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java
View File

@@ -16,23 +16,24 @@
package org.springframework.batch.jms;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
import javax.sql.DataSource;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemRecoverer;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.RepeatCallback;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
import org.springframework.batch.repeat.support.RepeatTemplate;
import org.springframework.batch.retry.RecoveryCallback;
import org.springframework.batch.retry.RetryCallback;
@@ -41,15 +42,15 @@ import org.springframework.batch.retry.callback.RecoveryRetryCallback;
import org.springframework.batch.retry.policy.RecoveryCallbackRetryPolicy;
import org.springframework.batch.retry.policy.SimpleRetryPolicy;
import org.springframework.batch.retry.support.RetryTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "/org/springframework/batch/jms/jms-context.xml")
@@ -151,6 +152,8 @@ public class ExternalRetryInBatchTests {
callback.setRecoveryCallback(new RecoveryCallback() {
public Object recover(RetryContext context) {
// aggressive commit on a recovery
RepeatSynchronizationManager.setCompleteOnly();
return provider.recover(item, context.getLastThrowable());
}
});
@@ -210,7 +213,7 @@ public class ExternalRetryInBatchTests {
return msgs;
}
private abstract class ItemReaderRecoverer extends AbstractItemReader<Object> implements ItemRecoverer {
private interface ItemReaderRecoverer extends ItemReader<Object>, ItemRecoverer {
}
}

4
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java
View File

@@ -28,9 +28,9 @@ import javax.sql.DataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemRecoverer;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.retry.RecoveryCallback;
import org.springframework.batch.retry.RetryCallback;
import org.springframework.batch.retry.RetryContext;
@@ -259,7 +259,7 @@ public class ExternalRetryTests {
return msgs;
}
private abstract class ItemReaderRecoverer<T> extends AbstractItemReader<T> implements ItemRecoverer {
private interface ItemReaderRecoverer<T> extends ItemReader<T>, ItemRecoverer {
}

5
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java
View File

@@ -22,12 +22,11 @@ import javax.jms.Message;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.NewItemIdentifier;
import org.springframework.batch.item.ItemKeyGenerator;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemRecoverer;
import org.springframework.batch.item.NewItemIdentifier;
import org.springframework.batch.item.UnexpectedInputException;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.jms.JmsException;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.core.JmsTemplate;
@@ -45,7 +44,7 @@ import org.springframework.util.Assert;
* @author Dave Syer
*
*/
public class JmsItemReader<T> extends AbstractItemReader<T> implements ItemRecoverer, ItemKeyGenerator,
public class JmsItemReader<T> implements ItemReader<T>, ItemRecoverer, ItemKeyGenerator,
NewItemIdentifier {
protected Log logger = LogFactory.getLog(getClass());

29
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemReader.java
View File

@@ -1,29 +0,0 @@
/*
* Copyright 2006-2007 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.item.support;
import org.springframework.batch.item.ItemReader;
/**
* Base class for {@link ItemReader} implementations.
* @author Dave Syer
*
*/
public abstract class AbstractItemReader<T> implements ItemReader<T> {
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemReader.java
View File

@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
*
* @author Dave Syer
*/
public class DelegatingItemReader<T> extends AbstractItemReader<T> implements InitializingBean {
public class DelegatingItemReader<T> implements ItemReader<T>, InitializingBean {
private ItemReader<T> itemReader;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java
View File

@@ -28,7 +28,7 @@ import org.springframework.batch.item.ItemReader;
* @author Dave Syer
*
*/
public class ListItemReader<T> extends AbstractItemReader<T> {
public class ListItemReader<T> implements ItemReader<T> {
private List<T> list;

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java
View File

@@ -16,14 +16,12 @@
package org.springframework.batch.item;
import org.springframework.batch.item.support.AbstractItemReader;
import junit.framework.TestCase;
public class ItemProviderTests extends TestCase {
ItemReader<String> provider = new AbstractItemReader<String>() {
ItemReader<String> provider = new ItemReader<String>() {
public String read() {
return "foo";
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
View File

@@ -19,7 +19,7 @@ public class AggregateItemReaderTests {
@Before
public void setUp() {
// create mock for input
input = new AbstractItemReader<AggregateItem<String>>() {
input = new ItemReader<AggregateItem<String>>() {
private int count = 0;

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemReaderTests.java
View File

@@ -15,11 +15,13 @@
*/
package org.springframework.batch.item.validator;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import junit.framework.TestCase;
import static org.easymock.EasyMock.*;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.support.AbstractItemReader;
/**
* @author Lucas Ward
@@ -98,7 +100,7 @@ public class ValidatingItemReaderTests extends TestCase {
verify(validator);
}
private static class MockItemReader extends AbstractItemReader<Object> {
private static class MockItemReader implements ItemReader<Object> {
Object value;

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java
View File

@@ -17,7 +17,6 @@
package org.springframework.batch.repeat.support;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.RepeatCallback;
import org.springframework.batch.repeat.RepeatContext;
@@ -147,7 +146,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests {
while (!chunker.ready()) {
ItemReader<Trade> truncated = new AbstractItemReader<Trade>() {
ItemReader<Trade> truncated = new ItemReader<Trade>() {
int count = 0;
public Trade read() throws Exception {

3
spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java
View File

@@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.item.support.AbstractItemReader;
import org.springframework.batch.sample.domain.order.Address;
import org.springframework.batch.sample.domain.order.BillingInfo;
import org.springframework.batch.sample.domain.order.Customer;
@@ -35,7 +34,7 @@ import org.springframework.batch.sample.domain.order.ShippingInfo;
* @author peter.zozom
*
*/
public class OrderItemReader extends AbstractItemReader<Order> {
public class OrderItemReader implements ItemReader<Order> {
private static Log log = LogFactory.getLog(OrderItemReader.class);
private Order order;