Skip to content

Commit 819cd6e

Browse files
garydgregorygarydgregory
committed
Camel-case parameter and internal names
1 parent fea0ee8 commit 819cd6e

7 files changed

Lines changed: 65 additions & 65 deletions

File tree

‎src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public ValidatingObjectInputStream accept(final String... patterns) {
109109
return this;
110110
}
111111

112-
/**
112+
/**
113113
* Checks that the class name conforms to requirements.
114114
*
115115
* @param name The class name

‎src/test/java/org/apache/commons/io/DirectoryWalkerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,12 @@ protected boolean handleIsCancelled(final File file, final int depth, final Coll
234234
private static final File outputDir = new File(ioDir, "output");
235235
private static final File[] dirs = {orgDir, apacheDir, commonsDir, ioDir, outputDir};
236236
// Files
237-
private static final File filenameUtils = new File(ioDir, "FilenameUtils.java");
237+
private static final File fileNameUtils = new File(ioDir, "FilenameUtils.java");
238238

239239
private static final File ioUtils = new File(ioDir, "IOUtils.java");
240240
private static final File proxyWriter = new File(outputDir, "ProxyWriter.java");
241241
private static final File nullStream = new File(outputDir, "NullOutputStream.java");
242-
private static final File[] ioFiles = {filenameUtils, ioUtils};
242+
private static final File[] ioFiles = {fileNameUtils, ioUtils};
243243
private static final File[] outputFiles = {proxyWriter, nullStream};
244244

245245
// Filters

‎src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ protected boolean handleIsCancelled(final File file, final int depth, final Coll
237237
private static final File outputDir = new File(ioDir, "output");
238238
private static final File[] dirs = {orgDir, apacheDir, commonsDir, ioDir, outputDir};
239239
// Files
240-
private static final File filenameUtils = new File(ioDir, "FilenameUtils.java");
240+
private static final File fileNameUtils = new File(ioDir, "FilenameUtils.java");
241241
private static final File ioUtils = new File(ioDir, "IOUtils.java");
242242

243243
private static final File proxyWriter = new File(outputDir, "ProxyWriter.java");
244244
private static final File nullStream = new File(outputDir, "NullOutputStream.java");
245-
private static final File[] ioFiles = {filenameUtils, ioUtils};
245+
private static final File[] ioFiles = {fileNameUtils, ioUtils};
246246
private static final File[] outputFiles = {proxyWriter, nullStream};
247247
// Filters
248248
private static final IOFileFilter dirsFilter = createNameFilter(dirs);

‎src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -97,34 +97,34 @@ public void testIterateFilesByExtension() {
9797

9898
Iterator<File> files = FileUtils.iterateFiles(temporaryFolder, extensions, false);
9999
try {
100-
final Collection<String> filenames = filesToFilenames(files);
101-
assertEquals(1, filenames.size());
102-
assertTrue(filenames.contains("dummy-build.xml"));
103-
assertFalse(filenames.contains("README"));
104-
assertFalse(filenames.contains("dummy-file.txt"));
100+
final Collection<String> fileNames = filesToFilenames(files);
101+
assertEquals(1, fileNames.size());
102+
assertTrue(fileNames.contains("dummy-build.xml"));
103+
assertFalse(fileNames.contains("README"));
104+
assertFalse(fileNames.contains("dummy-file.txt"));
105105
} finally {
106106
// Backstop in case filesToFilenames() failure.
107107
files.forEachRemaining(Consumers.nop());
108108
}
109109

110110
try {
111111
files = FileUtils.iterateFiles(temporaryFolder, extensions, true);
112-
final Collection<String> filenames = filesToFilenames(files);
113-
assertEquals(4, filenames.size());
114-
assertTrue(filenames.contains("dummy-file.txt"));
115-
assertFalse(filenames.contains("dummy-index.html"));
112+
final Collection<String> fileNames = filesToFilenames(files);
113+
assertEquals(4, fileNames.size());
114+
assertTrue(fileNames.contains("dummy-file.txt"));
115+
assertFalse(fileNames.contains("dummy-index.html"));
116116
} finally {
117117
// Backstop in case filesToFilenames() failure.
118118
files.forEachRemaining(Consumers.nop());
119119
}
120120

121121
files = FileUtils.iterateFiles(temporaryFolder, null, false);
122122
try {
123-
final Collection<String> filenames = filesToFilenames(files);
124-
assertEquals(2, filenames.size());
125-
assertTrue(filenames.contains("dummy-build.xml"));
126-
assertTrue(filenames.contains("README"));
127-
assertFalse(filenames.contains("dummy-file.txt"));
123+
final Collection<String> fileNames = filesToFilenames(files);
124+
assertEquals(2, fileNames.size());
125+
assertTrue(fileNames.contains("dummy-build.xml"));
126+
assertTrue(fileNames.contains("README"));
127+
assertFalse(fileNames.contains("dummy-file.txt"));
128128
} finally {
129129
// Backstop in case filesToFilenames() failure.
130130
files.forEachRemaining(Consumers.nop());
@@ -134,45 +134,45 @@ public void testIterateFilesByExtension() {
134134
@Test
135135
public void testListFiles() {
136136
Collection<File> files;
137-
Collection<String> filenames;
137+
Collection<String> fileNames;
138138
IOFileFilter fileFilter;
139139
IOFileFilter dirFilter;
140140

141141
// First, find non-recursively
142142
fileFilter = FileFilterUtils.trueFileFilter();
143143
files = FileUtils.listFiles(temporaryFolder, fileFilter, null);
144-
filenames = filesToFilenames(files);
145-
assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
146-
assertFalse(filenames.contains("dummy-index.html"), "'dummy-index.html' shouldn't be found");
147-
assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be found");
144+
fileNames = filesToFilenames(files);
145+
assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
146+
assertFalse(fileNames.contains("dummy-index.html"), "'dummy-index.html' shouldn't be found");
147+
assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be found");
148148

149149
// Second, find recursively
150150
fileFilter = FileFilterUtils.trueFileFilter();
151151
dirFilter = FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter("CVS"));
152152
files = FileUtils.listFiles(temporaryFolder, fileFilter, dirFilter);
153-
filenames = filesToFilenames(files);
154-
assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
155-
assertTrue(filenames.contains("dummy-index.html"), "'dummy-index.html' is missing");
156-
assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be found");
153+
fileNames = filesToFilenames(files);
154+
assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
155+
assertTrue(fileNames.contains("dummy-index.html"), "'dummy-index.html' is missing");
156+
assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be found");
157157

158158
// Do the same as above but now with the filter coming from FileFilterUtils
159159
fileFilter = FileFilterUtils.trueFileFilter();
160160
dirFilter = FileFilterUtils.makeCVSAware(null);
161161
files = FileUtils.listFiles(temporaryFolder, fileFilter, dirFilter);
162-
filenames = filesToFilenames(files);
163-
assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
164-
assertTrue(filenames.contains("dummy-index.html"), "'dummy-index.html' is missing");
165-
assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be found");
162+
fileNames = filesToFilenames(files);
163+
assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
164+
assertTrue(fileNames.contains("dummy-index.html"), "'dummy-index.html' is missing");
165+
assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be found");
166166

167167
// Again with the CVS filter but now with a non-null parameter
168168
fileFilter = FileFilterUtils.trueFileFilter();
169169
dirFilter = FileFilterUtils.prefixFileFilter("sub");
170170
dirFilter = FileFilterUtils.makeCVSAware(dirFilter);
171171
files = FileUtils.listFiles(temporaryFolder, fileFilter, dirFilter);
172-
filenames = filesToFilenames(files);
173-
assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
174-
assertTrue(filenames.contains("dummy-index.html"), "'dummy-index.html' is missing");
175-
assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be found");
172+
fileNames = filesToFilenames(files);
173+
assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml' is missing");
174+
assertTrue(fileNames.contains("dummy-index.html"), "'dummy-index.html' is missing");
175+
assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be found");
176176

177177
assertThrows(NullPointerException.class, () -> FileUtils.listFiles(temporaryFolder, null, null));
178178
}
@@ -183,23 +183,23 @@ public void testListFilesByExtension() {
183183

184184
Collection<File> files = FileUtils.listFiles(temporaryFolder, extensions, false);
185185
assertEquals(1, files.size());
186-
Collection<String> filenames = filesToFilenames(files);
187-
assertTrue(filenames.contains("dummy-build.xml"));
188-
assertFalse(filenames.contains("README"));
189-
assertFalse(filenames.contains("dummy-file.txt"));
186+
Collection<String> fileNames = filesToFilenames(files);
187+
assertTrue(fileNames.contains("dummy-build.xml"));
188+
assertFalse(fileNames.contains("README"));
189+
assertFalse(fileNames.contains("dummy-file.txt"));
190190

191191
files = FileUtils.listFiles(temporaryFolder, extensions, true);
192-
filenames = filesToFilenames(files);
193-
assertEquals(4, filenames.size());
194-
assertTrue(filenames.contains("dummy-file.txt"));
195-
assertFalse(filenames.contains("dummy-index.html"));
192+
fileNames = filesToFilenames(files);
193+
assertEquals(4, fileNames.size());
194+
assertTrue(fileNames.contains("dummy-file.txt"));
195+
assertFalse(fileNames.contains("dummy-index.html"));
196196

197197
files = FileUtils.listFiles(temporaryFolder, null, false);
198198
assertEquals(2, files.size());
199-
filenames = filesToFilenames(files);
200-
assertTrue(filenames.contains("dummy-build.xml"));
201-
assertTrue(filenames.contains("README"));
202-
assertFalse(filenames.contains("dummy-file.txt"));
199+
fileNames = filesToFilenames(files);
200+
assertTrue(fileNames.contains("dummy-build.xml"));
201+
assertTrue(fileNames.contains("README"));
202+
assertFalse(fileNames.contains("dummy-file.txt"));
203203
}
204204

205205

‎src/test/java/org/apache/commons/io/FileUtilsTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ public void testDeleteQuietlyNonExistent() {
14361436
public void testFileUtils() throws Exception {
14371437
// Loads file from classpath
14381438
final File file1 = new File(tempDirFile, "test.txt");
1439-
final String filename = file1.getAbsolutePath();
1439+
final String fileName = file1.getAbsolutePath();
14401440

14411441
//Create test file on-the-fly (used to be in CVS)
14421442
try (OutputStream out = Files.newOutputStream(file1.toPath())) {
@@ -1445,16 +1445,16 @@ public void testFileUtils() throws Exception {
14451445

14461446
final File file2 = new File(tempDirFile, "test2.txt");
14471447

1448-
FileUtils.writeStringToFile(file2, filename, UTF_8);
1448+
FileUtils.writeStringToFile(file2, fileName, UTF_8);
14491449
assertTrue(file2.exists());
14501450
assertTrue(file2.length() > 0);
14511451

14521452
final String file2contents = FileUtils.readFileToString(file2, UTF_8);
1453-
assertEquals(filename, file2contents, "Second file's contents correct");
1453+
assertEquals(fileName, file2contents, "Second file's contents correct");
14541454

14551455
assertTrue(file2.delete());
14561456

1457-
final String contents = FileUtils.readFileToString(new File(filename), UTF_8);
1457+
final String contents = FileUtils.readFileToString(new File(fileName), UTF_8);
14581458
assertEquals("This is a test", contents, "FileUtils.fileRead()");
14591459

14601460
}
@@ -1629,8 +1629,8 @@ public void testIO300() {
16291629
@Test
16301630
public void testIO575() throws IOException {
16311631
final Path sourceDir = Files.createTempDirectory("source-dir");
1632-
final String filename = "some-file";
1633-
final Path sourceFile = Files.createFile(sourceDir.resolve(filename));
1632+
final String fileName = "some-file";
1633+
final Path sourceFile = Files.createFile(sourceDir.resolve(fileName));
16341634

16351635
assertEquals(SystemUtils.IS_OS_WINDOWS, sourceFile.toFile().canExecute());
16361636

@@ -1642,7 +1642,7 @@ public void testIO575() throws IOException {
16421642

16431643
FileUtils.copyDirectory(sourceDir.toFile(), destDir.toFile());
16441644

1645-
final Path destFile = destDir.resolve(filename);
1645+
final Path destFile = destDir.resolve(fileName);
16461646

16471647
assertTrue(destFile.toFile().exists());
16481648
assertTrue(destFile.toFile().canExecute());

‎src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void testFilterBuiltUsingAdd() {
104104
final boolean[] trueResults = testTrueResults.get(i);
105105
final boolean[] falseResults = testFalseResults.get(i);
106106
final boolean fileResults = testFileResults.get(i);
107-
final boolean filenameResults = testFilenameResults.get(i);
107+
final boolean fileNameResults = testFilenameResults.get(i);
108108

109109
// Test conditional AND filter created by passing filters to the constructor
110110
final IOFileFilter filter = this.buildFilterUsingAdd(filters);
@@ -116,10 +116,10 @@ public void testFilterBuiltUsingAdd() {
116116
assertTrueFiltersInvoked(i, trueFilters, trueResults);
117117
assertFalseFiltersInvoked(i, falseFilters, falseResults);
118118

119-
// Test as a filename filter
119+
// Test as a file name filter
120120
resetTrueFilters(this.trueFilters);
121121
resetFalseFilters(this.falseFilters);
122-
assertFilenameFiltering(i, filter, this.file, filenameResults);
122+
assertFilenameFiltering(i, filter, this.file, fileNameResults);
123123
assertTrueFiltersInvoked(i, trueFilters, trueResults);
124124
assertFalseFiltersInvoked(i, falseFilters, falseResults);
125125
}
@@ -138,7 +138,7 @@ public void testFilterBuiltUsingConstructor() {
138138
final boolean[] trueResults = testTrueResults.get(i);
139139
final boolean[] falseResults = testFalseResults.get(i);
140140
final boolean fileResults = testFileResults.get(i);
141-
final boolean filenameResults = testFilenameResults.get(i);
141+
final boolean fileNameResults = testFilenameResults.get(i);
142142

143143
// Test conditional AND filter created by passing filters to the constructor
144144
final IOFileFilter filter = this.buildFilterUsingConstructor(filters);
@@ -150,10 +150,10 @@ public void testFilterBuiltUsingConstructor() {
150150
assertTrueFiltersInvoked(i, trueFilters, trueResults);
151151
assertFalseFiltersInvoked(i, falseFilters, falseResults);
152152

153-
// Test as a filename filter
153+
// Test as a file name filter
154154
resetTrueFilters(this.trueFilters);
155155
resetFalseFilters(this.falseFilters);
156-
assertFilenameFiltering(i, filter, this.file, filenameResults);
156+
assertFilenameFiltering(i, filter, this.file, fileNameResults);
157157
assertTrueFiltersInvoked(i, trueFilters, trueResults);
158158
assertFalseFiltersInvoked(i, falseFilters, falseResults);
159159
}

‎src/test/java/org/apache/commons/io/test/TestUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ public static void generateTestData(final OutputStream out, final long size) thr
224224
}
225225
}
226226

227-
public static File newFile(final File testDirectory, final String filename) throws IOException {
228-
final File destination = new File(testDirectory, filename);
227+
public static File newFile(final File testDirectory, final String fileName) throws IOException {
228+
final File destination = new File(testDirectory, fileName);
229229
/*
230-
assertTrue( filename + "Test output data file shouldn't previously exist",
231-
!destination.exists() );
230+
assertTrue(fileName + "Test output data file shouldn't previously exist",
231+
!destination.exists());
232232
*/
233233
if (destination.exists()) {
234234
FileUtils.forceDelete(destination);

0 commit comments

Comments
 (0)