You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2021/06/14 20:35:47 UTC
[solr] branch main updated: SOLR-14920:
contrib/jaegertracer-configurator: apply & enforce 'spotless' code
formatting (#162)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new d17a1cd SOLR-14920: contrib/jaegertracer-configurator: apply & enforce 'spotless' code formatting (#162)
d17a1cd is described below
commit d17a1cdcebb46a6c9d360a6569319dd66021d346
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Mon Jun 14 21:35:41 2021 +0100
SOLR-14920: contrib/jaegertracer-configurator: apply & enforce 'spotless' code formatting (#162)
---
gradle/validation/spotless.gradle | 1 -
.../java/org/apache/solr/jaeger/package-info.java | 4 +---
.../apache/solr/jaeger/TestJaegerConfigurator.java | 23 +++++++++-------------
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/gradle/validation/spotless.gradle b/gradle/validation/spotless.gradle
index cda4ba6..34f93fc 100644
--- a/gradle/validation/spotless.gradle
+++ b/gradle/validation/spotless.gradle
@@ -49,7 +49,6 @@ configure(project(":solr").subprojects) { prj ->
case ":solr:contrib:clustering":
case ":solr:contrib:extraction":
case ":solr:contrib:gcs-repository":
- case ":solr:contrib:jaegertracer-configurator":
case ":solr:contrib:langid":
case ":solr:contrib:ltr":
case ":solr:contrib:prometheus-exporter":
diff --git a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
index 3562f36..84a1337 100644
--- a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
+++ b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
@@ -15,7 +15,5 @@
* limitations under the License.
*/
-/**
- * Jaeger Tracer Configurator.
- */
+/** Jaeger Tracer Configurator. */
package org.apache.solr.jaeger;
diff --git a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java b/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
index 9fc8d66..e15595a 100644
--- a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
+++ b/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
@@ -17,10 +17,9 @@
package org.apache.solr.jaeger;
-import java.util.concurrent.TimeUnit;
-
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import io.opentracing.util.GlobalTracer;
+import java.util.concurrent.TimeUnit;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -37,8 +36,7 @@ import org.junit.rules.TestRule;
public class TestJaegerConfigurator extends SolrTestCaseJ4 {
- @Rule
- public TestRule solrTestRules = new SystemPropertiesRestoreRule();
+ @Rule public TestRule solrTestRules = new SystemPropertiesRestoreRule();
@Before
public void doBefore() {
@@ -53,26 +51,23 @@ public class TestJaegerConfigurator extends SolrTestCaseJ4 {
@Test
public void testInjected() throws Exception {
- MiniSolrCloudCluster cluster = new SolrCloudTestCase.Builder(2, createTempDir())
- .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
- .withSolrXml(getFile("solr/solr.xml").toPath())
- .build();
+ MiniSolrCloudCluster cluster =
+ new SolrCloudTestCase.Builder(2, createTempDir())
+ .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
+ .withSolrXml(getFile("solr/solr.xml").toPath())
+ .build();
try {
TimeOut timeOut = new TimeOut(2, TimeUnit.MINUTES, TimeSource.NANO_TIME);
timeOut.waitFor(
"Waiting for GlobalTracer is registered",
() -> GlobalTracer.get().toString().contains("JaegerTracer"));
- //TODO add run Jaeger through Docker and verify spans available after run these commands
+ // TODO add run Jaeger through Docker and verify spans available after run these commands
CollectionAdminRequest.createCollection("test", 2, 1).process(cluster.getSolrClient());
- new UpdateRequest()
- .add("id", "1")
- .add("id", "2")
- .process(cluster.getSolrClient(), "test");
+ new UpdateRequest().add("id", "1").add("id", "2").process(cluster.getSolrClient(), "test");
cluster.getSolrClient().query("test", new SolrQuery("*:*"));
} finally {
cluster.shutdown();
}
-
}
}