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

Merge pull request #168 from jpraet/BATCH-2018

Browse Source
This commit is contained in:
jpraet
2013-05-04 14:06:36 +02:00
committed by Michael Minella
parent daeecbfd6e
commit 9319639c4e
4 changed files with 123 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemWriter.java
View File

@@ -46,15 +46,14 @@ import org.springframework.util.StringUtils;
*/
public class MongoItemWriter<T> implements ItemWriter<T>, InitializingBean {
private static final String BUFFER_KEY_PREFIX = MongoItemWriter.class.getName() + ".BUFFER_KEY";
private MongoOperations template;
private final String bufferKey;
private final Object bufferKey;
private String collection;
private boolean delete = false;
public MongoItemWriter() {
super();
this.bufferKey = BUFFER_KEY_PREFIX + "." + hashCode();
this.bufferKey = new Object();
}
/**

24
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java
View File

@@ -37,37 +37,33 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
*/
public class TransactionAwareBufferedWriter extends Writer {
private static final String BUFFER_KEY_PREFIX = TransactionAwareBufferedWriter.class.getName() + ".BUFFER_KEY";
private final Object bufferKey;
private static final String CLOSE_KEY_PREFIX = TransactionAwareBufferedWriter.class.getName() + ".CLOSE_KEY";
private final String bufferKey;
private final String closeKey;
private final Object closeKey;
private FileChannel channel;
private final Runnable closeCallback;
// default encoding for writing to output files - set to UTF-8.
private static final String DEFAULT_CHARSET = "UTF-8";
private String encoding = DEFAULT_CHARSET;
/**
* Create a new instance with the underlying file channel provided, and a callback
* to execute on close. The callback should clean up related resources like
* output streams or channels.
*
* @param channel channel used to do the actuall file IO
* @param channel channel used to do the actual file IO
* @param closeCallback callback to execute on close
*/
public TransactionAwareBufferedWriter(FileChannel channel, Runnable closeCallback) {
super();
this.channel = channel;
this.closeCallback = closeCallback;
this.bufferKey = BUFFER_KEY_PREFIX + "." + hashCode();
this.closeKey = CLOSE_KEY_PREFIX + "." + hashCode();
this.bufferKey = new Object();
this.closeKey = new Object();
}
public void setEncoding(String encoding) {
@@ -88,7 +84,7 @@ public class TransactionAwareBufferedWriter extends Writer {
public void afterCompletion(int status) {
clear();
}
@Override
public void beforeCommit(boolean readOnly) {
try {
@@ -145,7 +141,7 @@ public class TransactionAwareBufferedWriter extends Writer {
if (!transactionActive()) {
return 0L;
}
try {
try {
return getCurrentBuffer().toString().getBytes(encoding).length;
} catch (UnsupportedEncodingException e) {
throw new WriteFailedException("Could not determine buffer size because of unsupported encoding: " + encoding, e);