You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2015/03/07 23:39:11 UTC
[1/4] camel git commit: Remove unused import
Repository: camel
Updated Branches:
refs/heads/master 92fcf851d -> e29267f56
Remove unused import
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d820b45
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d820b45
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d820b45
Branch: refs/heads/master
Commit: 3d820b45269daa8bd96553fbd21e7b160343a8d6
Parents: 92fcf85
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Mar 7 16:46:19 2015 -0500
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Mar 7 16:46:19 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/solr/SolrComponent.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d820b45/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
index 262b350..96f929c 100644
--- a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
+++ b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.CloudSolrServer;
[4/4] camel git commit: Use generics to fix warnings
Posted by gz...@apache.org.
Use generics to fix warnings
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e29267f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e29267f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e29267f5
Branch: refs/heads/master
Commit: e29267f565c2490e52e26c2e484cc1048122b59e
Parents: fa20f22
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Mar 7 17:37:41 2015 -0500
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Mar 7 17:37:41 2015 -0500
----------------------------------------------------------------------
.../org/apache/camel/component/solr/SolrComponentTestSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e29267f5/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
----------------------------------------------------------------------
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 b0b4355..d2daa2b 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
@@ -49,7 +49,7 @@ public abstract class SolrComponentTestSupport extends SolrTestSupport {
solrInsertTestEntry(TEST_ID);
}
- protected static Collection secureOrNot() {
+ protected static Collection<Object[]> secureOrNot() {
return Arrays.asList(new Object[][] {{true}, {false}});
}
[2/4] camel git commit: Clean up whitespace
Posted by gz...@apache.org.
Clean up whitespace
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/762bde54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/762bde54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/762bde54
Branch: refs/heads/master
Commit: 762bde54dea6780b44d524d923506ed8bf36782e
Parents: 3d820b4
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Mar 7 16:51:26 2015 -0500
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Mar 7 16:51:26 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/solr/SolrProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/762bde54/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
index aeaf54c..f168b43 100644
--- a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
+++ b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
@@ -167,7 +167,7 @@ public class SolrProducer extends DefaultProducer {
DirectXmlRequest xmlRequest = new DirectXmlRequest(getRequestHandler(), bodyAsString);
- solrServer.request(xmlRequest);
+ solrServer.request(xmlRequest);
} else {
invalid = true;
}
[3/4] camel git commit: Remove unused local variable and commented
out code
Posted by gz...@apache.org.
Remove unused local variable and commented out code
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa20f222
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa20f222
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa20f222
Branch: refs/heads/master
Commit: fa20f222475d4ea7ea8aa27e567272c4d412badf
Parents: 762bde5
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Mar 7 17:20:15 2015 -0500
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Mar 7 17:20:15 2015 -0500
----------------------------------------------------------------------
.../apache/camel/component/solr/SolrCloudFixture.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fa20f222/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
----------------------------------------------------------------------
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 c14659b..dbec1e9 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
@@ -28,7 +28,6 @@ import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -132,23 +131,11 @@ public class SolrCloudFixture {
Map<String, Object> props = new HashMap<String, Object>();
props.put("configName", "conf1");
- final ZkNodeProps zkProps = new ZkNodeProps(props);
-
- // zkClient.makePath("/collections/collection1",
- // ZkStateReader.toJSON(zkProps), CreateMode.PERSISTENT, true);
- // zkClient.makePath("/collections/collection1/shards",
- // CreateMode.PERSISTENT, true);
- // zkClient.makePath("/collections/control_collection",
- // ZkStateReader.toJSON(zkProps), CreateMode.PERSISTENT, true);
- // zkClient.makePath("/collections/control_collection/shards",
- // CreateMode.PERSISTENT, true);
// for now, always upload the config and schema to the canonical names
putConfig("conf1", zkClient, solrhome, config, "solrconfig.xml");
putConfig("conf1", zkClient, solrhome, schema, "schema.xml");
- // putConfig("conf1", zkClient, solrhome,
- // "solrconfig.snippet.randomindexconfig.xml");
putConfig("conf1", zkClient, solrhome, "stopwords.txt");
putConfig("conf1", zkClient, solrhome, "stopwords_en.txt");
putConfig("conf1", zkClient, solrhome, "protwords.txt");