Skip to content

Commit c2ae670

Browse files
author
Christoph Läubrich
committed
Inline EmptyScanner into build context
EmptyScanner is actually only used (and useful) in the DefaultBuildContext and should be a private final inner class to not blow the API that needs to be maintained. Fix codehaus-plexus#46
1 parent 985c360 commit c2ae670

File tree

2 files changed

+39
-102
lines changed

2 files changed

+39
-102
lines changed

src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java

+39-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.IOException;
2121
import java.io.OutputStream;
2222
import java.nio.file.Files;
23+
import java.util.Comparator;
2324
import java.util.List;
2425
import java.util.Map;
2526
import java.util.concurrent.ConcurrentHashMap;
@@ -47,6 +48,7 @@
4748
@Singleton
4849
public class DefaultBuildContext implements BuildContext {
4950

51+
private static final String[] EMPTY_STRING_ARRAY = new String[0];
5052
private final Map<String, Object> contextMap = new ConcurrentHashMap<>();
5153
private final Logger logger = LoggerFactory.getLogger(DefaultBuildContext.class);
5254
/** {@inheritDoc} */
@@ -93,7 +95,43 @@ public void refresh(File file) {
9395

9496
/** {@inheritDoc} */
9597
public Scanner newDeleteScanner(File basedir) {
96-
return new EmptyScanner(basedir);
98+
return new Scanner() {
99+
@Override
100+
public void addDefaultExcludes() {
101+
}
102+
103+
@Override
104+
public String[] getIncludedDirectories() {
105+
return EMPTY_STRING_ARRAY;
106+
}
107+
108+
@Override
109+
public String[] getIncludedFiles() {
110+
return EMPTY_STRING_ARRAY;
111+
}
112+
113+
@Override
114+
public void scan() {
115+
}
116+
117+
@Override
118+
public void setExcludes(String[] excludes) {
119+
}
120+
121+
@Override
122+
public void setIncludes(String[] includes) {
123+
}
124+
125+
@Override
126+
public File getBasedir() {
127+
return basedir;
128+
}
129+
130+
@Override
131+
public void setFilenameComparator(Comparator<String> comparator) {
132+
133+
}
134+
};
97135
}
98136

99137
/** {@inheritDoc} */

src/main/java/org/codehaus/plexus/build/EmptyScanner.java

-101
This file was deleted.

0 commit comments

Comments
 (0)