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 2015/04/01 17:15:50 UTC
[1/3] incubator-streams git commit: STREAMS-243 | Updated
S3Configurator to throw a more descriptive exception when the s3config can
not be read
Repository: incubator-streams
Updated Branches:
refs/heads/master 27f38335c -> 3d1fc85cc
STREAMS-243 | Updated S3Configurator to throw a more descriptive exception when the s3config can not be read
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/639bd3a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/639bd3a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/639bd3a6
Branch: refs/heads/master
Commit: 639bd3a696431db65b62f92b773c9e5a64c2d63b
Parents: 6c4cf0f
Author: Robert Douglas <rd...@w2ogroup.com>
Authored: Tue Dec 16 14:22:21 2014 -0600
Committer: Robert Douglas <rd...@w2ogroup.com>
Committed: Tue Dec 16 14:22:21 2014 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/streams/s3/S3Configurator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/639bd3a6/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
index ccf32c0..fb5e672 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
@@ -64,15 +64,15 @@ public class S3Configurator {
try {
s3Configuration = mapper.readValue(s3.root().render(ConfigRenderOptions.concise()), S3WriterConfiguration.class);
+
+ if(!s3Configuration.getWriterPath().endsWith("/")) {
+ s3Configuration.setWriterPath(s3Configuration.getWriterPath() + "/");
+ }
} catch (Exception e) {
e.printStackTrace();
LOGGER.warn("Could not parse S3Configuration");
}
- if(!s3Configuration.getWriterPath().endsWith("/")) {
- s3Configuration.setWriterPath(s3Configuration.getWriterPath() + "/");
- }
-
return s3Configuration;
}
[3/3] incubator-streams git commit: Merge branch 'STREAMS-243' into
asf-master
Posted by sb...@apache.org.
Merge branch 'STREAMS-243' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3d1fc85c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3d1fc85c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3d1fc85c
Branch: refs/heads/master
Commit: 3d1fc85cc6258081f78f2785c31cbf0161b140bf
Parents: 27f3833 99268c1
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Wed Apr 1 10:15:34 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Wed Apr 1 10:15:34 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/streams/s3/S3Configurator.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-streams git commit: PR feedback for:
https://github.com/apache/incubator-streams/pull/167
Posted by sb...@apache.org.
PR feedback for: https://github.com/apache/incubator-streams/pull/167
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/99268c14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/99268c14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/99268c14
Branch: refs/heads/master
Commit: 99268c140b3d35d86270591f6c3957135e093abb
Parents: 639bd3a
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Wed Apr 1 09:59:10 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Wed Apr 1 09:59:10 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/streams/s3/S3Configurator.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99268c14/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
index fb5e672..de32898 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3Configurator.java
@@ -37,8 +37,7 @@ public class S3Configurator {
try {
s3Configuration = mapper.readValue(s3.root().render(ConfigRenderOptions.concise()), S3Configuration.class);
} catch (Exception e) {
- e.printStackTrace();
- LOGGER.warn("Could not parse S3Configuration");
+ LOGGER.warn("Could not parse S3Configuration", e);
}
return s3Configuration;
@@ -51,8 +50,7 @@ public class S3Configurator {
try {
s3Configuration = mapper.readValue(s3.root().render(ConfigRenderOptions.concise()), S3ReaderConfiguration.class);
} catch (Exception e) {
- e.printStackTrace();
- LOGGER.warn("Could not parse S3Configuration");
+ LOGGER.warn("Could not parse S3Configuration", e);
}
return s3Configuration;
@@ -69,8 +67,7 @@ public class S3Configurator {
s3Configuration.setWriterPath(s3Configuration.getWriterPath() + "/");
}
} catch (Exception e) {
- e.printStackTrace();
- LOGGER.warn("Could not parse S3Configuration");
+ LOGGER.warn("Could not parse S3Configuration", e);
}
return s3Configuration;