Skip to content

Commit b0d9ce0

Browse files
SOLR-18296: reformat with google-java-format 1.35.0
Pure mechanical reformatting from running ./gradlew tidy with the upgraded formatter. No logic changes. This commit's SHA is added to .git-blame-ignore-revs (in a follow-up) so git blame skips it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 26371bd commit b0d9ce0

37 files changed

Lines changed: 366 additions & 153 deletions

File tree

CHANGELOG.md

Lines changed: 217 additions & 20 deletions
Large diffs are not rendered by default.

build-tools/missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ private void check(Element element) {
230230
case PACKAGE:
231231
checkComment(element);
232232
break;
233-
// class-like elements, check them, then recursively check their children (fields and
234-
// methods)
233+
// class-like elements, check them, then recursively check their children (fields and
234+
// methods)
235235
case CLASS:
236236
case INTERFACE:
237237
case ENUM:
@@ -251,7 +251,7 @@ private void check(Element element) {
251251
}
252252
}
253253
break;
254-
// method-like elements, check them if we are configured to do so
254+
// method-like elements, check them if we are configured to do so
255255
case METHOD:
256256
case CONSTRUCTOR:
257257
case FIELD:

changelog/v10.0.0/version-summary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
- Remove obsolete overseer internal work queue. This queue was read-only since Solr 8. [SOLR-17929](https://issues.apache.org/jira/browse/SOLR-17929) (Pierre Salagnac)
288288
- Raising the per ramPerThreadHardLimit to be configurable >2GB [SOLR-17942](https://issues.apache.org/jira/browse/SOLR-17942) (Puneet Ahuja)
289289
- Removed TikaLanguageIdentifierUpdateProcessor. Use LangDetectLanguageIdentifierUpdateProcessor or OpenNLPLangDetectUpdateProcessor instead. [SOLR-17960](https://issues.apache.org/jira/browse/SOLR-17960) (janhoy)
290-
- The deprecated SolrClient implementations based on Apache HttpClient are removed from Solrj, thus the related dependencies are no longer present. They temporarily live on in the test framework. #17962 [SOLR-17962](https://issues.apache.org/jira/browse/SOLR-17962) (David Smiley)
290+
- The deprecated SolrClient implementations based on Apache HttpClient are removed from Solrj, thus the related dependencies are no longer present. They temporarily live on in the test framework in different packages & names. #17962 [SOLR-17962](https://issues.apache.org/jira/browse/SOLR-17962) (David Smiley)
291291
- These SolrCloud commands no longer aquire locks (waiting or blocking on other commands that do): COLLECTIONPROP, ADDREPLICAPROP, DELETEREPLICAPROP. [SOLR-17963](https://issues.apache.org/jira/browse/SOLR-17963) (David Smiley)
292292
- Rename HttpClientBuilderFactory to SolrClientCustomizer, and property solr.httpclient.builder.factory to solr.solrj.http.jetty.customizer [SOLR-17994](https://issues.apache.org/jira/browse/SOLR-17994) (David Smiley)
293293
- New SolrJ SolrRequest.processWithBaseUrl, new HttpSolrClientBase.requestWithBaseUrl. Existing callers will require updates due to a signature change. [SOLR-17996](https://issues.apache.org/jira/browse/SOLR-17996) (David Smiley)

solr/core/src/java/org/apache/solr/blockcache/BlockDirectory.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -323,21 +323,21 @@ boolean useReadCache(String name, IOContext context) {
323323
return false;
324324
}
325325
switch (context.context()) {
326-
// depending on params, we don't cache on merges or when only reading once
326+
// depending on params, we don't cache on merges or when only reading once
327327
case MERGE:
328328
{
329329
return cacheMerges;
330330
}
331-
/* TODO
332-
case READ:
333-
{
334-
if (context.readOnce) {
335-
return cacheReadOnce;
336-
} else {
337-
return true;
338-
}
331+
/* TODO
332+
case READ:
333+
{
334+
if (context.readOnce) {
335+
return cacheReadOnce;
336+
} else {
337+
return true;
339338
}
340-
*/
339+
}
340+
*/
341341
default:
342342
{
343343
return true;

solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ SolrInputDocument readDocument(XMLStreamReader reader, IndexSchema schema)
279279
while (true) {
280280
int event = reader.next();
281281
switch (event) {
282-
// Add everything to the text
282+
// Add everything to the text
283283
case XMLStreamConstants.SPACE:
284284
case XMLStreamConstants.CDATA:
285285
case XMLStreamConstants.CHARACTERS:

solr/core/src/java/org/apache/solr/handler/IncrementalShardBackup.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,9 @@ private BackupStats incrementalCopy(Collection<String> indexFiles, Directory dir
275275
case Error err -> throw err;
276276
case IOException ioe -> throw ioe;
277277
case RuntimeException re -> throw re;
278-
default -> throw new SolrException(
279-
SolrException.ErrorCode.UNKNOWN, "Error during parallel backup upload", cause);
278+
default ->
279+
throw new SolrException(
280+
SolrException.ErrorCode.UNKNOWN, "Error during parallel backup upload", cause);
280281
}
281282
} catch (InterruptedException e) {
282283
uploadFutures.forEach(f -> f.cancel(true));

solr/core/src/java/org/apache/solr/handler/RestoreCore.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,9 @@ public boolean doRestore() throws Exception {
195195
case Error err -> throw err;
196196
case IOException ioe -> throw ioe;
197197
case RuntimeException re -> throw re;
198-
default -> throw new SolrException(
199-
SolrException.ErrorCode.UNKNOWN, "Error during parallel restore download", cause);
198+
default ->
199+
throw new SolrException(
200+
SolrException.ErrorCode.UNKNOWN, "Error during parallel restore download", cause);
200201
}
201202
} catch (InterruptedException e) {
202203
downloadFutures.forEach(f -> f.cancel(true));

solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,10 @@ private FilterType extractFilterType(SolrParams params) {
461461
case "none" -> FilterType.none;
462462
case "name" -> FilterType.name;
463463
case "status" -> FilterType.status;
464-
default -> throw new SolrException(
465-
ErrorCode.BAD_REQUEST,
466-
"Invalid filterType '" + filterType + "'. Allowed values are: none, name, status");
464+
default ->
465+
throw new SolrException(
466+
ErrorCode.BAD_REQUEST,
467+
"Invalid filterType '" + filterType + "'. Allowed values are: none, name, status");
467468
};
468469
}
469470
return FilterType.none;

solr/core/src/java/org/apache/solr/handler/component/PivotFacetValue.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,9 @@ public static PivotFacetValue createFromNamedList(
145145
case STATS -> statsValues = (NamedList<NamedList<NamedList<?>>>) value;
146146
case QUERIES -> queryCounts = (NamedList<Number>) value;
147147
case RANGES -> ranges = (SimpleOrderedMap<SimpleOrderedMap<Object>>) value;
148-
default -> throw new RuntimeException(
149-
"PivotListEntry contains unaccounted for item: " + pivotEntry);
148+
default ->
149+
throw new RuntimeException(
150+
"PivotListEntry contains unaccounted for item: " + pivotEntry);
150151
}
151152
}
152153

solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ protected String stageToString(int stage) {
768768
return "EXECUTE_QUERY";
769769
case STAGE_GET_FIELDS:
770770
return "GET_FIELDS";
771-
// nobody wants to think it was DONE and canceled after it completed...
771+
// nobody wants to think it was DONE and canceled after it completed...
772772
case STAGE_DONE:
773773
return "FINISHING";
774774
default:

0 commit comments

Comments
 (0)