Skip to content

Commit 878b88c

Browse files
hmottestadhmottestad
authored
Downgrade spotless to a version that doesn't need to download the eclipse formatter from p2 directly (#5750)
downgrade spotless to a version that doesn't need to download the eclipse formatter from p2 directly
1 parent 37611ab commit 878b88c

35 files changed

Lines changed: 135 additions & 135 deletions

File tree

‎core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/DefaultEvaluationStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ public Value evaluate(ValueExpr expr, BindingSet bindings)
10321032
return precompile(expr,
10331033
new QueryEvaluationContext.Minimal(DefaultEvaluationStrategy.this.sharedValueOfNow, dataset,
10341034
tripleSource.getComparator()))
1035-
.evaluate(bindings);
1035+
.evaluate(bindings);
10361036
}
10371037

10381038
protected QueryValueEvaluationStep prepare(Var var, QueryEvaluationContext context)
@@ -1167,7 +1167,7 @@ public Value evaluate(Regex node, BindingSet bindings)
11671167
throws QueryEvaluationException {
11681168
return prepare(node,
11691169
new QueryEvaluationContext.Minimal(sharedValueOfNow, dataset, tripleSource.getComparator()))
1170-
.evaluate(bindings);
1170+
.evaluate(bindings);
11711171
}
11721172

