Skip to content

Commit a72324b

Browse files
ahornaceahornace
committed
Merge remote-tracking branch 'upstream/master' into mavenize
# Conflicts: # opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/document/TroffAnalyzer.java # opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/AbstractSourceCodeAnalyzer.java # opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/PlainAnalyzer.java # opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/powershell/Consts.java # opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/swift/Consts.java # opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevHistoryParser.java # opengrok-indexer/src/main/java/org/opengrok/indexer/history/ClearCaseHistoryParser.java # opengrok-indexer/src/main/java/org/opengrok/indexer/history/SCCSHistoryParser.java # opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java # opengrok-indexer/src/main/java/org/opengrok/indexer/web/ProjectHelper.java # opengrok-web/src/main/java/org/opengrok/web/WebappListener.java # opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/SuggesterControllerProjectsDisabledTest.java # opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/SuggesterControllerTest.java
2 parents 7322be9 + a66fe27 commit a72324b

File tree

84 files changed

+1862
-1641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1862
-1641
lines changed

‎checkstyle/suppressions.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,14 @@
66

77
<suppressions>
88
<suppress checks="Header" files="CustomSloppyPhraseScorer\.java|CustomPhraseQuery\.java|
9-
|CustomExactPhraseScorer\.java|PhrasePositions\.java|PhraseQueue\.java" />
9+
|CustomExactPhraseScorer\.java|PhrasePositions\.java|PhraseQueue\.java|Summarizer\.java|
10+
|Summary\.java|OGKUnifiedHighlighter\.java|ResponseHeaderFilter\.java|BoundedBlockingObjectPool\.java|
11+
|ObjectPool\.java|ObjectValidator\.java|ObjectFactory\.java|AbstractObjectPool\.java|
12+
|BlockingObjectPool\.java|OGKTextVecField\.java|OGKTextField\.java" />
13+
14+
<suppress checks="ParameterNumber" files="CtagsReader\.java|Definitions\.java|PerlLexHelper\.java|
15+
|JFlexXrefUtils\.java|RubyLexHelper\.java|FileAnalyzerFactory\.java|SearchController\.java|
16+
|Context\.java|HistoryContext\.java|Indexer\.java" />
17+
18+
<suppress checks="MethodLength" files="Indexer\.java" />
1019
</suppressions>

‎opengrok-indexer/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,11 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
327327
</configuration>
328328
</plugin>
329329

