Skip to content

Commit aedb48a

Browse files
tarzanektarzanek
committed
lucene 10.0.0 fix tests
1 parent 08d62e7 commit aedb48a

File tree

4 files changed

+37
-31
lines changed

4 files changed

+37
-31
lines changed

‎opengrok-indexer/src/main/java/org/opengrok/indexer/web/Util.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,20 +1671,20 @@ public static String completeUrl(String url, HttpServletRequest req) {
16711671

16721672
/**
16731673
* Parses the specified URL and returns its query params.
1674-
* @param url URL to retrieve the query params from
1674+
* @param uri URI to retrieve the query params from
16751675
* @return query params of {@code url}
16761676
*/
1677-
public static Map<String, List<String>> getQueryParams(final URL url) {
1678-
if (url == null) {
1677+
public static Map<String, List<String>> getQueryParams(final URI uri) {
1678+
if (uri == null) {
16791679
throw new IllegalArgumentException("Cannot get query params from the null url");
16801680
}
16811681
Map<String, List<String>> returnValue = new HashMap<>();
16821682

1683-
if (url.getQuery() == null) {
1683+
if (uri.getQuery() == null) {
16841684
return returnValue;
16851685
}
16861686

1687-
Arrays.stream(url.getQuery().split("&"))
1687+
Arrays.stream(uri.getQuery().split("&"))
16881688
.filter(pair -> !pair.isEmpty())
16891689
.forEach(pair -> {
16901690
int idx = pair.indexOf('=');

‎opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexDatabaseTestHistBasedIterationTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.apache.lucene.index.TermsEnum;
3232
import org.apache.lucene.util.AttributeSource;
3333
import org.apache.lucene.util.BytesRef;
34+
import org.apache.lucene.util.IOBooleanSupplier;
3435
import org.junit.jupiter.api.AfterEach;
3536
import org.junit.jupiter.api.BeforeEach;
3637
import org.junit.jupiter.api.Test;
@@ -109,6 +110,11 @@ public boolean seekExact(BytesRef bytesRef) throws IOException {
109110
return false;
110111
}
111112

113+
@Override
114+
public IOBooleanSupplier prepareSeekExact(BytesRef bytesRef) throws IOException {
115+
return null;
116+
}
117+
112118
@Override
113119
public SeekStatus seekCeil(BytesRef bytesRef) throws IOException {
114120
return null;

‎opengrok-indexer/src/test/java/org/opengrok/indexer/web/UtilTest.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import java.io.StringWriter;
2929
import java.io.Writer;
3030
import java.net.MalformedURLException;
31+
import java.net.URI;
3132
import java.net.URISyntaxException;
32-
import java.net.URL;
3333
import java.nio.charset.StandardCharsets;
3434
import java.util.List;
3535
import java.util.Locale;
@@ -553,31 +553,31 @@ void getQueryParamsNullTest() {
553553
}
554554

555555
@Test
556-
void getQueryParamsEmptyTest() throws MalformedURLException {
557-
URL url = new URL("http://test.com/test");
556+
void getQueryParamsEmptyTest() throws URISyntaxException {
557+
URI url = new URI("http://test.com/test");
558558
assertTrue(Util.getQueryParams(url).isEmpty());
559559
}
560560

561561
@Test
562-
void getQueryParamsEmptyTest2() throws MalformedURLException {
563-
URL url = new URL("http://test.com/test?");
564-
assertTrue(Util.getQueryParams(url).isEmpty());
562+
void getQueryParamsEmptyTest2() throws URISyntaxException {
563+
URI uri = new URI("http://test.com/test?");
564+
assertTrue(Util.getQueryParams(uri).isEmpty());
565565
}
566566

567567
@Test
568-
void getQueryParamsSingleTest() throws MalformedURLException {
569-
URL url = new URL("http://test.com?param1=value1");
570-
Map<String, List<String>> params = Util.getQueryParams(url);
568+
void getQueryParamsSingleTest() throws URISyntaxException {
569+
URI uri = new URI("http://test.com?param1=value1");
570+
Map<String, List<String>> params = Util.getQueryParams(uri);
571571

572572
assertEquals(1, params.size());
573573

574574
assertThat(params.get("param1"), contains("value1"));
575575
}
576576

577577
@Test
578-
void getQueryParamsMultipleTest() throws MalformedURLException {
579-
URL url = new URL("http://test.com?param1=value1&param2=value2");
580-
Map<String, List<String>> params = Util.getQueryParams(url);
578+
void getQueryParamsMultipleTest() throws URISyntaxException {
579+
URI uri = new URI("http://test.com?param1=value1&param2=value2");
580+
Map<String, List<String>> params = Util.getQueryParams(uri);
581581

582582
assertEquals(2, params.size());
583583

@@ -586,39 +586,39 @@ void getQueryParamsMultipleTest() throws MalformedURLException {
586586
}
587587

588588
@Test
589-
void getQueryParamsMultipleSameTest() throws MalformedURLException {
590-
URL url = new URL("http://test.com?param1=value1&param1=value2");
591-
Map<String, List<String>> params = Util.getQueryParams(url);
589+
void getQueryParamsMultipleSameTest() throws URISyntaxException {
590+
URI uri = new URI("http://test.com?param1=value1&param1=value2");
591+
Map<String, List<String>> params = Util.getQueryParams(uri);
592592

593593
assertEquals(1, params.size());
594594

595595
assertThat(params.get("param1"), contains("value1", "value2"));
596596
}
597597

598598
@Test
599-
void getQueryParamsEncodedTest() throws MalformedURLException {
600-
URL url = new URL("http://test.com?param1=%3Fvalue%3F");
601-
Map<String, List<String>> params = Util.getQueryParams(url);
599+
void getQueryParamsEncodedTest() throws URISyntaxException {
600+
URI uri = new URI("http://test.com?param1=%3Fvalue%3F");
601+
Map<String, List<String>> params = Util.getQueryParams(uri);
602602

603603
assertEquals(1, params.size());
604604

605605
assertThat(params.get("param1"), contains("?value?"));
606606
}
607607

608608
@Test
609-
void getQueryParamsEmptyValueTest() throws MalformedURLException {
610-
URL url = new URL("http://test.com?param1=");
609+
void getQueryParamsEmptyValueTest() throws URISyntaxException {
610+
URI uri = new URI("http://test.com?param1=");
611611

612-
Map<String, List<String>> params = Util.getQueryParams(url);
612+
Map<String, List<String>> params = Util.getQueryParams(uri);
613613

614614
assertThat(params.get("param1"), contains(""));
615615
}
616616

617617
@Test
618-
void getQueryParamsEmptyAndNormalValuesCombinedTest() throws MalformedURLException {
619-
URL url = new URL("http://test.com?param1=value1&param2=&param3&param4=value4");
618+
void getQueryParamsEmptyAndNormalValuesCombinedTest() throws URISyntaxException {
619+
URI uri = new URI("http://test.com?param1=value1&param2=&param3&param4=value4");
620620

621-
Map<String, List<String>> params = Util.getQueryParams(url);
621+
Map<String, List<String>> params = Util.getQueryParams(uri);
622622

623623
assertThat(params.get("param1"), contains("value1"));
624624
assertThat(params.get("param2"), contains(""));

‎opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SuggesterController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void addSearchCountsQueries(final List<String> urls) {
199199
for (String urlStr : urls) {
200200
try {
201201
var uri = new URI(urlStr);
202-
var params = Util.getQueryParams(uri.toURL());
202+
var params = Util.getQueryParams(uri);
203203

204204
var projects = params.get("project");
205205

@@ -215,7 +215,7 @@ public void addSearchCountsQueries(final List<String> urls) {
215215
}
216216
}
217217
}
218-
} catch (MalformedURLException | URISyntaxException e) {
218+
} catch (URISyntaxException e) {
219219
logger.log(Level.WARNING, e, () -> "Could not add search counts for " + urlStr);
220220
}
221221
}

0 commit comments

Comments
 (0)