You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/05/14 22:35:47 UTC
[lucene-solr] branch jira/SOLR-13452_gradle updated: SOLR-13452:
Small changes to remove a bunch of messy warning output about lack of
input/output annotations on fields.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle by this push:
new 092f5b3 SOLR-13452: Small changes to remove a bunch of messy warning output about lack of input/output annotations on fields.
092f5b3 is described below
commit 092f5b35be914793f200e8ab071eeaad7d053afc
Author: markrmiller <ma...@apache.org>
AuthorDate: Tue May 14 17:35:44 2019 -0500
SOLR-13452: Small changes to remove a bunch of messy warning output about lack of input/output annotations on fields.
---
.../lucene/gradle/CheckSourcePatterns.groovy | 49 +++++++++++-----------
.../apache/lucene/gradle/CheckWorkingCopy.groovy | 3 ++
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy
index afd05de..948f234 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckSourcePatterns.groovy
@@ -120,7 +120,7 @@ class CheckSourcePatterns extends DefaultTask {
}
}
- def exts = [
+ def static exts = [
'java',
'jflex',
'py',
@@ -144,7 +144,8 @@ class CheckSourcePatterns extends DefaultTask {
'adoc',
'json',
]
- def invalidPatterns = [
+
+ def static invalidPatterns = [
(~$/@author\b/$) : '@author javadoc tag',
(~$/(?i)\bno(n|)commit\b/$) : 'nocommit',
(~$/\bTOOD:/$) : 'TOOD instead TODO',
@@ -161,36 +162,36 @@ class CheckSourcePatterns extends DefaultTask {
(~$/import java\.lang\.\w+;/$) : 'java.lang import is unnecessary'
]
- def found = 0
- def violations = new TreeSet()
- def reportViolation = { f, name ->
+ def static found = 0
+ def static violations = new TreeSet()
+ def static reportViolation = { f, name ->
log.error(name + ': ' + f.toString().substring(baseDir.length() + 1).replace(File.separatorChar, (char)'/'))
violations.add(name)
found++
}
- def javadocsPattern = ~$/(?sm)^\Q/**\E(.*?)\Q*/\E/$
- def javaCommentPattern = ~$/(?sm)^\Q/*\E(.*?)\Q*/\E/$
- def xmlCommentPattern = ~$/(?sm)\Q<!--\E(.*?)\Q-->\E/$
- def lineSplitter = ~$/[\r\n]+/$
- def singleLineSplitter = ~$/\n\r?/$
- def licenseMatcher = Defaults.createDefaultMatcher()
- def validLoggerPattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+\p{javaJavaIdentifierStart}+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$
- def validLoggerNamePattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+log+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$
- def packagePattern = ~$/(?m)^\s*package\s+org\.apache.*;/$
- def xmlTagPattern = ~$/(?m)\s*<[a-zA-Z].*/$
- def sourceHeaderPattern = ~$/\[source\b.*/$
- def blockBoundaryPattern = ~$/----\s*/$
- def blockTitlePattern = ~$/\..*/$
- def unescapedSymbolPattern = ~$/(?<=[^\\]|^)([-=]>|<[-=])/$ // SOLR-10883
- def extendsLuceneTestCasePattern = ~$/public.*?class.*?extends.*?LuceneTestCase[^\n]*?\n/$
+ def static javadocsPattern = ~$/(?sm)^\Q/**\E(.*?)\Q*/\E/$
+ def static javaCommentPattern = ~$/(?sm)^\Q/*\E(.*?)\Q*/\E/$
+ def static xmlCommentPattern = ~$/(?sm)\Q<!--\E(.*?)\Q-->\E/$
+ def static lineSplitter = ~$/[\r\n]+/$
+ def static singleLineSplitter = ~$/\n\r?/$
+ def static licenseMatcher = Defaults.createDefaultMatcher()
+ def static validLoggerPattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+\p{javaJavaIdentifierStart}+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$
+ def static validLoggerNamePattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+log+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$
+ def static packagePattern = ~$/(?m)^\s*package\s+org\.apache.*;/$
+ def static xmlTagPattern = ~$/(?m)\s*<[a-zA-Z].*/$
+ def static sourceHeaderPattern = ~$/\[source\b.*/$
+ def static blockBoundaryPattern = ~$/----\s*/$
+ def static blockTitlePattern = ~$/\..*/$
+ def static unescapedSymbolPattern = ~$/(?<=[^\\]|^)([-=]>|<[-=])/$ // SOLR-10883
+ def static extendsLuceneTestCasePattern = ~$/public.*?class.*?extends.*?LuceneTestCase[^\n]*?\n/$
- def isLicense = { matcher, ratDocument ->
+ def static isLicense = { matcher, ratDocument ->
licenseMatcher.reset()
return lineSplitter.split(matcher.group(1)).any{ licenseMatcher.match(ratDocument, it) }
}
- def checkLicenseHeaderPrecedes = { f, description, contentPattern, commentPattern, text, ratDocument ->
+ def static checkLicenseHeaderPrecedes = { f, description, contentPattern, commentPattern, text, ratDocument ->
def contentMatcher = contentPattern.matcher(text)
if (contentMatcher.find()) {
def contentStartPos = contentMatcher.start()
@@ -207,13 +208,13 @@ class CheckSourcePatterns extends DefaultTask {
}
}
- def checkMockitoAssume = { f, text ->
+ def static checkMockitoAssume = { f, text ->
if (text.contains("mockito") && !text.contains("assumeWorkingMockito()")) {
reportViolation(f, 'File uses Mockito but has no assumeWorkingMockito() call')
}
}
- def checkForUnescapedSymbolSubstitutions = { f, text ->
+ def static checkForUnescapedSymbolSubstitutions = { f, text ->
def inCodeBlock = false
def underSourceHeader = false
def lineNumber = 0
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy
index 8680f11..797736e 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/CheckWorkingCopy.groovy
@@ -27,11 +27,14 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.errors.*;
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
+import org.gradle.api.tasks.Input
import org.gradle.api.tasks.TaskAction
import javax.inject.Inject
class CheckWorkingCopy extends DefaultTask {
+
+ @Input
boolean failonmodifications
@Inject