You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/11 21:08:05 UTC
incubator-streams git commit: added preconditions, tweaked tests
Repository: incubator-streams
Updated Branches:
refs/heads/STREAMS-214 d72d8f7e1 -> 831c165ea
added preconditions, tweaked tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/831c165e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/831c165e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/831c165e
Branch: refs/heads/STREAMS-214
Commit: 831c165eac568b557e77a821e47742e3998ce4d3
Parents: d72d8f7
Author: sblackmon <sb...@apache.org>
Authored: Tue Nov 11 14:08:02 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Tue Nov 11 14:08:02 2014 -0600
----------------------------------------------------------------------
.../apache/streams/file/FilePersistReader.java | 18 ++++++++++++++++--
.../apache/streams/file/FilePersistWriter.java | 7 ++++++-
.../apache/streams/file/test/FilePersistIT.java | 4 ++--
.../apache/streams/file/test/TestFilePersist.java | 4 ++--
4 files changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/831c165e/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistReader.java b/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistReader.java
index 75ee8b6..b243104 100644
--- a/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistReader.java
+++ b/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistReader.java
@@ -56,7 +56,7 @@ public class FilePersistReader implements StreamsPersistReader, Serializable {
protected volatile Queue<StreamsDatum> persistQueue;
- private ObjectMapper mapper = new ObjectMapper();
+ private ObjectMapper mapper;
private FileConfiguration config;
@@ -137,8 +137,22 @@ public class FilePersistReader implements StreamsPersistReader, Serializable {
//Handle exception
}
+ mapper = new ObjectMapper();
+
+ File file = new File( config.getPath());
+
+ if( !file.exists() )
+ try {
+ file.createNewFile();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ Preconditions.checkArgument(file.exists());
+ Preconditions.checkArgument(file.canRead());
+
try {
- queueFile = new QueueFile(new File(config.getFile()));
+ queueFile = new QueueFile(file);
} catch (IOException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/831c165e/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistWriter.java b/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistWriter.java
index bbae9fb..f26f3a6 100644
--- a/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistWriter.java
+++ b/streams-contrib/streams-persist-file/src/main/java/org/apache/streams/file/FilePersistWriter.java
@@ -82,12 +82,17 @@ public class FilePersistWriter implements StreamsPersistWriter, Serializable {
mapper = new ObjectMapper();
+ File file = new File( config.getPath());
+
try {
- queueFile = new QueueFile(new File(config.getFile()));
+ queueFile = new QueueFile(file);
} catch (IOException e) {
e.printStackTrace();
}
+ Preconditions.checkArgument(file.exists());
+ Preconditions.checkArgument(file.canWrite());
+
Preconditions.checkNotNull(queueFile);
this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/831c165e/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/FilePersistIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/FilePersistIT.java b/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/FilePersistIT.java
index e7d50bf..c2e1676 100644
--- a/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/FilePersistIT.java
+++ b/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/FilePersistIT.java
@@ -57,9 +57,9 @@ public class FilePersistIT {
public void prepareTest() {
testConfiguration = new FileConfiguration();
- //testConfiguration.setFile("./test-queue.txt");
+ testConfiguration.setPath("target/FilePersistIT.txt");
- File file = new File( testConfiguration.getFile());
+ File file = new File( testConfiguration.getPath());
if( file.exists() )
file.delete();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/831c165e/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/TestFilePersist.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/TestFilePersist.java b/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/TestFilePersist.java
index 1ffd90a..6458c8f 100644
--- a/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/TestFilePersist.java
+++ b/streams-contrib/streams-persist-file/src/test/java/org/apache/streams/file/test/TestFilePersist.java
@@ -26,9 +26,9 @@ public class TestFilePersist {
public void testPersistWriterString() {
testConfiguration = new FileConfiguration();
- //testConfiguration.setFile("./test-queue.txt");
+ testConfiguration.setPath("target/TestFilePersist.txt");
- File file = new File( testConfiguration.getFile());
+ File file = new File( testConfiguration.getPath());
if( file.exists() )
file.delete();