Skip to content

Commit 4843c21

Browse files
author
Ashutosh Gupta
committed
Fixing style check
1 parent e8cc761 commit 4843c21

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@ public FileStatus[] listStatus(Path f, boolean recursive) throws FileNotFoundExc
20772077
*/
20782078
private void listStatus(ArrayList<FileStatus> results, Path f,
20792079
PathFilter filter, boolean recursive) throws FileNotFoundException, IOException {
2080-
FileStatus listing[] = listStatus(f, recursive);
2080+
FileStatus[] listing = listStatus(f, recursive);
20812081
if (listing == null) {
20822082
throw new IOException("Error accessing " + f);
20832083
}
@@ -2414,8 +2414,7 @@ public RemoteIterator<LocatedFileStatus> listFiles(
24142414
final Path f, final boolean recursive)
24152415
throws FileNotFoundException, IOException {
24162416
return new RemoteIterator<LocatedFileStatus>() {
2417-
private RemoteIterator<LocatedFileStatus> curItor =
2418-
listLocatedStatus(f, recursive);
2417+
private RemoteIterator<LocatedFileStatus> curItor = listLocatedStatus(f, recursive);
24192418
private LocatedFileStatus curFile;
24202419

24212420
@Override

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ private FileStatus[] doGlob() throws IOException {
390390
* not all Hadoop filesystems have this property. So we sort here in order
391391
* to get consistent results. See HADOOP-10798 for details.
392392
*/
393-
FileStatus ret[] = results.toArray(new FileStatus[results.size()]);
393+
FileStatus[] ret = results.toArray(new FileStatus[results.size()]);
394394
Arrays.sort(ret);
395395
return ret;
396396
}

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ public Token<?>[] addDelegationTokens(String renewer, Credentials creds)
148148
*/
149149
MultipartUploaderBuilder createMultipartUploader(Path basePath);
150150

151+
Iterator<LocatedFileStatus> listLocatedStatus(Path f, boolean recursive);
151152
Iterator<LocatedFileStatus> listLocatedStatus(Path f,
152153
PathFilter filter, boolean recursive);
153154
}

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,24 @@ public FSDataOutputStream create(Path f, FsPermission permission,
120120
void setQuota(Path f, long namespaceQuota, long storagespaceQuota);
121121
void setQuotaByStorageType(Path f, StorageType type, long quota);
122122
public FsStatus getStatus();
123-
public FileStatus[] listStatus(Path f, boolean recursive);
124-
public FileStatus[] listStatus(Path f, PathFilter filter);
123+
FileStatus[] listStatus(Path f, boolean recursive);
124+
FileStatus[] listStatus(Path f, PathFilter filter);
125125
public FileStatus[] listStatusBatch(Path f, byte[] token);
126-
public FileStatus[] listStatus(Path f, PathFilter filter, boolean recursive);
126+
FileStatus[] listStatus(Path f, PathFilter filter, boolean recursive);
127127
public FileStatus[] listStatus(Path[] files);
128-
public FileStatus[] listStatus(Path[] files, boolean recursive);
128+
FileStatus[] listStatus(Path[] files, boolean recursive);
129129
public FileStatus[] listStatus(Path[] files, PathFilter filter);
130-
public FileStatus[] listStatus(Path[] files, PathFilter filter, boolean recursive);
130+
FileStatus[] listStatus(Path[] files, PathFilter filter, boolean recursive);
131131
public FileStatus[] globStatus(Path pathPattern);
132132
public FileStatus[] globStatus(Path pathPattern, PathFilter filter);
133133

134134
public Iterator<LocatedFileStatus> listFiles(Path path,
135135
boolean isRecursive);
136136

137137
public Iterator<LocatedFileStatus> listLocatedStatus(Path f);
138-
public Iterator<LocatedFileStatus> listLocatedStatus(Path f, boolean recursive);
139-
public Iterator<LocatedFileStatus> listLocatedStatus(Path f, PathFilter filter);
140-
public Iterator<LocatedFileStatus> listLocatedStatus(Path f, PathFilter filter,
138+
Iterator<LocatedFileStatus> listLocatedStatus(Path f, boolean recursive);
139+
Iterator<LocatedFileStatus> listLocatedStatus(Path f, PathFilter filter);
140+
Iterator<LocatedFileStatus> listLocatedStatus(Path f, PathFilter filter,
141141
boolean recursive);
142142
public Iterator<FileStatus> listStatusIterator(Path f);
143143
public void copyFromLocalFile(Path src, Path dst);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.io.FileNotFoundException;
2121
import java.io.IOException;
22-
import java.util.ArrayList;
2322
import java.util.Arrays;
2423
import java.util.Collection;
2524
import java.util.List;
@@ -465,10 +464,10 @@ public FileStatus[] listStatus(Path f, boolean recursive) throws FileNotFoundExc
465464
new FileStatus(10, false, 1, 150, 150, new Path("test:/a1/file1")) };
466465
} else if (f.toString().equals("test:/a1/a2")) {
467466
return new FileStatus[] {
468-
new FileStatus(10, false, 1, 150, 150,
469-
new Path("test:/a1/a2/file2")),
470-
new FileStatus(10, false, 1, 151, 150,
471-
new Path("test:/a1/a2/file3")) };
467+
new FileStatus(10, false, 1, 150,
468+
150, new Path("test:/a1/a2/file2")),
469+
new FileStatus(10, false, 1, 151,
470+
150, new Path("test:/a1/a2/file3"))};
472471
}
473472
return new FileStatus[0];
474473
}

0 commit comments

Comments
 (0)