11731173
/**

‎core/queryalgebra/evaluation/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/OrderQueryEvaluationStepTelemetryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class OrderQueryEvaluationStepTelemetryTest {
3636
void retainsLegacyConstructorForBinaryCompatibility() throws Exception {
3737
assertThat(OrderQueryEvaluationStep.class
3838
.getConstructor(Comparator.class, long.class, boolean.class, QueryEvaluationStep.class, long.class))
39-
.isNotNull();
39+
.isNotNull();
4040
}
4141

4242
@Test

‎core/queryalgebra/evaluation/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/ServiceQueryEvaluationStepTelemetryTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ void recordsLatencyQuantilesForSelectRequests() {
9797
FederatedService federatedService = mock(FederatedService.class);
9898
when(federatedService.select(eq(service), anySet(), any(BindingSet.class),
9999
eq(service.getBaseURI())))
100-
.thenAnswer(invocation -> {
101-
LockSupport.parkNanos(1_000_000L);
102-
return new CloseableIteratorIteration<>(List.of(singleBindingSet("s", "row")).iterator());
103-
});
100+
.thenAnswer(invocation -> {
101+
LockSupport.parkNanos(1_000_000L);
102+
return new CloseableIteratorIteration<>(List.of(singleBindingSet("s", "row")).iterator());
103+
});
104104

105105
FederatedServiceResolver resolver = mock(FederatedServiceResolver.class);
106106
when(resolver.getService("http://example.com/service")).thenReturn(federatedService);
@@ -139,7 +139,7 @@ void skipsRequestAndResponseByteAccountingWhenRuntimeTelemetryDisabled() {
139139
when(responseRow.toString()).thenThrow(new AssertionError("response byte accounting should be disabled"));
140140
when(federatedService.select(eq(service), anySet(), any(BindingSet.class),
141141
eq(service.getBaseURI())))
142-
.thenReturn(new CloseableIteratorIteration<>(List.of(responseRow).iterator()));
142+
.thenReturn(new CloseableIteratorIteration<>(List.of(responseRow).iterator()));
143143

144144
FederatedServiceResolver resolver = mock(FederatedServiceResolver.class);
145145
when(resolver.getService("http://example.com/service")).thenReturn(federatedService);

‎core/queryalgebra/model/src/test/java/org/eclipse/rdf4j/query/algebra/helpers/QueryModelTreeToGenericPlanNodeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public void doesNotAnnotateConnectedJoinWhenSharedVarIsAlreadyGuaranteedBound()
235235
assertThat(outerPlan.getStringMetricActual(TelemetryMetricNames.JOIN_TYPE)).isNull();
236236
assertThat(findFirstPlan(outerPlan.getPlans().get(1),
237237
node -> node.getStringMetricActual(TelemetryMetricNames.JOIN_TYPE) != null))
238-
.isNull();
238+
.isNull();
239239
}
240240

241241
@Test

‎core/queryresultio/text/src/main/java/org/eclipse/rdf4j/query/resultio/text/csv/SPARQLResultsCSVParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public void parse(InputStream in) throws QueryResultParseException, TupleQueryRe
4343

4444
List<BindingSet> bindingSets = new CsvToBeanBuilder<BindingSet>(
4545
new InputStreamReader(in, StandardCharsets.UTF_8)).withType(BindingSet.class)
46-
.withMappingStrategy(strategy)
47-
.build()
48-
.parse();
46+
.withMappingStrategy(strategy)
47+
.build()
48+
.parse();
4949
List<String> bindingNames = strategy.getBindingNames();
5050
handler.startQueryResult(bindingNames);
5151
for (BindingSet bs : bindingSets) {

‎core/rio/api/src/test/java/org/eclipse/rdf4j/rio/helpers/RDFParserHelperTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public void tearDown() {
8282
public final void testCreateLiteralLabelNull() {
8383
assertThatThrownBy(
8484
() -> RDFParserHelper.createLiteral(null, null, null, parserConfig, errListener, valueFactory))
85-
.isInstanceOf(NullPointerException.class)
86-
.hasMessage("Cannot create a literal using a null label");
85+
.isInstanceOf(NullPointerException.class)
86+
.hasMessage("Cannot create a literal using a null label");
8787
}
8888

8989
/**
@@ -168,7 +168,7 @@ public final void testCreateLiteralLabelNoLanguageWithRDFLangStringWithVerify()
168168
assertTrue(parserConfig.get(BasicParserSettings.VERIFY_DATATYPE_VALUES));
169169
assertThatThrownBy(() -> RDFParserHelper.createLiteral(LABEL_TESTA, null, RDF.LANGSTRING, parserConfig,
170170
errListener, valueFactory))
171-
.isInstanceOf(RDFParseException.class);
171+
.isInstanceOf(RDFParseException.class);
172172
}
173173

174174
@Test
@@ -187,8 +187,8 @@ public final void testReportErrorStringFatalActive() {
187187
assertThatThrownBy(
188188
() -> RDFParserHelper.reportError(TEST_MESSAGE_FOR_FAILURE, BasicParserSettings.VERIFY_DATATYPE_VALUES,
189189
parserConfig, errListener))
190-
.isInstanceOf(RDFParseException.class)
191-
.hasMessage(TEST_MESSAGE_FOR_FAILURE);
190+
.isInstanceOf(RDFParseException.class)
191+
.hasMessage(TEST_MESSAGE_FOR_FAILURE);
192192
assertErrorListener(0, 1, 0);
193193
}
194194

@@ -227,8 +227,8 @@ public final void testReportErrorStringIntIntFatalActive() {
227227
() -> RDFParserHelper.reportError(TEST_MESSAGE_FOR_FAILURE, 1, 1,
228228
BasicParserSettings.VERIFY_DATATYPE_VALUES,
229229
parserConfig, errListener))
230-
.isInstanceOf(RDFParseException.class)
231-
.hasMessageContaining(TEST_MESSAGE_FOR_FAILURE);
230+
.isInstanceOf(RDFParseException.class)
231+
.hasMessageContaining(TEST_MESSAGE_FOR_FAILURE);
232232

233233
assertErrorListener(0, 1, 0);
234234
}

‎core/rio/datatypes/src/test/java/org/eclipse/rdf4j/rio/datatypes/AbstractDatatypeHandlerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void testVerifyDatatypeNullValueUnrecognised() {
162162
public void testVerifyDatatypeUnrecognisedDatatypeUri() {
163163
assertThatThrownBy(
164164
() -> testHandler.verifyDatatype(getValueMatchingRecognisedDatatypeUri(), getUnrecognisedDatatypeUri()))
165-
.isInstanceOf(LiteralUtilException.class);
165+
.isInstanceOf(LiteralUtilException.class);
166166
}
167167

168168
/**
@@ -214,7 +214,7 @@ public void testNormalizeDatatypeNullValue() {
214214
public void testNormalizeDatatypeUnrecognisedDatatypeUri() {
215215
assertThatThrownBy(() -> testHandler.normalizeDatatype(getValueMatchingRecognisedDatatypeUri(),
216216
getUnrecognisedDatatypeUri(), vf))
217-
.isInstanceOf(LiteralUtilException.class);
217+
.isInstanceOf(LiteralUtilException.class);
218218
}
219219

220220
/**
@@ -226,7 +226,7 @@ public void testNormalizeDatatypeUnrecognisedDatatypeUri() {
226226
public void testNormalizeDatatypeInvalidValue() {
227227
assertThatThrownBy(() -> testHandler.normalizeDatatype(getValueNotMatchingRecognisedDatatypeUri(),
228228
getRecognisedDatatypeUri(), vf))
229-
.isInstanceOf(LiteralUtilException.class);
229+
.isInstanceOf(LiteralUtilException.class);
230230
}
231231

232232
/**

‎core/rio/nquads/src/test/java/org/eclipse/rdf4j/rio/nquads/AbstractNQuadsParserUnitTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public void testParseBasicLiteralDatatype() throws RDFHandlerException, IOExcept
282282
final ByteArrayInputStream bais = new ByteArrayInputStream(
283283
("<http://www.v/dat/4b2-21> " + "<http://www.w3.org/20/ica#dtend> "
284284
+ "\"2010\"^^<http://www.w3.org/2001/XMLSchema#integer> " + "<http://sin.siteserv.org/def/>.")
285-
.getBytes());
285+
.getBytes());
286286
final TestRDFHandler rdfHandler = new TestRDFHandler();
287287
parser.setRDFHandler(rdfHandler);
288288
parser.parse(bais, "http://test.base.uri");
@@ -491,7 +491,7 @@ public void testStatementWithInvalidLiteralContentAndIgnoreValidation()
491491
+ "<http://dbpedia.org/property/mandatofine> "
492492
+ "\"1380.0\"^^<http://www.w3.org/2001/XMLSchema#int> "
493493
+ "<http://it.wikipedia.org/wiki/Camillo_Benso,_conte_di_Cavour#absolute-line=20> .")
494-
.getBytes());
494+
.getBytes());
495495
parser.getParserConfig().set(BasicParserSettings.VERIFY_DATATYPE_VALUES, false);
496496
parser.getParserConfig().set(BasicParserSettings.FAIL_ON_UNKNOWN_DATATYPES, false);
497497
parser.parse(bais, "http://base-uri");
@@ -506,7 +506,7 @@ public void testStatementWithInvalidLiteralContentAndStrictValidation()
506506
+ "<http://dbpedia.org/property/mandatofine> "
507507
+ "\"1380.0\"^^<http://www.w3.org/2001/XMLSchema#int> "
508508
+ "<http://it.wikipedia.org/wiki/Camillo_Benso,_conte_di_Cavour#absolute-line=20> .")
509-
.getBytes());
509+
.getBytes());
510510
parser.getParserConfig().set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
511511
parser.getParserConfig().set(BasicParserSettings.FAIL_ON_UNKNOWN_DATATYPES, true);
512512
try {
@@ -601,7 +601,7 @@ private void verifyStatementWithInvalidDatatype(boolean useDatatypeVerification)
601601
+ "<http://dbpedia.org/property/mandatofine> "
602602
+ "\"1380.0\"^^<http://dbpedia.org/invalid/datatype/second> "
603603
+ "<http://it.wikipedia.org/wiki/Camillo_Benso,_conte_di_Cavour#absolute-line=20> .")
604-
.getBytes());
604+
.getBytes());
605605
parser.parse(bais, "http://base-uri");
606606
rdfHandler.assertHandler(1);
607607
}

‎core/sail/elasticsearch-store/src/main/java/org/eclipse/rdf4j/sail/elasticsearchstore/ElasticsearchDataStructure.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ synchronized public void clear(boolean inferred, Resource[] contexts) {
148148

149149
BulkByScrollResponse response = new DeleteByQueryRequestBuilder(clientProvider.getClient(),
150150
DeleteByQueryAction.INSTANCE)
151-
.filter(getQueryBuilder(null, null, null, inferred, contexts))
152-
.abortOnVersionConflict(false)
153-
.source(index)
154-
.get();
151+
.filter(getQueryBuilder(null, null, null, inferred, contexts))
152+
.abortOnVersionConflict(false)
153+
.source(index)
154+
.get();
155155

156156
long deleted = response.getDeleted();
157157
}
@@ -596,10 +596,10 @@ public synchronized boolean removeStatementsByQuery(Resource subj, IRI pred, Val
596596

597597
BulkByScrollResponse response = new DeleteByQueryRequestBuilder(clientProvider.getClient(),
598598
DeleteByQueryAction.INSTANCE)
599-
.filter(getQueryBuilder(subj, pred, obj, inferred, contexts))
600-
.source(index)
601-
.abortOnVersionConflict(false)
602-
.get();
599+
.filter(getQueryBuilder(subj, pred, obj, inferred, contexts))
600+
.source(index)
601+
.abortOnVersionConflict(false)
602+
.get();
603603

604604
long deleted = response.getDeleted();
605605
return deleted > 0;

‎core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/TripleStoreAutoGrowTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void before(@TempDir File dataDir) throws Exception {
3737
tripleStore = new TripleStore(dataDir, config, null);
3838
((Logger) LoggerFactory
3939
.getLogger(TripleStore.class.getName()))
40-
.setLevel(ch.qos.logback.classic.Level.DEBUG);
40+
.setLevel(ch.qos.logback.classic.Level.DEBUG);
4141
}
4242

4343
@Test

0 commit comments

Comments
 (0)