Skip to content

Commit 160984e

Browse files
committed
lucene 10.0.0 draft!
(supress-es should be reviewed, scorer returns bad objects, so it should break scorer tests)
1 parent 6200b56 commit 160984e

File tree

61 files changed

+134
-90
lines changed

Some content is hidden

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

61 files changed

+134
-90
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
build:
14-
name: ${{ matrix.os }} with Java 17
14+
name: ${{ matrix.os }} with Java 21
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
fail-fast: false
@@ -22,11 +22,11 @@ jobs:
2222
uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
25-
- name: Set up JDK 17
25+
- name: Set up JDK 21
2626
uses: actions/setup-java@v4
2727
with:
2828
distribution: 'oracle'
29-
java-version: '17'
29+
java-version: '21'
3030
- name: Cache Maven packages
3131
uses: actions/cache@v4
3232
with:

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
steps:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
25-
- name: Set up JDK 17
25+
- name: Set up JDK 21
2626
uses: actions/setup-java@v4
2727
with:
2828
distribution: 'oracle'
29-
java-version: '17'
29+
java-version: '21'
3030
- name: Initialize CodeQL
3131
uses: github/codeql-action/init@v3
3232
with:

.github/workflows/javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
steps:
1919
- name: Checkout master branch
2020
uses: actions/checkout@v4
21-
- name: Set up JDK 17
21+
- name: Set up JDK 21
2222
uses: actions/setup-java@v4
2323
with:
2424
distribution: 'oracle'
25-
java-version: '17'
25+
java-version: '21'
2626
- name: Cache Maven packages
2727
uses: actions/cache@v4
2828
with:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
steps:
2727
- name: Checkout master branch
2828
uses: actions/checkout@v4
29-
- name: Set up JDK 17
29+
- name: Set up JDK 21
3030
uses: actions/setup-java@v4
3131
with:
3232
distribution: 'oracle'
33-
java-version: '17'
33+
java-version: '21'
3434
- name: Cache Maven packages
3535
uses: actions/cache@v4
3636
with:

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Definitions.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,26 @@ public class Definitions implements Serializable {
6565
public static class LineTagMap implements Serializable {
6666

6767
private static final long serialVersionUID = 1191703801007779481L;
68-
@SuppressWarnings("java:S116")
68+
@SuppressWarnings({"java:S116", "serial"})
6969
private final Map<String, Set<Tag>> sym_tags; //NOPMD
7070

7171
protected LineTagMap() {
7272
this.sym_tags = new HashMap<>();
7373
}
7474
}
7575
// line number -> tag map
76-
@SuppressWarnings("java:S116")
76+
@SuppressWarnings({"java:S116", "serial"})
7777
private final Map<Integer, LineTagMap> line_maps;
7878

7979
/**
8080
* Map from symbol to the line numbers on which the symbol is defined.
8181
*/
82+
@SuppressWarnings("serial")
8283
private final Map<String, Set<Integer>> symbols;
8384
/**
8485
* List of all the tags.
8586
*/
87+
@SuppressWarnings("serial")
8688
private final List<Tag> tags;
8789

8890
public Definitions() {

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/JFlexTokenizer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class JFlexTokenizer extends Tokenizer
4949
* will be owned by the {@link JFlexTokenizer}.
5050
* @param matcher a defined instance
5151
*/
52+
@SuppressWarnings("this-escape")
5253
public JFlexTokenizer(ScanningSymbolMatcher matcher) {
5354
if (matcher == null) {
5455
throw new IllegalArgumentException("`matcher' is null");
@@ -83,10 +84,13 @@ public final void close() throws IOException {
8384
matcher.yyclose();
8485
}
8586

87+
@SuppressWarnings("this-escape")
8688
private final CharTermAttribute termAtt = addAttribute(
8789
CharTermAttribute.class);
90+
@SuppressWarnings("this-escape")
8891
private final OffsetAttribute offsetAtt = addAttribute(
8992
OffsetAttribute.class);
93+
@SuppressWarnings("this-escape")
9094
private final PositionIncrementAttribute posIncrAtt = addAttribute(
9195
PositionIncrementAttribute.class);
9296

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/JFlexXref.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public class JFlexXref implements Xrefer, SymbolMatchedListener,
9999
* will be owned by the {@link JFlexXref}.
100100
* @param matcher a defined instance
101101
*/
102+
@SuppressWarnings("this-escape")
102103
public JFlexXref(ScanningSymbolMatcher matcher) {
103104
if (matcher == null) {
104105
throw new IllegalArgumentException("`matcher' is null");

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/PathTokenizer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ public class PathTokenizer extends Tokenizer {
5252
// below should be '/' since we try to convert even windows file separators
5353
// to unix ones
5454
public static final char DEFAULT_DELIMITER = '/';
55+
@SuppressWarnings("this-escape")
5556
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
57+
@SuppressWarnings("this-escape")
5658
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
5759
private int startPosition = 0;
5860
private final char delimiter;

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/DefinitionsTokenStream.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,13 @@ public class DefinitionsTokenStream extends TokenStream {
4848
*/
4949
private final List<PendingToken> events = new ArrayList<>();
5050

51+
@SuppressWarnings("this-escape")
5152
private final CharTermAttribute termAtt = addAttribute(
5253
CharTermAttribute.class);
54+
@SuppressWarnings("this-escape")
5355
private final OffsetAttribute offsetAtt = addAttribute(
5456
OffsetAttribute.class);
57+
@SuppressWarnings("this-escape")
5558
private final PositionIncrementAttribute posIncrAtt = addAttribute(
5659
PositionIncrementAttribute.class);
5760

opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationEntity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,16 @@ public boolean test(AuthorizationEntity t) {
119119
*/
120120
protected AuthControlFlag flag;
121121
protected String name;
122+
@SuppressWarnings("serial")
122123
protected Map<String, Object> setup = new TreeMap<>();
123124
/**
124125
* Hold current setup - merged with all ancestor's stacks.
125126
*/
126127
protected transient Map<String, Object> currentSetup = new TreeMap<>();
127128

129+
@SuppressWarnings("serial")
128130
private Set<String> forProjects = new TreeSet<>();
131+
@SuppressWarnings("serial")
129132
private Set<String> forGroups = new TreeSet<>();
130133

131134
protected transient boolean working = true;

0 commit comments

Comments
 (0)