330+
<plugin>
331+
<groupId>org.apache.maven.plugins</groupId>
332+
<artifactId>maven-checkstyle-plugin</artifactId>
333+
</plugin>
334+
330335
</plugins>
331336
</build>
332337

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ public class AnalyzerGuru {
189189
@Override public int compare(String s1, String s2) {
190190
// DESC: s2 length <=> s1 length
191191
int cmp = Integer.compare(s2.length(), s1.length());
192-
if (cmp != 0) return cmp;
192+
if (cmp != 0) {
193+
return cmp;
194+
}
193195

194196
// the Comparator must also be "consistent with equals", so check
195197
// string contents too when (length)cmp == 0. (ASC: s1 <=> s2.)
@@ -496,7 +498,7 @@ public static FileAnalyzer getAnalyzer(InputStream in, String file) throws IOExc
496498
FileAnalyzer defaultAnalyzer = getAnalyzer();
497499
if (LOGGER.isLoggable(Level.FINE)) {
498500
LOGGER.log(Level.FINE, "{0}: fallback {1}",
499-
new Object[]{ file,
501+
new Object[]{file,
500502
defaultAnalyzer.getClass().getSimpleName() });
501503
}
502504
return defaultAnalyzer;
@@ -568,8 +570,7 @@ public void populateDocument(Document doc, File file, String path,
568570
if (fa != null) {
569571
Genre g = fa.getGenre();
570572
if (g == Genre.PLAIN || g == Genre.XREFABLE || g == Genre.HTML) {
571-
doc.add(new Field(QueryBuilder.T, g.typeName(),
572-
string_ft_stored_nanalyzed_norms));
573+
doc.add(new Field(QueryBuilder.T, g.typeName(), string_ft_stored_nanalyzed_norms));
573574
}
574575
fa.analyze(doc, StreamSource.fromFile(file), xrefOut);
575576

@@ -859,7 +860,7 @@ public static FileAnalyzerFactory find(String file) {
859860
if (factory != null) {
860861
if (LOGGER.isLoggable(Level.FINER)) {
861862
LOGGER.log(Level.FINER, "{0}: chosen by prefix: {1}",
862-
new Object[]{ file,
863+
new Object[]{file,
863864
factory.getClass().getSimpleName() });
864865
}
865866
return factory;
@@ -874,7 +875,7 @@ public static FileAnalyzerFactory find(String file) {
874875
if (factory != null) {
875876
if (LOGGER.isLoggable(Level.FINER)) {
876877
LOGGER.log(Level.FINER, "{0}: chosen by suffix: {1}",
877-
new Object[]{ file,
878+
new Object[]{file,
878879
factory.getClass().getSimpleName() });
879880
}
880881
return factory;
@@ -957,7 +958,7 @@ private static FileAnalyzerFactory findForStream(InputStream in,
957958
if (LOGGER.isLoggable(Level.FINER)) {
958959
LOGGER.log(Level.FINER,
959960
"{0}: chosen by imprecise magic: {1}",
960-
new Object[]{ file,
961+
new Object[]{file,
961962
fac.getClass().getSimpleName() });
962963
}
963964
return fac;
@@ -978,7 +979,7 @@ private static FileAnalyzerFactory findMagicString(String opening,
978979
if (fac != null) {
979980
if (LOGGER.isLoggable(Level.FINER)) {
980981
LOGGER.log(Level.FINER, "{0}: chosen by magic {2}: {1}",
981-
new Object[]{ file, fac.getClass().getSimpleName(),
982+
new Object[]{file, fac.getClass().getSimpleName(),
982983
fragment});
983984
}
984985
return fac;
@@ -990,7 +991,7 @@ private static FileAnalyzerFactory findMagicString(String opening,
990991
if (fac != null) {
991992
if (LOGGER.isLoggable(Level.FINER)) {
992993
LOGGER.log(Level.FINER, "{0}: chosen by magic {2}: {1}",
993-
new Object[]{ file, fac.getClass().getSimpleName(),
994+
new Object[]{file, fac.getClass().getSimpleName(),
994995
fragment});
995996
}
996997
return fac;
@@ -1025,12 +1026,16 @@ private static FileAnalyzerFactory findMagicString(String opening,
10251026
* @return The extracted words or <code>""</code>
10261027
*/
10271028
private static String getWords(String value, int n) {
1028-
if (n < 1) return "";
1029+
if (n < 1) {
1030+
return "";
1031+
}
10291032
int l = 0;
10301033
while (n-- > 0) {
10311034
int o = l > 0 ? l + 1 : l;
10321035
int i = value.indexOf(' ', o);
1033-
if (i == -1) return value;
1036+
if (i == -1) {
1037+
return value;
1038+
}
10341039
l = i;
10351040
}
10361041
return value.substring(0, l);
@@ -1074,20 +1079,28 @@ private static String readOpening(InputStream in, byte[] sig)
10741079
BufferedReader readr = new BufferedReader(
10751080
new InputStreamReader(in, encoding), OPENING_MAX_CHARS);
10761081
while ((r = readr.read()) != -1) {
1077-
if (++nRead > OPENING_MAX_CHARS) break;
1082+
if (++nRead > OPENING_MAX_CHARS) {
1083+
break;
1084+
}
10781085
char c = (char)r;
10791086
boolean isWhitespace = Character.isWhitespace(c);
10801087
if (!sawNonWhitespace) {
1081-
if (isWhitespace) continue;
1088+
if (isWhitespace) {
1089+
continue;
1090+
}
10821091
sawNonWhitespace = true;
10831092
}
1084-
if (c == '\n') break;
1093+
if (c == '\n') {
1094+
break;
1095+
}
10851096

10861097
if (isWhitespace) {
10871098
// Track `lastWhitespace' to condense stretches of whitespace,
10881099
// and use ' ' regardless of actual whitespace character to
10891100
// accord with magic string definitions.
1090-
if (!lastWhitespace && !postHashbang) opening.append(' ');
1101+
if (!lastWhitespace && !postHashbang) {
1102+
opening.append(' ');
1103+
}
10911104
} else {
10921105
opening.append(c);
10931106
postHashbang = false;

‎opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuruHelp.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ public static String getUsage() {
6464

6565
b.append("\nAnalyzerGuru magic matchers:\n");
6666
AnalyzerGuru.getAnalyzerFactoryMatchers().forEach((m) -> {
67-
if (m.getIsPreciseMagic()) b.append(reportable(m));
67+
if (m.getIsPreciseMagic()) {
68+
b.append(reportable(m));
69+
}
6870
});
6971
AnalyzerGuru.getAnalyzerFactoryMatchers().forEach((m) -> {
70-
if (!m.getIsPreciseMagic()) b.append(reportable(m));
72+
if (!m.getIsPreciseMagic()) {
73+
b.append(reportable(m));
74+
}
7175
});
7276

7377
return b.toString();
@@ -79,7 +83,9 @@ private static String reportable(FileAnalyzerFactory fac) {
7983
}
8084

8185
private static String reportable(String value) {
82-
if (value.startsWith("#!")) return value;
86+
if (value.startsWith("#!")) {
87+
return value;
88+
}
8389

8490
boolean allAsciiPrintable = true;
8591
for (int i = 0; i < value.length(); ++i) {
@@ -89,7 +95,9 @@ private static String reportable(String value) {
8995
break;
9096
}
9197
}
92-
if (allAsciiPrintable) return value;
98+
if (allAsciiPrintable) {
99+
return value;
100+
}
93101

94102
StringBuilder b = new StringBuilder();
95103
int i = 0;
@@ -199,7 +207,9 @@ private static List<MappedFactory> byFactory(
199207
String r2 = reportable(mf2.fac);
200208
int cmp = r1.toLowerCase(Locale.ROOT).compareTo(
201209
r2.toLowerCase(Locale.ROOT));
202-
if (cmp != 0) return cmp;
210+
if (cmp != 0) {
211+
return cmp;
212+
}
203213
return mf1.key.toLowerCase(Locale.ROOT).compareTo(
204214
mf2.key.toLowerCase(Locale.ROOT));
205215
});

0 commit comments

Comments
 (0)