Skip to content

Commit 911e8af

Browse files
ahornaceahornace
committed
Merge remote-tracking branch 'upstream/master' into mavenize
# Conflicts: # jrcs/pom.xml # opengrok-indexer/pom.xml # opengrok-indexer/src/main/java/org/opengrok/indexer/util/ClassUtil.java # opengrok-indexer/src/main/java/org/opengrok/indexer/web/SearchHelper.java # opengrok-web/pom.xml # opengrok-web/src/main/java/org/opengrok/web/WebappListener.java # opengrok-web/src/main/java/org/opengrok/web/api/v1/RestApp.java # opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ConfigurationController.java # opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java # opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SearchController.java # opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SystemController.java # opengrok-web/src/main/java/org/opengrok/web/api/v1/filter/LocalhostFilter.java # opengrok-web/src/main/webapp/js/utils-0.0.22.js # opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/ConfigurationControllerTest.java # opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/ProjectsControllerTest.java # plugins/pom.xml # pom.xml # web/js/utils-0.0.22.js # web/js/utils-0.0.23.js
2 parents ce87fcb + a734884 commit 911e8af

File tree

100 files changed

+10343
-861
lines changed

Some content is hidden

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

100 files changed

+10343
-861
lines changed

‎CHANGES.txt

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

‎checkstyle/style.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55
<module name="Checker">
66
<module name="NewlineAtEndOfFile"/>
77
<module name="Header">
@@ -11,11 +11,10 @@
1111
<module name="FileTabCharacter"/>
1212
<module name="TreeWalker">
1313
<module name="AvoidStarImport">
14-
<property name="allowStaticMemberImports" value="true"/>
14+
<property name="allowStaticMemberImports" value="true"/>
1515
</module>
1616
<module name="RedundantImport"/>
1717
<module name="UnusedImports"/>
18-
<module name="ImportOrder"/>
1918
<module name="MethodLength">
2019
<property name="max" value="200"/>
2120
</module>
@@ -27,11 +26,12 @@
2726
<module name="GenericWhitespace"/>
2827
<module name="MethodParamPad"/>
2928
<module name="NoWhitespaceAfter"/>
30-
<module name="FileContentsHolder"/>
29+
<module name="SuppressionCommentFilter">
30+
<property name="offCommentFormat" value="&lt;editor-fold defaultstate=&quot;collapsed&quot; desc=&quot;Generated Code&quot;&gt;"/>
31+
<property name="onCommentFormat" value="&lt;/editor-fold&gt;"/>
32+
</module>
33+
</module>
34+
<module name="SuppressionFilter">
35+
<property name="file" value="checkstyle/suppressions.xml" />
3136
</module>
32-
<module name="SuppressionCommentFilter">
33-
<property name="offCommentFormat" value="&lt;editor-fold defaultstate=&quot;collapsed&quot; desc=&quot;Generated Code&quot;&gt;"/>
34-
<property name="onCommentFormat" value="&lt;/editor-fold&gt;"/>
35-
</module>
3637
</module>
37-

‎checkstyle/suppressions.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.1//EN"
5+
"https://checkstyle.org/dtds/suppressions_1_1.dtd">
6+
7+
<suppressions>
8+
<suppress checks="Header" files="CustomSloppyPhraseScorer\.java|CustomPhraseQuery\.java|
9+
|CustomExactPhraseScorer\.java|PhrasePositions\.java|PhraseQueue\.java" />
10+
</suppressions>

‎distribution/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.opengrok</groupId>
99
<artifactId>opengrok-top</artifactId>
10-
<version>1.1-rc33</version>
10+
<version>1.1-rc34</version>
1111
</parent>
1212

1313
<artifactId>opengrok-dist</artifactId>
@@ -24,13 +24,13 @@
2424
<dependency>
2525
<groupId>org.opengrok</groupId>
2626
<artifactId>opengrok</artifactId>
27-
<version>1.1-rc33</version>
27+
<version>1.1-rc34</version>
2828
</dependency>
2929

3030
<dependency>
3131
<groupId>org.opengrok</groupId>
3232
<artifactId>opengrok-web</artifactId>
33-
<version>1.1-rc33</version>
33+
<version>1.1-rc34</version>
3434
<type>war</type>
3535
</dependency>
3636
</dependencies>

‎jrcs/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.opengrok</groupId>
77
<artifactId>opengrok-top</artifactId>
8-
<version>1.1-rc33</version>
8+
<version>1.1-rc34</version>
99
</parent>
1010

1111
<artifactId>jrcs</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.1-rc33</version>
13+
<version>1.1-rc34</version>
1414

1515
<name>Java RCS</name>
1616

‎opengrok-indexer/pom.xml

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
2828
<parent>
2929
<groupId>org.opengrok</groupId>
3030
<artifactId>opengrok-top</artifactId>
31-
<version>1.1-rc33</version>
31+
<version>1.1-rc34</version>
3232
</parent>
3333

3434
<artifactId>opengrok</artifactId>
35-
<version>1.1-rc33</version>
35+
<version>1.1-rc34</version>
3636
<packaging>jar</packaging>
3737

