Skip to content

Commit 4fe3854

Browse files
committed
Internal refactoring
- Remove dead comment - Reduce vertical whitespace
1 parent ac3556b commit 4fe3854

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,16 +229,7 @@ public MagicNumberFileFilter(final String magicNumber) {
229229
* a negative number.
230230
*/
231231
public MagicNumberFileFilter(final String magicNumber, final long offset) {
232-
Objects.requireNonNull(magicNumber, "magicNumber");
233-
if (magicNumber.isEmpty()) {
234-
throw new IllegalArgumentException("The magic number must contain at least one byte");
235-
}
236-
if (offset < 0) {
237-
throw new IllegalArgumentException("The offset cannot be negative");
238-
}
239-
240-
this.magicNumbers = magicNumber.getBytes(Charset.defaultCharset()); // explicitly uses the platform default charset
241-
this.byteOffset = offset;
232+
this(magicNumber.getBytes(Charset.defaultCharset()), offset);
242233
}
243234

244235
/**

src/main/java/org/apache/commons/io/output/LockableFileWriter.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ public Builder setLockDirectory(final String lockDirectory) {
149149
/** The extension for the lock file. */
150150
private static final String LCK = ".lck";
151151

152-
// Cannot extend ProxyWriter, as requires writer to be
153-
// known when super() is called
154-
155152
/**
156153
* Constructs a new {@link Builder}.
157154
*
@@ -250,16 +247,13 @@ public LockableFileWriter(final File file, final Charset charset, final boolean
250247
if (absFile.isDirectory()) {
251248
throw new IOException("File specified is a directory");
252249
}
253-
254250
// init lock file
255251
final File lockDirFile = new File(lockDir != null ? lockDir : FileUtils.getTempDirectoryPath());
256252
FileUtils.forceMkdir(lockDirFile);
257253
testLockDir(lockDirFile);
258254
lockFile = new File(lockDirFile, absFile.getName() + LCK);
259-
260255
// check if locked
261256
createLock();
262-
263257
// init wrapped writer
264258
out = initWriter(absFile, charset, append);
265259
}
@@ -391,7 +385,6 @@ private Writer initWriter(final File file, final Charset charset, final boolean
391385
final boolean fileExistedAlready = file.exists();
392386
try {
393387
return new OutputStreamWriter(new FileOutputStream(file.getAbsolutePath(), append), Charsets.toCharset(charset));
394-
395388
} catch (final IOException | RuntimeException ex) {
396389
FileUtils.deleteQuietly(lockFile);
397390
if (!fileExistedAlready) {

0 commit comments

Comments
 (0)