You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2018/06/18 17:57:19 UTC
[camel] branch master updated: CAMEL-11893: Fixed typo and format
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f1e9319 CAMEL-11893: Fixed typo and format
f1e9319 is described below
commit f1e9319e7f5b3b92b3424bf65b7b98a4e3675d20
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Jun 18 19:55:59 2018 +0200
CAMEL-11893: Fixed typo and format
---
.../java/org/apache/camel/component/solr/JettySolrFactory.java | 2 +-
.../java/org/apache/camel/component/solr/SolrCloudFixture.java | 7 +++----
.../org/apache/camel/component/solr/SolrComponentTestSupport.java | 6 ++----
.../test/java/org/apache/camel/component/solr/SolrFixtures.java | 1 -
.../test/java/org/apache/camel/component/solr/SolrTestSupport.java | 2 +-
.../test/java/org/apache/camel/component/solr/SolrUpdateTest.java | 2 +-
6 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
index 2a431ba..92f8866 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
@@ -45,7 +45,7 @@ public final class JettySolrFactory {
private static int dataDirNo;
private JettySolrFactory() {
- // Util classs
+ // Util class
}
private static SSLConfig buildSSLConfig(boolean useSsl, boolean sslClientAuth) {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
index 88ce146..eb92525 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
@@ -54,16 +54,15 @@ public class SolrCloudFixture {
TEMP_DIR.mkdirs();
System.out.println("Created: " + TEMP_DIR.getAbsolutePath());
}
-
+
static Logger log = Logger.getLogger(SolrCloudFixture.class);
-
MiniSolrCloudCluster miniCluster;
File testDir;
SolrZkClient zkClient;
CloudSolrClient solrClient;
-
+
public SolrCloudFixture(String solrHome) throws Exception {
String xml = IOHelper.loadText(new FileInputStream(new File(solrHome, "solr-no-core.xml")));
miniCluster = new MiniSolrCloudCluster(1, "/solr", new File("target/tmp").toPath(), xml, null, null);
@@ -79,7 +78,7 @@ public class SolrCloudFixture {
log.info("JETTY RUNNING AT " + jetty.getBaseUrl() + " PORT " + jetty.getLocalPort());
}
}
-
+
solrClient = new CloudSolrClient.Builder().withZkHost(zkAddr).build();
solrClient.connect();
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index 0cdd92d..ece404e 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
@@ -38,23 +38,21 @@ import org.junit.runners.Parameterized.Parameters;
public abstract class SolrComponentTestSupport extends SolrTestSupport {
protected static final String TEST_ID = "test1";
protected static final String TEST_ID2 = "test2";
-
+
private SolrFixtures solrFixtures;
public SolrComponentTestSupport(SolrFixtures.TestServerType serverToTest) {
this.solrFixtures = new SolrFixtures(serverToTest);
}
-
protected void solrInsertTestEntry() {
solrInsertTestEntry(TEST_ID);
}
-
+
protected static Collection<Object[]> secureOrNot() {
return Arrays.asList(new Object[][] {{true}, {false}});
}
-
String solrRouteUri() {
return solrFixtures.solrRouteUri();
}
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
index 9df5713..b9cdcf9 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
@@ -59,7 +59,6 @@ public class SolrFixtures {
return "solr://localhost:" + port + "/solr/collection1";
}
}
-
SolrClient getServer() {
if (serverType == TestServerType.USE_HTTPS) {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
index de48a90..432525d 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
@@ -35,7 +35,7 @@ public abstract class SolrTestSupport extends CamelTestSupport {
protected static int getPort() {
return port;
}
-
+
protected static int getHttpsPort() {
return httpsPort;
}
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
index 8dde9c9..b373217 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
@@ -39,7 +39,7 @@ public class SolrUpdateTest extends SolrComponentTestSupport {
public SolrUpdateTest(SolrFixtures.TestServerType serverToTest) {
super(serverToTest);
}
-
+
@Override
@Before
public void setUp() throws Exception {
--
To stop receiving notification emails like this one, please contact
aldettinger@apache.org.