You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by po...@apache.org on 2017/10/19 05:04:59 UTC
svn commit: r1812600 - in /creadur/rat/trunk:
apache-rat-api/src/main/java/org/apache/rat/api/domain/
apache-rat-core/src/main/java/org/apache/rat/
apache-rat-core/src/main/java/org/apache/rat/analysis/
apache-rat-core/src/main/java/org/apache/rat/anal...
Author: pottlinger
Date: Thu Oct 19 05:04:59 2017
New Revision: 1812600
URL: http://svn.apache.org/viewvc?rev=1812600&view=rev
Log:
Apply minor code refactorings/optimizations
Modified:
creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
creadur/rat/trunk/apache-rat-plugin/src/it/it1/verify.groovy
creadur/rat/trunk/apache-rat-plugin/src/it/it4_RAT-168/verify.groovy
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it1/pom.xml
creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it2/pom.xml
creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
Modified: creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java (original)
+++ creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java Thu Oct 19 05:04:59 2017
@@ -90,8 +90,8 @@ public enum RatLicenseFamily {
* @param notes
* not null
*/
- private RatLicenseFamily(final String name, final String category,
- final String notes) {
+ RatLicenseFamily(final String name, final String category,
+ final String notes) {
this.name = name;
this.category = category;
this.notes = notes;
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java Thu Oct 19 05:04:59 2017
@@ -51,10 +51,9 @@ public class Report {
configuration.setApproveDefaultLicenses(true);
Options opts = buildOptions();
- DefaultParser parser = new DefaultParser();
CommandLine cl = null;
try {
- cl = parser.parse(opts, args);
+ cl = new DefaultParser().parse(opts, args);
} catch (ParseException e) {
System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
System.exit(1);
@@ -231,18 +230,17 @@ public class Report {
HelpFormatter f = new HelpFormatter();
String header = "Options";
- StringBuilder footer = new StringBuilder();
- footer.append("\nNOTE:\n");
- footer.append("Rat is really little more than a grep ATM\n");
- footer.append("Rat is also rather memory hungry ATM\n");
- footer.append("Rat is very basic ATM\n");
- footer.append("Rat highlights possible issues\n");
- footer.append("Rat reports require interpretation\n");
- footer.append("Rat often requires some tuning before it runs well against a project\n");
- footer.append("Rat relies on heuristics: it may miss issues\n");
+ String footer = "\nNOTE:\n" +
+ "Rat is really little more than a grep ATM\n" +
+ "Rat is also rather memory hungry ATM\n" +
+ "Rat is very basic ATM\n" +
+ "Rat highlights possible issues\n" +
+ "Rat reports require interpretation\n" +
+ "Rat often requires some tuning before it runs well against a project\n" +
+ "Rat relies on heuristics: it may miss issues\n";
f.printHelp("java rat.report [options] [DIR|TARBALL]",
- header, opts, footer.toString(), false);
+ header, opts, footer, false);
System.exit(0);
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java Thu Oct 19 05:04:59 2017
@@ -44,12 +44,6 @@ class HeaderCheckWorker {
private int headerLinesToRead;
private boolean finished = false;
- public HeaderCheckWorker(Reader reader, int numberOfRetainedHeaderLine,
- final IHeaderMatcher matcher, final Document name) {
- this(new BufferedReader(reader), numberOfRetainedHeaderLine, matcher, name);
- }
-
-
/**
* Convenience constructor wraps given <code>Reader</code>
* in a <code>BufferedReader</code>.
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java Thu Oct 19 05:04:59 2017
@@ -56,14 +56,13 @@ public class AppliedApacheSoftwareLicens
@Override
public boolean match(Document subject, String s) throws RatHeaderAnalysisException {
- boolean result = false;
if (isCopyrightMatch()) {
return textMatcher.match(subject, s); // will report the match if it has occurred
}
else {
matchCopyright(s);
}
- return result;
+ return false;
}
@Override
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java Thu Oct 19 05:04:59 2017
@@ -97,7 +97,7 @@ public class FullTextMatchingLicense ext
return true; // we found a match
} else { // buffer contains first line but does not contain full text
// It's possible that the buffer contains the first line again
- int offset = buffer.substring(1).toString().indexOf(firstLine);
+ int offset = buffer.substring(1).indexOf(firstLine);
if (offset >= 0) { // first line found again
buffer.delete(0,offset); // reset buffer to the new start
} else { // buffer does not even contain first line, so cannot be used to match full text
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java Thu Oct 19 05:04:59 2017
@@ -133,59 +133,59 @@ public abstract class AbstractLicenseApp
Arrays.sort(EXPECTS_XML_DECL);
Arrays.sort(EXPECTS_MSVSSF_HEADER);
- EXT2TYPE.put("apt", Integer.valueOf(TYPE_APT));
- EXT2TYPE.put("asax", Integer.valueOf(TYPE_HTML));
- EXT2TYPE.put("ascx", Integer.valueOf(TYPE_HTML));
- EXT2TYPE.put("aspx", Integer.valueOf(TYPE_HTML));
- EXT2TYPE.put("bat", Integer.valueOf(TYPE_BAT));
- EXT2TYPE.put("bsh", Integer.valueOf(TYPE_BEANSHELL));
- EXT2TYPE.put("c", Integer.valueOf(TYPE_C));
- EXT2TYPE.put("cc", Integer.valueOf(TYPE_CPP));
- EXT2TYPE.put("cmd", Integer.valueOf(TYPE_BAT));
- EXT2TYPE.put("config", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("cpp", Integer.valueOf(TYPE_CPP));
- EXT2TYPE.put("cs", Integer.valueOf(TYPE_CSHARP));
- EXT2TYPE.put("csdproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("csproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("css", Integer.valueOf(TYPE_CSS));
- EXT2TYPE.put("fxcop", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("fml", Integer.valueOf(TYPE_FML));
- EXT2TYPE.put("groovy", Integer.valueOf(TYPE_GROOVY));
- EXT2TYPE.put("go", Integer.valueOf(TYPE_GO));
- EXT2TYPE.put("h", Integer.valueOf(TYPE_H));
- EXT2TYPE.put("hh", Integer.valueOf(TYPE_H));
- EXT2TYPE.put("hpp", Integer.valueOf(TYPE_H));
- EXT2TYPE.put("htm", Integer.valueOf(TYPE_HTML));
- EXT2TYPE.put("html", Integer.valueOf(TYPE_HTML));
- EXT2TYPE.put("java", Integer.valueOf(TYPE_JAVA));
- EXT2TYPE.put("js", Integer.valueOf(TYPE_JAVASCRIPT));
- EXT2TYPE.put("jsp", Integer.valueOf(TYPE_JSP));
- EXT2TYPE.put("ndoc", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("nunit", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("php", Integer.valueOf(TYPE_PHP));
- EXT2TYPE.put("pl", Integer.valueOf(TYPE_PERL));
- EXT2TYPE.put("pm", Integer.valueOf(TYPE_PM));
- EXT2TYPE.put("properties", Integer.valueOf(TYPE_PROPERTIES));
- EXT2TYPE.put("py", Integer.valueOf(TYPE_PYTHON));
- EXT2TYPE.put("rb", Integer.valueOf(TYPE_RUBY));
- EXT2TYPE.put("rdf", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("resx", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("scala", Integer.valueOf(TYPE_SCALA));
- EXT2TYPE.put("sh", Integer.valueOf(TYPE_SH));
- EXT2TYPE.put("shfbproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("sln", Integer.valueOf(TYPE_VISUAL_STUDIO_SOLUTION));
- EXT2TYPE.put("stylecop", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("svg", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("tcl", Integer.valueOf(TYPE_TCL));
- EXT2TYPE.put("vbdproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("vbproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("vcproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("vm", Integer.valueOf(TYPE_VM));
- EXT2TYPE.put("vsdisco", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("webinfo", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("xml", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("xproj", Integer.valueOf(TYPE_XML));
- EXT2TYPE.put("xsl", Integer.valueOf(TYPE_XML));
+ EXT2TYPE.put("apt", TYPE_APT);
+ EXT2TYPE.put("asax", TYPE_HTML);
+ EXT2TYPE.put("ascx", TYPE_HTML);
+ EXT2TYPE.put("aspx", TYPE_HTML);
+ EXT2TYPE.put("bat", TYPE_BAT);
+ EXT2TYPE.put("bsh", TYPE_BEANSHELL);
+ EXT2TYPE.put("c", TYPE_C);
+ EXT2TYPE.put("cc", TYPE_CPP);
+ EXT2TYPE.put("cmd", TYPE_BAT);
+ EXT2TYPE.put("config", TYPE_XML);
+ EXT2TYPE.put("cpp", TYPE_CPP);
+ EXT2TYPE.put("cs", TYPE_CSHARP);
+ EXT2TYPE.put("csdproj", TYPE_XML);
+ EXT2TYPE.put("csproj", TYPE_XML);
+ EXT2TYPE.put("css", TYPE_CSS);
+ EXT2TYPE.put("fxcop", TYPE_XML);
+ EXT2TYPE.put("fml", TYPE_FML);
+ EXT2TYPE.put("groovy", TYPE_GROOVY);
+ EXT2TYPE.put("go", TYPE_GO);
+ EXT2TYPE.put("h", TYPE_H);
+ EXT2TYPE.put("hh", TYPE_H);
+ EXT2TYPE.put("hpp", TYPE_H);
+ EXT2TYPE.put("htm", TYPE_HTML);
+ EXT2TYPE.put("html", TYPE_HTML);
+ EXT2TYPE.put("java", TYPE_JAVA);
+ EXT2TYPE.put("js", TYPE_JAVASCRIPT);
+ EXT2TYPE.put("jsp", TYPE_JSP);
+ EXT2TYPE.put("ndoc", TYPE_XML);
+ EXT2TYPE.put("nunit", TYPE_XML);
+ EXT2TYPE.put("php", TYPE_PHP);
+ EXT2TYPE.put("pl", TYPE_PERL);
+ EXT2TYPE.put("pm", TYPE_PM);
+ EXT2TYPE.put("properties", TYPE_PROPERTIES);
+ EXT2TYPE.put("py", TYPE_PYTHON);
+ EXT2TYPE.put("rb", TYPE_RUBY);
+ EXT2TYPE.put("rdf", TYPE_XML);
+ EXT2TYPE.put("resx", TYPE_XML);
+ EXT2TYPE.put("scala", TYPE_SCALA);
+ EXT2TYPE.put("sh", TYPE_SH);
+ EXT2TYPE.put("shfbproj", TYPE_XML);
+ EXT2TYPE.put("sln", TYPE_VISUAL_STUDIO_SOLUTION);
+ EXT2TYPE.put("stylecop", TYPE_XML);
+ EXT2TYPE.put("svg", TYPE_XML);
+ EXT2TYPE.put("tcl", TYPE_TCL);
+ EXT2TYPE.put("vbdproj", TYPE_XML);
+ EXT2TYPE.put("vbproj", TYPE_XML);
+ EXT2TYPE.put("vcproj", TYPE_XML);
+ EXT2TYPE.put("vm", TYPE_VM);
+ EXT2TYPE.put("vsdisco", TYPE_XML);
+ EXT2TYPE.put("webinfo", TYPE_XML);
+ EXT2TYPE.put("xml", TYPE_XML);
+ EXT2TYPE.put("xproj", TYPE_XML);
+ EXT2TYPE.put("xsl", TYPE_XML);
}
private boolean isForced;
@@ -360,7 +360,7 @@ public abstract class AbstractLicenseApp
String ext = path.substring(lastDot + 1);
Integer type = EXT2TYPE.get(ext);
if (type != null) {
- return type.intValue();
+ return type;
}
}
return TYPE_UNKNOWN;
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java Thu Oct 19 05:04:59 2017
@@ -43,7 +43,7 @@ public class ContentType {
this.subType = subType.toLowerCase(Locale.US);
this.parameters = new HashMap<String, String>(parameters.size());
for (Map.Entry<String, String> entry : parameters.entrySet()) {
- this.parameters.put(entry.getKey().toString().toLowerCase(Locale.US), entry.getValue());
+ this.parameters.put(entry.getKey().toLowerCase(Locale.US), entry.getValue());
}
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java Thu Oct 19 05:04:59 2017
@@ -25,9 +25,6 @@ public enum ReportFormat {
XML;
public boolean is(String optionGiven) {
- if (optionGiven == null || optionGiven.length() == 0) {
- return false;
- }
- return name().equalsIgnoreCase(optionGiven);
+ return optionGiven != null && optionGiven.length() != 0 && name().equalsIgnoreCase(optionGiven);
}
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java Thu Oct 19 05:04:59 2017
@@ -40,7 +40,7 @@ public enum SourceCodeManagementSystems
*/
private String ignoreFile;
- private SourceCodeManagementSystems(String directory, String ignoreFile) {
+ SourceCodeManagementSystems(String directory, String ignoreFile) {
this.directory = directory;
this.ignoreFile = ignoreFile;
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java Thu Oct 19 05:04:59 2017
@@ -31,8 +31,7 @@ public class DocumentImplUtils {
public final static String toName(File file) {
String path = file.getPath();
- String normalisedPath = path.replace('\\', '/');
- return normalisedPath;
+ return path.replace('\\', '/');
}
public static final boolean isZipStream(InputStream stream) {
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java Thu Oct 19 05:04:59 2017
@@ -158,11 +158,7 @@ public class BinaryGuesser {
* @return Is a file by that name a known non-binary file?
*/
public static final boolean isNonBinary(final String name) {
- if (name == null) {
- return false;
- }
- return extensionMatches(name.toUpperCase(Locale.US),
- BinaryGuesser.NON_BINARY_EXTENSIONS);
+ return name != null && extensionMatches(name.toUpperCase(Locale.US), BinaryGuesser.NON_BINARY_EXTENSIONS);
}
/**
@@ -176,8 +172,8 @@ public class BinaryGuesser {
public static boolean containsExtension(final String name,
final String[] exts) {
- for (int i = 0; i < exts.length; i++) {
- if (name.contains(DOT + exts[i] + DOT)) {
+ for (String ext : exts) {
+ if (name.contains(DOT + ext + DOT)) {
return true;
}
}
@@ -186,8 +182,8 @@ public class BinaryGuesser {
public static boolean extensionMatches(final String name,
final String[] exts) {
- for (int i = 0; i < exts.length; i++) {
- if (name.endsWith(DOT + exts[i])) {
+ for (String ext : exts) {
+ if (name.endsWith(DOT + ext)) {
return true;
}
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java Thu Oct 19 05:04:59 2017
@@ -61,8 +61,7 @@ public class HeaderMatcher {
}
if (headers != null) {
final int length = headers.length;
- for (int i=0;i<length;i++) {
- final HeaderBean headerBean = headers[i];
+ for (final HeaderBean headerBean : headers) {
if (headerBean != null) {
final Pattern headerPattern = headerBean.getHeaderPattern();
if (headerPattern != null) {
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java Thu Oct 19 05:04:59 2017
@@ -445,7 +445,7 @@ public final class XmlWriter implements
if (elementsWritten && elementNames.isEmpty()) {
throw new OperationNotAllowedException("Root element already closed. Cannot open new element.");
}
- if (!isValidName(elementName)) {
+ if (isInvalidName(elementName)) {
throw new InvalidXmlException("'" + elementName + "' is not a valid element name");
}
elementsWritten = true;
@@ -481,7 +481,7 @@ public final class XmlWriter implements
throw new OperationNotAllowedException("Close called before an element has been opened.");
}
}
- if (!isValidName(name)) {
+ if (isInvalidName(name)) {
throw new InvalidXmlException("'" + name + "' is not a valid attribute name.");
}
if (!inElement) {
@@ -618,7 +618,7 @@ public final class XmlWriter implements
}
}
- private boolean isValidName(final CharSequence sequence) {
+ private boolean isInvalidName(final CharSequence sequence) {
boolean result = true;
final int length = sequence.length();
for (int i = 0; i < length; i++) {
@@ -635,7 +635,7 @@ public final class XmlWriter implements
}
}
}
- return result;
+ return !result;
}
private boolean isValidNameStart(final char character) {
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java Thu Oct 19 05:04:59 2017
@@ -90,7 +90,7 @@ public class ArchiveWalker extends Walke
offset += actualRead;
}
- if (!entry.isDirectory() && !ignored(f)) {
+ if (!entry.isDirectory() && isNotIgnored(f)) {
report(report, contents, f);
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java Thu Oct 19 05:04:59 2017
@@ -109,7 +109,7 @@ public class DirectoryWalker extends Wal
*/
private void processDirectories(final RatReport report, final File[] files) throws RatException {
for (final File file : files) {
- if (!ignored(file) && file.isDirectory()) {
+ if (isNotIgnored(file) && file.isDirectory()) {
processDirectory(report, file);
}
}
@@ -124,7 +124,7 @@ public class DirectoryWalker extends Wal
*/
private void processNonDirectories(final RatReport report, final File[] files) throws RatException {
for (final File file : files) {
- if (!ignored(file) && !file.isDirectory()) {
+ if (isNotIgnored(file) && !file.isDirectory()) {
report(report, file);
}
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java Thu Oct 19 05:04:59 2017
@@ -53,14 +53,14 @@ public abstract class Walker implements
return file.getName().startsWith(".");
}
- protected final boolean ignored(final File file) {
+ protected final boolean isNotIgnored(final File file) {
boolean result = false;
if (filter != null) {
final String name = file.getName();
final File dir = file.getParentFile();
result = !filter.accept(dir, name);
}
- return result;
+ return !result;
}
public Walker(File file, final FilenameFilter filter) {
Modified: creadur/rat/trunk/apache-rat-plugin/src/it/it1/verify.groovy
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/it/it1/verify.groovy?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/it/it1/verify.groovy (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/it/it1/verify.groovy Thu Oct 19 05:04:59 2017
@@ -14,6 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-content = new File( basedir, 'target/rat.txt' ).text;
+content = new File( basedir, 'target/rat.txt' ).text
-assert content.contains( 'YAL__ src.apt' );
\ No newline at end of file
+assert content.contains( 'YAL__ src.apt' )
\ No newline at end of file
Modified: creadur/rat/trunk/apache-rat-plugin/src/it/it4_RAT-168/verify.groovy
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/it/it4_RAT-168/verify.groovy?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/it/it4_RAT-168/verify.groovy (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/it/it4_RAT-168/verify.groovy Thu Oct 19 05:04:59 2017
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-content = new File( basedir, 'build.log' ).text;
+content = new File( basedir, 'build.log' ).text
-assert content.contains( 'BUILD SUCCESS' );
+assert content.contains( 'BUILD SUCCESS' )
/*
* [WARNING] No resources included
*/
-assert ! content.contains( '[WARNING]' );
+assert ! content.contains( '[WARNING]' )
-report = new File( basedir, 'target/site/rat-report.html' ).text;
+report = new File( basedir, 'target/site/rat-report.html' ).text
-assert report.contains( 'AL pom.xml' );
+assert report.contains( 'AL pom.xml' )
Modified: creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java Thu Oct 19 05:04:59 2017
@@ -97,8 +97,6 @@ public class ScmIgnoreParserTest {
FileWriter fw = new FileWriter(file.getAbsoluteFile());
bw = new BufferedWriter(fw);
bw.write(contents);
- } catch (IOException e) {
- throw e;
} finally {
IOUtils.closeQuietly(bw);
}
Modified: creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it1/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it1/pom.xml?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it1/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it1/pom.xml Thu Oct 19 05:04:59 2017
@@ -19,6 +19,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mojo.rat.test</groupId>
<artifactId>it1</artifactId>
<version>1.0</version>
Modified: creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it2/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it2/pom.xml?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it2/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it2/pom.xml Thu Oct 19 05:04:59 2017
@@ -19,6 +19,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rat.test</groupId>
<artifactId>it2</artifactId>
<version>1.0</version>
Modified: creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it3/pom.xml?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it3/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/test/resources/unit/it3/pom.xml Thu Oct 19 05:04:59 2017
@@ -19,6 +19,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rat.test</groupId>
<artifactId>it3</artifactId>
<version>1.0</version>
Modified: creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java (original)
+++ creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java Thu Oct 19 05:04:59 2017
@@ -171,10 +171,9 @@ public class Report extends Task {
*/
public void addConfiguredStylesheet(Union u) {
if (stylesheet != null || u.size() != 1) {
- throw new BuildException("You must not specify more than one"
- + " stylesheet.");
+ throw new BuildException("You must not specify more than one stylesheet.");
}
- stylesheet = (Resource) u.iterator().next();
+ stylesheet = u.iterator().next();
}
/**
Modified: creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java (original)
+++ creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java Thu Oct 19 05:04:59 2017
@@ -48,8 +48,7 @@ class ResourceCollectionContainer implem
public void run(RatReport report) throws RatException {
ResourceDocument document = new ResourceDocument();
- for (Iterator<?> iter = rc.iterator(); iter.hasNext(); ) {
- Resource r = (Resource) iter.next();
+ for (Resource r : rc) {
if (!r.isDirectory()) {
document.setResource(r);
document.getMetaData().clear();
@@ -68,8 +67,7 @@ class ResourceCollectionContainer implem
public Reader reader() throws IOException {
final InputStream in = resource.getInputStream();
- final Reader result = new InputStreamReader(in);
- return result;
+ return new InputStreamReader(in);
}
public String getName() {
Modified: creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java?rev=1812600&r1=1812599&r2=1812600&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java (original)
+++ creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java Thu Oct 19 05:04:59 2017
@@ -35,7 +35,8 @@ public abstract class AbstractRatAntTask
}
@Override
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
configureProject(getAntFile().getPath());
}