You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/10/04 04:24:16 UTC
svn commit: r1004086 [5/6] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/ind...
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymMap.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymMap.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymMap.java Mon Oct 4 02:24:12 2010
@@ -73,7 +73,7 @@ public class SynonymMap {
}
List<Token> superset = currMap.synonyms==null ? replacement :
mergeTokens(Arrays.asList(currMap.synonyms), replacement);
- currMap.synonyms = (Token[])superset.toArray(new Token[superset.size()]);
+ currMap.synonyms = superset.toArray(new Token[superset.size()]);
if (includeOrig) currMap.flags |= INCLUDE_ORIG;
}
Propchange: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymMap.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 02:24:12 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java:950008
-/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymMap.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707
,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,9
95376,995557,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038
+/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SynonymMap.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707
,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,9
95376,995557,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082
/lucene/java/branches/lucene_2_4/solr/src/java/org/apache/solr/analysis/SynonymMap.java:748824
/lucene/java/branches/lucene_2_9/solr/src/java/org/apache/solr/analysis/SynonymMap.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/java/org/apache/solr/analysis/SynonymMap.java:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/TokenizerChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/TokenizerChain.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/TokenizerChain.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/TokenizerChain.java Mon Oct 4 02:24:12 2010
@@ -65,7 +65,7 @@ public final class TokenizerChain extend
@Override
public TokenStreamInfo getStream(String fieldName, Reader reader) {
- Tokenizer tk = (Tokenizer)tokenizer.create(charStream(reader));
+ Tokenizer tk = tokenizer.create(charStream(reader));
TokenStream ts = tk;
for (int i=0; i<filters.length; i++) {
ts = filters[i].create(ts);
Propchange: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/WordDelimiterIterator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 02:24:12 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java:990451
-/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WordDelimiterIterator.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,95
7634,957707,960367,960374,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,9952
86,995376,995557,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038
+/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WordDelimiterIterator.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,95
7634,957707,960367,960374,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,9952
86,995376,995557,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082
/lucene/java/branches/lucene_2_4/solr/src/java/org/apache/solr/analysis/WordDelimiterIterator.java:748824
/lucene/java/branches/lucene_2_9/solr/src/java/org/apache/solr/analysis/WordDelimiterIterator.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/java/org/apache/solr/analysis/WordDelimiterIterator.java:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/SolrConfig.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/SolrConfig.java Mon Oct 4 02:24:12 2010
@@ -177,7 +177,7 @@ public class SolrConfig extends Config {
httpCachingConfig = new HttpCachingConfig(this);
- Node jmx = (Node) getNode("jmx", false);
+ Node jmx = getNode("jmx", false);
if (jmx != null) {
jmxConfig = new JmxConfiguration(true, get("jmx/@agentId", null), get(
"jmx/@serviceUrl", null));
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java Mon Oct 4 02:24:12 2010
@@ -52,6 +52,7 @@ import java.util.Collection;
*
* @deprecated Use {@link org.apache.solr.handler.DocumentAnalysisRequestHandler} instead.
**/
+@Deprecated
public class AnalysisRequestHandler extends RequestHandlerBase {
public static Logger log = LoggerFactory.getLogger(AnalysisRequestHandler.class);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Mon Oct 4 02:24:12 2010
@@ -253,18 +253,12 @@ public abstract class AnalysisRequestHan
private final List<Token> tokens;
private Iterator<Token> tokenIterator;
- private final CharTermAttribute termAtt = (CharTermAttribute)
- addAttribute(CharTermAttribute.class);
- private final OffsetAttribute offsetAtt = (OffsetAttribute)
- addAttribute(OffsetAttribute.class);
- private final TypeAttribute typeAtt = (TypeAttribute)
- addAttribute(TypeAttribute.class);
- private final FlagsAttribute flagsAtt = (FlagsAttribute)
- addAttribute(FlagsAttribute.class);
- private final PayloadAttribute payloadAtt = (PayloadAttribute)
- addAttribute(PayloadAttribute.class);
- private final PositionIncrementAttribute posIncAtt = (PositionIncrementAttribute)
- addAttribute(PositionIncrementAttribute.class);
+ private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
+ private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
+ private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
+ private final FlagsAttribute flagsAtt = addAttribute(FlagsAttribute.class);
+ private final PayloadAttribute payloadAtt = addAttribute(PayloadAttribute.class);
+ private final PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class);
/**
* Creates a new ListBasedTokenStream which uses the given tokens as its token source.
*
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Mon Oct 4 02:24:12 2010
@@ -60,16 +60,19 @@ public class XmlUpdateRequestHandler ext
/**
* @deprecated use {@link #OVERWRITE}
*/
+ @Deprecated
public static final String OVERWRITE_COMMITTED = "overwriteCommitted";
/**
* @deprecated use {@link #OVERWRITE}
*/
+ @Deprecated
public static final String OVERWRITE_PENDING = "overwritePending";
/**
* @deprecated use {@link #OVERWRITE}
*/
+ @Deprecated
public static final String ALLOW_DUPS = "allowDups";
XMLInputFactory inputFactory;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/FacetComponent.java Mon Oct 4 02:24:12 2010
@@ -251,7 +251,7 @@ public class FacetComponent extends Sea
NamedList facet_queries = (NamedList)facet_counts.get("facet_queries");
if (facet_queries != null) {
for (int i=0; i<facet_queries.size(); i++) {
- String returnedKey = (String)facet_queries.getName(i);
+ String returnedKey = facet_queries.getName(i);
long count = ((Number)facet_queries.getVal(i)).longValue();
QueryFacet qf = fi.queryFacets.get(returnedKey);
qf.count += count;
@@ -341,7 +341,7 @@ public class FacetComponent extends Sea
for (int i=0; i<facet_fields.size(); i++) {
String key = facet_fields.getName(i);
- DistribFieldFacet dff = (DistribFieldFacet)fi.facets.get(key);
+ DistribFieldFacet dff = fi.facets.get(key);
if (dff == null) continue;
NamedList shardCounts = (NamedList)facet_fields.getVal(i);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Mon Oct 4 02:24:12 2010
@@ -329,7 +329,7 @@ public class SpellCheckComponent extends
sugQueue.insertWithOverflow(sug);
if (sugQueue.size() == numSug) {
// if queue full, maintain the minScore score
- min = ((SuggestWord) sugQueue.top()).score;
+ min = sugQueue.top().score;
}
}
@@ -343,7 +343,7 @@ public class SpellCheckComponent extends
for (int k=0; k < sugQueue.size() - count; k++) sugQueue.pop();
// now collect the top 'count' responses
for (int k = Math.min(count, sugQueue.size()) - 1; k >= 0; k--) {
- suggestions[k] = ((SuggestWord) sugQueue.pop());
+ suggestions[k] = sugQueue.pop();
}
if (extendedResults) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Mon Oct 4 02:24:12 2010
@@ -558,7 +558,7 @@ final class TokenOrderingFilter extends
private final int windowSize;
private final LinkedList<OrderedToken> queue = new LinkedList<OrderedToken>();
private boolean done=false;
- private final OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class);
+ private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
protected TokenOrderingFilter(TokenStream input, int windowSize) {
super(input);
@@ -618,7 +618,7 @@ class TermOffsetsTokenStream {
public TermOffsetsTokenStream( TokenStream tstream ){
bufferedTokenStream = tstream;
- bufferedOffsetAtt = (OffsetAttribute) bufferedTokenStream.addAttribute(OffsetAttribute.class);
+ bufferedOffsetAtt = bufferedTokenStream.addAttribute(OffsetAttribute.class);
startOffset = 0;
bufferedToken = null;
}
@@ -630,7 +630,7 @@ class TermOffsetsTokenStream {
final class MultiValuedStream extends TokenStream {
private final int length;
- OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class);
+ OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
MultiValuedStream(int length) {
super(bufferedTokenStream.cloneAttributes());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/GapFragmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/GapFragmenter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/GapFragmenter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/GapFragmenter.java Mon Oct 4 02:24:12 2010
@@ -93,8 +93,8 @@ class LuceneGapFragmenter extends Simple
* @see org.apache.lucene.search.highlight.TextFragmenter#start(java.lang.String)
*/
public void start(String originalText, TokenStream tokenStream) {
- offsetAtt = (OffsetAttribute) tokenStream.getAttribute(OffsetAttribute.class);
- posIncAtt = (PositionIncrementAttribute) tokenStream.getAttribute(PositionIncrementAttribute.class);
+ offsetAtt = tokenStream.getAttribute(OffsetAttribute.class);
+ posIncAtt = tokenStream.getAttribute(PositionIncrementAttribute.class);
fragOffset = 0;
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java Mon Oct 4 02:24:12 2010
@@ -202,8 +202,8 @@ class LuceneRegexFragmenter implements F
currentNumFrags = 1;
currentOffset = 0;
addHotSpots(originalText);
- posIncAtt = (PositionIncrementAttribute) tokenStream.getAttribute(PositionIncrementAttribute.class);
- offsetAtt = (OffsetAttribute) tokenStream.getAttribute(OffsetAttribute.class);
+ posIncAtt = tokenStream.getAttribute(PositionIncrementAttribute.class);
+ offsetAtt = tokenStream.getAttribute(OffsetAttribute.class);
}
////////////////////////////////////
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -20,6 +20,7 @@ package org.apache.solr.request;
/**
* @deprecated use org.apache.solr.response.BinaryQueryResponseWriter
*/
+@Deprecated
public interface BinaryQueryResponseWriter extends org.apache.solr.response.BinaryQueryResponseWriter
{
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.BinaryResponseWriter
*/
+@Deprecated
public class BinaryResponseWriter extends org.apache.solr.response.BinaryResponseWriter
{
private static Logger log = LoggerFactory.getLogger(BinaryResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/JSONResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/JSONResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/JSONResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.JSONResponseWriter
*/
+@Deprecated
public class JSONResponseWriter extends org.apache.solr.response.JSONResponseWriter
{
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.PHPResponseWriter
*/
+@Deprecated
public class PHPResponseWriter extends org.apache.solr.response.PHPResponseWriter
{
private static Logger log = LoggerFactory.getLogger(PHPResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.PHPSerializedResponseWriter
*/
+@Deprecated
public class PHPSerializedResponseWriter extends org.apache.solr.response.PHPSerializedResponseWriter
{
private static Logger log = LoggerFactory.getLogger(PHPSerializedResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PythonResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PythonResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PythonResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/PythonResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.PythonResponseWriter
*/
+@Deprecated
public class PythonResponseWriter extends org.apache.solr.response.PythonResponseWriter
{
private static Logger log = LoggerFactory.getLogger(PythonResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/QueryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/QueryResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/QueryResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/QueryResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -20,6 +20,7 @@ package org.apache.solr.request;
/**
* @deprecated use org.apache.solr.response.QueryResponseWriter
*/
+@Deprecated
public interface QueryResponseWriter extends org.apache.solr.response.QueryResponseWriter
{
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RawResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RawResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RawResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RawResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.RawResponseWriter
*/
+@Deprecated
public class RawResponseWriter extends org.apache.solr.response.RawResponseWriter
{
private static Logger log = LoggerFactory.getLogger(RawResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RubyResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RubyResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RubyResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/RubyResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.RubyResponseWriter
*/
+@Deprecated
public class RubyResponseWriter extends org.apache.solr.response.RubyResponseWriter
{
private static Logger log = LoggerFactory.getLogger(RubyResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/SolrQueryResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/SolrQueryResponse.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/SolrQueryResponse.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/SolrQueryResponse.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.SolrQueryResponse
*/
+@Deprecated
public class SolrQueryResponse extends org.apache.solr.response.SolrQueryResponse
{
private static Logger log = LoggerFactory.getLogger(SolrQueryResponse.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/TextResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/TextResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/TextResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.TextResponseWriter
*/
+@Deprecated
public abstract class TextResponseWriter extends org.apache.solr.response.TextResponseWriter
{
private static Logger log = LoggerFactory.getLogger(TextResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XMLResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XMLResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XMLResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XMLResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.XMLResponseWriter
*/
+@Deprecated
public class XMLResponseWriter extends org.apache.solr.response.XMLResponseWriter
{
private static Logger log = LoggerFactory.getLogger(XMLResponseWriter.class.getName());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use org.apache.solr.response.XSLTResponseWriter
*/
+@Deprecated
public class XSLTResponseWriter extends org.apache.solr.response.XSLTResponseWriter
{
private static Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class.getName());
Propchange: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 02:24:12 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr/src/java/org/apache/solr/response:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950830,950835,951126,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,9
60719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,995376,995557,995
772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1002032,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038
+/lucene/dev/trunk/solr/src/java/org/apache/solr/response:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950830,950835,951126,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,9
60719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,995376,995557,995
772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1002032,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082
/lucene/java/branches/lucene_2_4/solr/src/java/org/apache/solr/response:748824
/lucene/java/branches/lucene_2_9/solr/src/java/org/apache/solr/response:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/java/org/apache/solr/response:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -167,7 +167,7 @@ public abstract class BaseResponseWriter
private static SolrDocument getDoc(int id, IdxInfo info) throws IOException {
Document doc = info.searcher.doc(id);
SolrDocument solrDoc = new SolrDocument();
- for (Fieldable f : (List<Fieldable>) doc.getFields()) {
+ for (Fieldable f : doc.getFields()) {
String fieldName = f.name();
if (info.returnFields != null && !info.returnFields.contains(fieldName))
continue;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -132,7 +132,7 @@ public class BinaryResponseWriter implem
public SolrDocument getDoc(Document doc) {
SolrDocument solrDoc = new SolrDocument();
- for (Fieldable f : (List<Fieldable>) doc.getFields()) {
+ for (Fieldable f : doc.getFields()) {
String fieldName = f.name();
if (returnFields != null && !returnFields.contains(fieldName)) continue;
SchemaField sf = schema.getFieldOrNull(fieldName);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/JSONResponseWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/JSONResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/JSONResponseWriter.java Mon Oct 4 02:24:12 2010
@@ -447,7 +447,7 @@ class JSONWriter extends TextResponseWri
other = scoreMap;
scoreMap.put("score",score);
}
- writeDoc(name, (List<Fieldable>)(doc.getFields()), returnFields, other);
+ writeDoc(name, doc.getFields(), returnFields, other);
}
public void writeDocList(String name, DocList ids, Set<String> fields, Map otherFields) throws IOException {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/DateField.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/DateField.java Mon Oct 4 02:24:12 2010
@@ -227,6 +227,7 @@ public class DateField extends FieldType
*
* @deprecated - use formatDate(Date) instead
*/
+ @Deprecated
protected DateFormat getThreadLocalDateFormat() {
return fmtThreadLocal.get();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/IndexSchema.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/IndexSchema.java Mon Oct 4 02:24:12 2010
@@ -132,6 +132,7 @@ public final class IndexSchema {
/**
* @deprecated -- get access to SolrConfig some other way...
*/
+ @Deprecated
public SolrConfig getSolrConfig() {
return solrConfig;
}
@@ -274,6 +275,7 @@ public final class IndexSchema {
* @param defaultField if non-null overrides the schema default
* @deprecated
*/
+ @Deprecated
public SolrQueryParser getSolrQueryParser(String defaultField) {
SolrQueryParser qp = new SolrQueryParser(this,defaultField);
String operator = getQueryParserDefaultOperator();
@@ -550,7 +552,7 @@ public final class IndexSchema {
log.trace("Dynamic Field Ordering:" + dFields);
// stuff it in a normal array for faster access
- dynamicFields = (DynamicField[])dFields.toArray(new DynamicField[dFields.size()]);
+ dynamicFields = dFields.toArray(new DynamicField[dFields.size()]);
Node node = (Node) xpath.evaluate("/schema/similarity", document, XPathConstants.NODE);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/RandomSortField.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/RandomSortField.java Mon Oct 4 02:24:12 2010
@@ -166,7 +166,7 @@ public class RandomSortField extends Fie
@Override
public int intVal(int doc) {
- return (int)hash(doc+seed);
+ return hash(doc+seed);
}
@Override
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SchemaField.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SchemaField.java Mon Oct 4 02:24:12 2010
@@ -135,7 +135,7 @@ public final class SchemaField extends F
String defaultValue = null;
if( props.containsKey( "default" ) ) {
- defaultValue = (String)props.get( "default" );
+ defaultValue = props.get( "default" );
}
return new SchemaField(name, ft, calcProps(name, ft, props), defaultValue );
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java Mon Oct 4 02:24:12 2010
@@ -65,7 +65,7 @@ class LuceneQueryOptimizer {
BooleanQuery query = new BooleanQuery();
BooleanQuery filterQuery = null;
- for (BooleanClause c : (List<BooleanClause>)original.clauses()) {
+ for (BooleanClause c : original.clauses()) {
/***
System.out.println("required="+c.required);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java Mon Oct 4 02:24:12 2010
@@ -392,7 +392,7 @@ public class QueryParsing {
return null;
}
- return new Sort((SortField[]) lst.toArray(new SortField[lst.size()]));
+ return new Sort(lst.toArray(new SortField[lst.size()]));
}
@@ -492,7 +492,7 @@ public class QueryParsing {
out.append('(');
}
boolean first = true;
- for (BooleanClause c : (List<BooleanClause>) q.clauses()) {
+ for (BooleanClause c : q.clauses()) {
if (!first) {
out.append(' ');
} else {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Oct 4 02:24:12 2010
@@ -90,6 +90,7 @@ public class SolrIndexSearcher extends I
*
* @deprecated use alternate constructor
*/
+ @Deprecated
public SolrIndexSearcher(SolrCore core, IndexSchema schema, String name, String path, boolean enableCache) throws IOException {
this(core, schema,name, core.getIndexReaderFactory().newReader(core.getDirectoryFactory().open(path), false), true, enableCache);
}
@@ -420,7 +421,7 @@ public class SolrIndexSearcher extends I
Document d;
if (documentCache != null) {
- d = (Document)documentCache.get(i);
+ d = documentCache.get(i);
if (d!=null) return d;
}
@@ -536,7 +537,7 @@ public class SolrIndexSearcher extends I
boolean positive = query==absQ;
if (filterCache != null) {
- DocSet absAnswer = (DocSet)filterCache.get(absQ);
+ DocSet absAnswer = filterCache.get(absQ);
if (absAnswer!=null) {
if (positive) return absAnswer;
else return getPositiveDocSet(matchAllDocsQuery).andNot(absAnswer);
@@ -558,7 +559,7 @@ public class SolrIndexSearcher extends I
DocSet getPositiveDocSet(Query q) throws IOException {
DocSet answer;
if (filterCache != null) {
- answer = (DocSet)filterCache.get(q);
+ answer = filterCache.get(q);
if (answer!=null) return answer;
}
answer = getDocSetNC(q,null);
@@ -571,7 +572,7 @@ public class SolrIndexSearcher extends I
public DocSet getPositiveDocSet(Query q, TermDocsState tdState) throws IOException {
DocSet answer;
if (filterCache != null) {
- answer = (DocSet)filterCache.get(q);
+ answer = filterCache.get(q);
if (answer!=null) return answer;
}
answer = getDocSetNC(q, null, tdState);
@@ -742,7 +743,7 @@ public class SolrIndexSearcher extends I
DocSet first;
if (filterCache != null) {
- first = (DocSet)filterCache.get(absQ);
+ first = filterCache.get(absQ);
if (first==null) {
first = getDocSetNC(absQ,null);
filterCache.put(absQ,first);
@@ -859,7 +860,7 @@ public class SolrIndexSearcher extends I
// so set all of them on the cache key.
key = new QueryResultKey(cmd.getQuery(), cmd.getFilterList(), cmd.getSort(), cmd.getFlags());
if ((cmd.getFlags() & NO_CHECK_QCACHE)==0) {
- superset = (DocList)queryResultCache.get(key);
+ superset = queryResultCache.get(key);
if (superset != null) {
// check that the cache entry has scores recorded if we need them
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java Mon Oct 4 02:24:12 2010
@@ -53,7 +53,7 @@ public class ByteFieldSource extends Fie
return new DocValues() {
@Override
public byte byteVal(int doc) {
- return (byte) arr[doc];
+ return arr[doc];
}
@Override
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java Mon Oct 4 02:24:12 2010
@@ -49,8 +49,8 @@ public class DoubleFieldSource extends F
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final double[] arr = (parser == null) ?
- ((FieldCache) cache).getDoubles(reader, field) :
- ((FieldCache) cache).getDoubles(reader, field, parser);
+ cache.getDoubles(reader, field) :
+ cache.getDoubles(reader, field, parser);
return new DocValues() {
public float floatVal(int doc) {
return (float) arr[doc];
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java Mon Oct 4 02:24:12 2010
@@ -58,7 +58,7 @@ public class IntFieldSource extends Fiel
}
public int intVal(int doc) {
- return (int)arr[doc];
+ return arr[doc];
}
public long longVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java Mon Oct 4 02:24:12 2010
@@ -55,8 +55,8 @@ public class LongFieldSource extends Fie
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final long[] arr = (parser == null) ?
- ((FieldCache) cache).getLongs(reader, field) :
- ((FieldCache) cache).getLongs(reader, field, parser);
+ cache.getLongs(reader, field) :
+ cache.getLongs(reader, field, parser);
return new DocValues() {
public float floatVal(int doc) {
return (float) arr[doc];
@@ -67,7 +67,7 @@ public class LongFieldSource extends Fie
}
public long longVal(int doc) {
- return (long) arr[doc];
+ return arr[doc];
}
public double doubleVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java Mon Oct 4 02:24:12 2010
@@ -69,7 +69,7 @@ public class ReverseOrdFieldSource exten
}
public int intVal(int doc) {
- return (int)(end - arr[doc]);
+ return (end - arr[doc]);
}
public long longVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java Mon Oct 4 02:24:12 2010
@@ -55,7 +55,7 @@ public class ShortFieldSource extends Fi
@Override
public short shortVal(int doc) {
- return (short) arr[doc];
+ return arr[doc];
}
public float floatVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java Mon Oct 4 02:24:12 2010
@@ -72,7 +72,7 @@ public class GeohashHaversineFunction ex
}
public double doubleVal(int doc) {
- return (double) distance(doc, gh1DV, gh2DV);
+ return distance(doc, gh1DV, gh2DV);
}
public String strVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java Mon Oct 4 02:24:12 2010
@@ -113,7 +113,7 @@ public class HaversineFunction extends V
}
public double doubleVal(int doc) {
- return (double) distance(doc, vals1, vals2);
+ return distance(doc, vals1, vals2);
}
public String strVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java Mon Oct 4 02:24:12 2010
@@ -37,7 +37,7 @@ public class StringDistanceFunction exte
return new DocValues() {
public float floatVal(int doc) {
- return (float) dist.getDistance(str1DV.strVal(doc), str2DV.strVal(doc));
+ return dist.getDistance(str1DV.strVal(doc), str2DV.strVal(doc));
}
public int intVal(int doc) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java Mon Oct 4 02:24:12 2010
@@ -182,7 +182,7 @@ public abstract class AbstractLuceneSpel
Term term = field != null ? new Term(field, "") : null;
float theAccuracy = (options.accuracy == Float.MIN_VALUE) ? spellChecker.getAccuracy() : options.accuracy;
- int count = (int) Math.max(options.count, AbstractLuceneSpellChecker.DEFAULT_SUGGESTION_COUNT);
+ int count = Math.max(options.count, AbstractLuceneSpellChecker.DEFAULT_SUGGESTION_COUNT);
for (Token token : options.tokens) {
String tokenText = new String(token.buffer(), 0, token.length());
String[] suggestions = spellChecker.suggestSimilar(tokenText,
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java Mon Oct 4 02:24:12 2010
@@ -77,6 +77,7 @@ public abstract class SolrSpellChecker {
*
* @deprecated This method will be removed in 4.x in favor of {@link #getSuggestions(org.apache.solr.spelling.SpellingOptions)}
*/
+ @Deprecated
public SpellingResult getSuggestions(Collection<Token> tokens, IndexReader reader) throws IOException {
return getSuggestions(tokens, reader, 1, false, false);
}
@@ -88,6 +89,7 @@ public abstract class SolrSpellChecker {
*
* @deprecated This method will be removed in 4.x in favor of {@link #getSuggestions(org.apache.solr.spelling.SpellingOptions)}
*/
+ @Deprecated
public SpellingResult getSuggestions(Collection<Token> tokens, IndexReader reader, int count) throws IOException {
return getSuggestions(tokens, reader, count, false, false);
}
@@ -100,6 +102,7 @@ public abstract class SolrSpellChecker {
*
* @deprecated This method will be removed in 4.x in favor of {@link #getSuggestions(org.apache.solr.spelling.SpellingOptions)}
*/
+ @Deprecated
public SpellingResult getSuggestions(Collection<Token> tokens, IndexReader reader, boolean onlyMorePopular, boolean extendedResults) throws IOException {
return getSuggestions(tokens, reader, 1, onlyMorePopular, extendedResults);
}
@@ -117,6 +120,7 @@ public abstract class SolrSpellChecker {
*
* @deprecated This method will be removed in 4.x in favor of {@link #getSuggestions(org.apache.solr.spelling.SpellingOptions)}
*/
+ @Deprecated
public abstract SpellingResult getSuggestions(Collection<Token> tokens, IndexReader reader, int count,
boolean onlyMorePopular, boolean extendedResults)
throws IOException;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java Mon Oct 4 02:24:12 2010
@@ -139,7 +139,7 @@ public class TSTAutocomplete {
Stack<TernaryTreeNode> st = new Stack<TernaryTreeNode>();
st.push(p);
while (!st.empty()) {
- TernaryTreeNode top = (TernaryTreeNode) st.peek();
+ TernaryTreeNode top = st.peek();
st.pop();
if (top.token != null) {
suggest.add(top);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java Mon Oct 4 02:24:12 2010
@@ -51,7 +51,7 @@ import org.apache.solr.core.SolrCore;
*
* @deprecated Use {@link DirectUpdateHandler2} instead. This is only kept around for back-compatibility (way back).
*/
-
+@Deprecated
public class DirectUpdateHandler extends UpdateHandler {
// the set of ids in the "pending set" (those docs that have been added, but
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java Mon Oct 4 02:24:12 2010
@@ -144,6 +144,7 @@ public class SolrIndexWriter extends Ind
}
/** @deprecated remove when getDirectory(String,SolrIndexConfig) is gone */
+ @Deprecated
private static DirectoryFactory LEGACY_DIR_FACTORY
= new StandardDirectoryFactory();
static {
@@ -153,6 +154,7 @@ public class SolrIndexWriter extends Ind
/**
* @deprecated use getDirectory(String path, DirectoryFactory directoryFactory, SolrIndexConfig config)
*/
+ @Deprecated
public static Directory getDirectory(String path, SolrIndexConfig config) throws IOException {
log.warn("SolrIndexWriter is using LEGACY_DIR_FACTORY which means deprecated code is likely in use and SolrIndexWriter is ignoring any custom DirectoryFactory.");
return getDirectory(path, LEGACY_DIR_FACTORY, config);
@@ -175,6 +177,7 @@ public class SolrIndexWriter extends Ind
/**
* @deprecated
*/
+ @Deprecated
public SolrIndexWriter(String name, String path, boolean create, IndexSchema schema) throws IOException {
super(getDirectory(path, null), schema.getAnalyzer(), create, MaxFieldLength.LIMITED);
init(name, schema, null);
@@ -183,6 +186,7 @@ public class SolrIndexWriter extends Ind
/**
* @deprecated
*/
+ @Deprecated
public SolrIndexWriter(String name, String path, boolean create, IndexSchema schema, SolrIndexConfig config) throws IOException {
super(getDirectory(path, config), schema.getAnalyzer(), create, MaxFieldLength.LIMITED);
init(name, schema, config);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitSetIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitSetIterator.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitSetIterator.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitSetIterator.java Mon Oct 4 02:24:12 2010
@@ -26,6 +26,7 @@ import org.apache.lucene.util.OpenBitSet
* @deprecated Use {@link org.apache.lucene.util.OpenBitSetIterator} instead.
* @version $Id$
*/
+@Deprecated
public class BitSetIterator {
// The General Idea: instead of having an array per byte that has
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitUtil.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitUtil.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BitUtil.java Mon Oct 4 02:24:12 2010
@@ -21,6 +21,7 @@ package org.apache.solr.util;
* @deprecated Use {@link org.apache.lucene.util.BitUtil} directly
* @version $Id$
*/
+@Deprecated
public class BitUtil extends org.apache.lucene.util.BitUtil {
// just inherit for backwards-compatibility reasons
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java Mon Oct 4 02:24:12 2010
@@ -35,47 +35,56 @@ public class DisMaxParams extends Common
/** query and init param for filtering query
* @deprecated use SolrParams.FQ or SolrPluginUtils.parseFilterQueries
*/
+ @Deprecated
public static String FQ = "fq";
/**
* the default tie breaker to use in DisjunctionMaxQueries
* @deprecated - use explicit default with SolrParams.getFloat
*/
+ @Deprecated
public float tiebreaker = 0.0f;
/**
* the default query fields to be used
* @deprecated - use explicit default with SolrParams.get
*/
+ @Deprecated
public String qf = null;
/**
* the default phrase boosting fields to be used
* @deprecated - use explicit default with SolrParams.get
*/
+ @Deprecated
public String pf = null;
/**
* the default min should match to be used
* @deprecated - use explicit default with SolrParams.get
*/
+ @Deprecated
public String mm = "100%";
/**
* the default phrase slop to be used
* @deprecated - use explicit default with SolrParams.getInt
*/
+ @Deprecated
public int pslop = 0;
/**
* the default boosting query to be used
* @deprecated - use explicit default with SolrParams.get
*/
+ @Deprecated
public String bq = null;
/**
* the default boosting functions to be used
* @deprecated - use explicit default with SolrParams.get
*/
+ @Deprecated
public String bf = null;
/**
* the default filtering query to be used
* @deprecated - use explicit default with SolrParams.get
*/
+ @Deprecated
public String fq = null;
@@ -94,6 +103,7 @@ public class DisMaxParams extends Common
* </p>
* @deprecated use SolrParams.toSolrParams
*/
+ @Deprecated
public void setValues(NamedList args) {
super.setValues(args);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/HighlightingUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/HighlightingUtils.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/HighlightingUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/HighlightingUtils.java Mon Oct 4 02:24:12 2010
@@ -51,6 +51,7 @@ import org.apache.lucene.search.highligh
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter
*/
+@Deprecated
public class HighlightingUtils implements HighlightParams {
static SolrParams DEFAULTS = null;
@@ -76,6 +77,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter#isHighlightingEnabled
*/
+ @Deprecated
public static boolean isHighlightingEnabled(SolrQueryRequest request) {
return HIGHLIGHTER.isHighlightingEnabled(getParams(request));
}
@@ -84,6 +86,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter
*/
+ @Deprecated
public static Highlighter getHighlighter(Query query, String fieldName, SolrQueryRequest request) {
return HIGHLIGHTER.getHighlighterX(query, fieldName, request);
}
@@ -92,6 +95,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter#getHighlightFields
*/
+ @Deprecated
public static String[] getHighlightFields(Query query, SolrQueryRequest request, String[] defaultFields) {
return HIGHLIGHTER.getHighlightFields(query, request, defaultFields);
}
@@ -100,6 +104,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter
*/
+ @Deprecated
public static int getMaxSnippets(String fieldName, SolrQueryRequest request) {
return HIGHLIGHTER.getMaxSnippetsX(fieldName, request);
}
@@ -108,6 +113,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter
*/
+ @Deprecated
public static Formatter getFormatter(String fieldName, SolrQueryRequest request) {
return HIGHLIGHTER.getFormatterX(fieldName, request);
}
@@ -116,6 +122,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter
*/
+ @Deprecated
public static Fragmenter getFragmenter(String fieldName, SolrQueryRequest request) {
return HIGHLIGHTER.getFragmenterX(fieldName, request);
}
@@ -124,7 +131,7 @@ public class HighlightingUtils implement
* @deprecated use DefaultSolrHighlighter
* @see DefaultSolrHighlighter#doHighlighting
*/
- @SuppressWarnings("unchecked")
+ @Deprecated @SuppressWarnings("unchecked")
public static NamedList doHighlighting(DocList docs, Query query, SolrQueryRequest req, String[] defaultFields) throws IOException {
return HIGHLIGHTER.doHighlighting(docs, query, req, defaultFields);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/OpenBitSet.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/OpenBitSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/OpenBitSet.java Mon Oct 4 02:24:12 2010
@@ -73,7 +73,7 @@ Test system: AMD Opteron, 64 bit linux,
@deprecated Use {@link org.apache.lucene.util.OpenBitSet} directly.
* @version $Id$
*/
-
+@Deprecated
public class OpenBitSet extends org.apache.lucene.util.OpenBitSet implements Cloneable, Serializable {
/** Constructs an OpenBitSet large enough to hold numBits.
*
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java Mon Oct 4 02:24:12 2010
@@ -126,6 +126,7 @@ public class SolrPluginUtils {
* Returns the param, or the default if it's empty or not specified.
* @deprecated use SolrParam.get(String,String)
*/
+ @Deprecated
public static String getParam(SolrQueryRequest req,
String param, String def) {
@@ -143,6 +144,7 @@ public class SolrPluginUtils {
* there or if it's not a number.
* @deprecated use SolrParam.getFloat(String,float)
*/
+ @Deprecated
public static Number getNumberParam(SolrQueryRequest req,
String param, Number def) {
@@ -164,6 +166,7 @@ public class SolrPluginUtils {
* any other non-empty string is true.
* @deprecated use SolrParam.getBool(String,boolean)
*/
+ @Deprecated
public static boolean getBooleanParam(SolrQueryRequest req,
String param, boolean def) {
String v = req.getParam(param);
@@ -305,6 +308,7 @@ public class SolrPluginUtils {
* @param results the main result set of the response
* @deprecated Use doStandardDebug(SolrQueryRequest,String,Query,DocList) with setDefaults
*/
+ @Deprecated
public static NamedList doStandardDebug(SolrQueryRequest req,
String userQuery,
Query query,
@@ -532,6 +536,7 @@ public class SolrPluginUtils {
* @see #parseFieldBoosts
* @deprecated
*/
+ @Deprecated
public static List<Query> parseFuncs(IndexSchema s, String in)
throws ParseException {
@@ -581,7 +586,7 @@ public class SolrPluginUtils {
public static void setMinShouldMatch(BooleanQuery q, String spec) {
int optionalClauses = 0;
- for (BooleanClause c : (List<BooleanClause>)q.clauses()) {
+ for (BooleanClause c : q.clauses()) {
if (c.getOccur() == Occur.SHOULD) {
optionalClauses++;
}
@@ -648,7 +653,7 @@ public class SolrPluginUtils {
*/
public static void flattenBooleanQuery(BooleanQuery to, BooleanQuery from) {
- for (BooleanClause clause : (List<BooleanClause>)from.clauses()) {
+ for (BooleanClause clause : from.clauses()) {
Query cq = clause.getQuery();
cq.setBoost(cq.getBoost() * from.getBoost());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TestHarness.java?rev=1004086&r1=1004085&r2=1004086&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TestHarness.java Mon Oct 4 02:24:12 2010
@@ -409,6 +409,7 @@ public class TestHarness {
* to a StringBuffer.
* @deprecated see {@link #appendSimpleDoc(StringBuilder, String...)}
*/
+ @Deprecated
public void appendSimpleDoc(StringBuffer buf, String... fieldsAndValues)
throws IOException {
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 02:24:12 2010
@@ -1,3 +1,3 @@
/lucene/dev/branches/preflexfixes/solr/src/maven/solr-core-pom.xml.template:967125-979432
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,96037
4,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,995376,995557,
995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,96037
4,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,995376,995557,
995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082
/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091