You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/11/02 17:02:08 UTC
[3/3] nifi git commit: NIFI-1051: Fixed checkstyle violations
NIFI-1051: Fixed checkstyle violations
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/abf2c628
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/abf2c628
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/abf2c628
Branch: refs/heads/master
Commit: abf2c6288458958be54a7a9a5fddc91693aaa4cf
Parents: 7a73867
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Nov 2 11:01:50 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Nov 2 11:01:50 2015 -0500
----------------------------------------------------------------------
.../repository/FileSystemRepository.java | 12 ++++-----
.../repository/TestFileSystemRepository.java | 26 ++++++++++----------
2 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/abf2c628/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index 1354b4a..b4a1716 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -309,12 +309,12 @@ public class FileSystemRepository implements ContentRepository {
// the path already exists, so scan the path to find any files and update maxIndex to the max of
// all filenames seen.
Files.walkFileTree(realPath, new SimpleFileVisitor<Path>() {
-
- public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
- LOG.warn("Content repository contains un-readable file or directory '" + file.getFileName() + "'. Skipping. ", exc);
- return FileVisitResult.SKIP_SUBTREE;
- }
-
+ @Override
+ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+ LOG.warn("Content repository contains un-readable file or directory '" + file.getFileName() + "'. Skipping. ", exc);
+ return FileVisitResult.SKIP_SUBTREE;
+ }
+
@Override
public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
if (attrs.isDirectory()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/abf2c628/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
index 95e1f40..5da67a0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
@@ -71,23 +71,23 @@ public class TestFileSystemRepository {
public void shutdown() throws IOException {
repository.shutdown();
}
-
+
@Test
public void testBogusFile() throws IOException {
- repository.shutdown();
- System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
-
+ repository.shutdown();
+ System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
+
File bogus = new File(rootFile, "bogus");
try {
- bogus.mkdir();
- bogus.setReadable(false);
-
- repository = new FileSystemRepository();
- repository.initialize(new StandardResourceClaimManager());
- } finally {
- bogus.setReadable(true);
- assertTrue(bogus.delete());
- }
+ bogus.mkdir();
+ bogus.setReadable(false);
+
+ repository = new FileSystemRepository();
+ repository.initialize(new StandardResourceClaimManager());
+ } finally {
+ bogus.setReadable(true);
+ assertTrue(bogus.delete());
+ }
}
@Test