3838
<name>OpenGrok Indexer</name>
@@ -127,6 +127,18 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
127127
<version>3.1.0</version>
128128
<scope>test</scope>
129129
</dependency>
130+
<dependency>
131+
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
132+
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
133+
<version>${jersey.version}</version>
134+
<scope>test</scope>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.mockito</groupId>
138+
<artifactId>mockito-core</artifactId>
139+
<version>2.19.0</version>
140+
<scope>test</scope>
141+
</dependency>
130142
</dependencies>
131143

132144
<build>
@@ -313,4 +325,28 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
313325
</plugins>
314326
</build>
315327

328+
<profiles>
329+
<profile>
330+
<id>java9plus</id>
331+
<activation>
332+
<jdk>[9,10]</jdk>
333+
</activation>
334+
<build>
335+
<plugins>
336+
<plugin>
337+
<groupId>org.apache.maven.plugins</groupId>
338+
<artifactId>maven-surefire-plugin</artifactId>
339+
<configuration>
340+
<argLine>
341+
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
342+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
343+
--add-exports java.base/sun.nio.ch=ALL-UNNAMED
344+
</argLine>
345+
</configuration>
346+
</plugin>
347+
</plugins>
348+
</build>
349+
</profile>
350+
</profiles>
351+
316352
</project>

‎opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ public final class Configuration {
291291
*/
292292
private boolean listDirsFirst = true;
293293

294+
private SuggesterConfig suggesterConfig = new SuggesterConfig();
295+
294296
/*
295297
* types of handling history for remote SCM repositories:
296298
* ON - index history and display it in webapp
@@ -1353,6 +1355,17 @@ public void setProjectsEnabled(boolean flag) {
13531355
this.projectsEnabled = flag;
13541356
}
13551357

1358+
public SuggesterConfig getSuggesterConfig() {
1359+
return suggesterConfig;
1360+
}
1361+
1362+
public void setSuggesterConfig(final SuggesterConfig config) {
1363+
if (config == null) {
1364+
throw new IllegalArgumentException("Cannot set Suggester configuration to null");
1365+
}
1366+
this.suggesterConfig = config;
1367+
}
1368+
13561369
/**
13571370
* Write the current configuration to a file
13581371
*

‎opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/ConfigurationHelp.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ private static Object getSampleValue(Method setter, Object defaultValue) {
167167
if (!value.equals(defaultValue)) return value;
168168
}
169169
return null;
170+
} else if (paramType == SuggesterConfig.class) {
171+
return new SuggesterConfig();
170172
} else {
171173
throw new UnsupportedOperationException("getSampleValue() for " +
172174
paramType + ", " + genType);

‎opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public class IndexDatabase {
150150
// Directory where we store indexes
151151
public static final String INDEX_DIR = "index";
152152
public static final String XREF_DIR = "xref";
153+
public static final String SUGGESTER_DIR = "suggester";
153154

154155
/**
155156
* Create a new instance of the Index Database. Use this constructor if you
@@ -381,7 +382,8 @@ private void markProjectIndexed(Project project) {
381382
.put(Entity.text(""));
382383

383384
if (r.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
384-
System.err.println("Couldn't notify the webapp: " + r.toString());
385+
LOGGER.log(Level.WARNING, "Couldn''t notify the webapp that project {0} was indexed: {1}",
386+
new Object[] {project, r});
385387
}
386388
}
387389

@@ -483,7 +485,7 @@ public void update(IndexerParallelizer parallelizer)
483485
if (stat == TermsEnum.SeekStatus.END) {
484486
uidIter = null;
485487
LOGGER.log(Level.WARNING,
486-
"Couldn't find a start term for {0}, empty u field?",
488+
"Couldn''t find a start term for {0}, empty u field?",
487489
startuid);
488490
}
489491
}

‎opengrok-indexer/src/main/java/org/opengrok/indexer/search/CustomQueryParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
/**
3232
* A custom query parser for OpenGrok.
3333
*/
34-
class CustomQueryParser extends QueryParser {
34+
public class CustomQueryParser extends QueryParser {
3535

3636
/**
3737
* Create a query parser customized for OpenGrok.
3838
*
3939
* @param field default field for unqualified query terms
4040
*/
41-
CustomQueryParser(String field) {
41+
public CustomQueryParser(String field) {
4242
super(field, new CompatibleAnalyser());
4343
setDefaultOperator(AND_OPERATOR);
4444
setAllowLeadingWildcard(
@@ -70,7 +70,7 @@ class CustomQueryParser extends QueryParser {
7070
* @return {@code true} if the field is case sensitive, {@code false}
7171
* otherwise
7272
*/
73-
private static boolean isCaseSensitive(String field) {
73+
protected static boolean isCaseSensitive(String field) {
7474
// Only definition search and reference search are case sensitive
7575
return QueryBuilder.DEFS.equals(field)
7676
|| QueryBuilder.REFS.equals(field);

0 commit comments

Comments
 (0)