You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2015/06/30 16:32:17 UTC
svn commit: r1688458 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/solrj/ solr/solrj/src/java/org/apache/solr/client/solrj/response/
solr/solrj/src/test-files/solrj/
solr/solrj/src/test/org/apache/solr/client/solrj/response/
Author: dweiss
Date: Tue Jun 30 14:32:17 2015
New Revision: 1688458
URL: http://svn.apache.org/r1688458
Log:
SOLR-7724: SolrJ now supports parsing the output of the clustering component.
(Alessandro Benedetti via Dawid Weiss)
Added:
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/Cluster.java
- copied unchanged from r1688455, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/Cluster.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/ClusteringResponse.java
- copied unchanged from r1688455, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/ClusteringResponse.java
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/sampleClusteringResponse.xml
- copied unchanged from r1688455, lucene/dev/trunk/solr/solrj/src/test-files/solrj/sampleClusteringResponse.xml
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java
- copied unchanged from r1688455, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1688458&r1=1688457&r2=1688458&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Jun 30 14:32:17 2015
@@ -52,6 +52,9 @@ Detailed Change List
New Features
----------------------
+* SOLR-7724: SolrJ now supports parsing the output of the clustering component.
+ (Alessandro Benedetti via Dawid Weiss)
+
* SOLR-7389: Expose znodeVersion property for each of the collections returned for the clusterstatus
operation in the collections API (Marius Grama via shalin)
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java?rev=1688458&r1=1688457&r2=1688458&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java Tue Jun 30 14:32:17 2015
@@ -48,6 +48,7 @@ public class QueryResponse extends SolrR
private NamedList<Object> _debugInfo = null;
private NamedList<Object> _highlightingInfo = null;
private NamedList<Object> _spellInfo = null;
+ private List<NamedList<Object>> _clusterInfo = null;
private NamedList<Object> _statsInfo = null;
private NamedList<NamedList<Number>> _termsInfo = null;
private String _cursorMarkNext = null;
@@ -74,6 +75,9 @@ public class QueryResponse extends SolrR
// SpellCheck Response
private SpellCheckResponse _spellResponse = null;
+ // Clustering Response
+ private ClusteringResponse _clusterResponse = null;
+
// Terms Response
private TermsResponse _termsResponse = null;
@@ -87,7 +91,7 @@ public class QueryResponse extends SolrR
// utility variable used for automatic binding -- it should not be serialized
private transient final SolrClient solrClient;
- public QueryResponse(){
+ public QueryResponse() {
solrClient = null;
}
@@ -145,6 +149,10 @@ public class QueryResponse extends SolrR
_spellInfo = (NamedList<Object>) res.getVal( i );
extractSpellCheckInfo( _spellInfo );
}
+ else if ("clusters".equals(n)) {
+ _clusterInfo = (ArrayList<NamedList<Object>>) res.getVal(i);
+ extractClusteringInfo(_clusterInfo);
+ }
else if ( "stats".equals( n ) ) {
_statsInfo = (NamedList<Object>) res.getVal( i );
extractStatsInfo( _statsInfo );
@@ -164,6 +172,10 @@ public class QueryResponse extends SolrR
_spellResponse = new SpellCheckResponse(spellInfo);
}
+ private void extractClusteringInfo(List<NamedList<Object>> clusterInfo) {
+ _clusterResponse = new ClusteringResponse(clusterInfo);
+ }
+
private void extractTermsInfo(NamedList<NamedList<Number>> termsInfo) {
_termsResponse = new TermsResponse(termsInfo);
}
@@ -514,6 +526,10 @@ public class QueryResponse extends SolrR
return _spellResponse;
}
+ public ClusteringResponse getClusteringResponse() {
+ return _clusterResponse;
+ }
+
public TermsResponse getTermsResponse() {
return _termsResponse;
}