Skip to content

Commit e74396f

Browse files
committed
Drop Invokable interface
1 parent 3e593c5 commit e74396f

File tree

3 files changed

+7
-42
lines changed

3 files changed

+7
-42
lines changed

src/main/java/org/codehaus/mojo/exec/ExecMojo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.Properties;
3939
import java.util.Set;
4040
import java.util.TreeSet;
41+
import java.util.function.Consumer;
4142
import java.util.jar.JarEntry;
4243
import java.util.jar.JarOutputStream;
4344
import java.util.jar.Manifest;
@@ -435,7 +436,7 @@ else if (useMavenLogger)
435436
getLog().debug("Will redirect program output to Maven logger");
436437
final String parentThreadName = Thread.currentThread().getName();
437438
final String logSuffix = "[" + parentThreadName + "] ";
438-
Invokable<String> mavenOutRedirect = new Invokable<String>()
439+
Consumer<String> mavenOutRedirect = new Consumer<String>()
439440
{
440441

441442
@Override
@@ -451,7 +452,7 @@ public void accept(String logMessage)
451452
}
452453
}
453454
};
454-
Invokable<String> mavenErrRedirect = new Invokable<String>()
455+
Consumer<String> mavenErrRedirect = new Consumer<String>()
455456
{
456457

457458
@Override

src/main/java/org/codehaus/mojo/exec/Invokable.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/main/java/org/codehaus/mojo/exec/LineRedirectOutputStream.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
*/
2121

2222
import java.io.OutputStream;
23+
import java.util.function.Consumer;
2324

2425
/**
2526
* An output stream that captures one line of output at a time, and then
26-
* redirects that line to some {@link Invokable} to act upon as it pleases. This
27+
* redirects that line to some {@link Consumer} to act upon as it pleases. This
2728
* class is not thread safe and expects to have only one active writer consuming
2829
* it at any given time.
2930
*
@@ -32,9 +33,9 @@
3233
class LineRedirectOutputStream extends OutputStream {
3334

3435
private StringBuilder currentLine = new StringBuilder();
35-
private final Invokable<String> linePrinter;
36+
private final Consumer<String> linePrinter;
3637

37-
public LineRedirectOutputStream(Invokable<String> linePrinter) {
38+
public LineRedirectOutputStream(Consumer<String> linePrinter) {
3839
this.linePrinter = linePrinter;
3940
}
4041

0 commit comments

Comments
 (0)