You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2010/06/08 13:27:55 UTC
svn commit: r952616 - in /lucene/dev/trunk/lucene: ./
src/java/org/apache/lucene/analysis/
src/java/org/apache/lucene/analysis/tokenattributes/
src/java/org/apache/lucene/index/ src/test/org/apache/lucene/analysis/
src/test/org/apache/lucene/analysis/t...
Author: uschindler
Date: Tue Jun 8 11:27:55 2010
New Revision: 952616
URL: http://svn.apache.org/viewvc?rev=952616&view=rev
Log:
LUCENE-2484: Remove deprecated TermAttribute. Use CharTermAttribute and TermToBytesRefAttribute instead
Removed:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttribute.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestTermAttributeImpl.java
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Token.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestToken.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Tue Jun 8 11:27:55 2010
@@ -84,6 +84,9 @@ Changes in backwards compatibility polic
* LUCENE-2480: Though not a change in backwards compatibility policy, pre-3.0
indexes are no longer supported. You should upgrade to 3.x first, then run
optimize(), or reindex. (Shai Erera, Earwin Burrfoot)
+
+* LUCENE-2484: Removed deprecated TermAttribute. Use CharTermAttribute
+ and TermToBytesRefAttribute instead. (Uwe Schindler)
Changes in runtime behavior
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java Tue Jun 8 11:27:55 2010
@@ -117,15 +117,12 @@ public final class NumericTokenStream ex
this.delegate = delegate;
}
- @Override @SuppressWarnings("deprecation")
+ @Override
public AttributeImpl createAttributeInstance(Class<? extends Attribute> attClass) {
if (attClass == NumericTermAttribute.class)
return new NumericTermAttributeImpl(ts);
- if (attClass.isAssignableFrom(CharTermAttribute.class) ||
- // TODO: remove in 4.0 (deprecated class, also remove the suppress above):
- attClass.isAssignableFrom(org.apache.lucene.analysis.tokenattributes.TermAttribute.class)
- )
- throw new IllegalArgumentException("NumericTokenStream does not support CharTermAttribute/TermAttribute.");
+ if (CharTermAttribute.class.isAssignableFrom(attClass))
+ throw new IllegalArgumentException("NumericTokenStream does not support CharTermAttribute.");
return delegate.createAttributeInstance(attClass);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Token.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Token.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Token.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Token.java Tue Jun 8 11:27:55 2010
@@ -17,12 +17,11 @@ package org.apache.lucene.analysis;
* limitations under the License.
*/
-import org.apache.lucene.analysis.tokenattributes.TermAttributeImpl;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttributeImpl;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.TermPositions; // for javadoc
@@ -119,8 +118,7 @@ import org.apache.lucene.util.AttributeI
</p>
@see org.apache.lucene.index.Payload
*/
-// TODO: change superclass to CharTermAttribute in 4.0! Maybe deprecate the whole class?
-public class Token extends TermAttributeImpl
+public class Token extends CharTermAttributeImpl
implements TypeAttribute, PositionIncrementAttribute,
FlagsAttribute, OffsetAttribute, PayloadAttribute {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java Tue Jun 8 11:27:55 2010
@@ -29,17 +29,11 @@ import org.apache.lucene.util.UnicodeUti
/**
* The term text of a Token.
*/
-public class CharTermAttributeImpl extends AttributeImpl implements CharTermAttribute, TermAttribute, TermToBytesRefAttribute, Cloneable, Serializable {
+public class CharTermAttributeImpl extends AttributeImpl implements CharTermAttribute, TermToBytesRefAttribute, Cloneable, Serializable {
private static int MIN_BUFFER_SIZE = 10;
private char[] termBuffer = new char[ArrayUtil.oversize(MIN_BUFFER_SIZE, RamUsageEstimator.NUM_BYTES_CHAR)];
private int termLength = 0;
-
- @Deprecated
- public String term() {
- // don't delegate to toString() here!
- return new String(termBuffer, 0, termLength);
- }
public final void copyBuffer(char[] buffer, int offset, int length) {
growTermBuffer(length);
@@ -47,36 +41,9 @@ public class CharTermAttributeImpl exten
termLength = length;
}
- @Deprecated
- public void setTermBuffer(char[] buffer, int offset, int length) {
- copyBuffer(buffer, offset, length);
- }
-
- @Deprecated
- public void setTermBuffer(String buffer) {
- int length = buffer.length();
- growTermBuffer(length);
- buffer.getChars(0, length, termBuffer, 0);
- termLength = length;
- }
-
- @Deprecated
- public void setTermBuffer(String buffer, int offset, int length) {
- assert offset <= buffer.length();
- assert offset + length <= buffer.length();
- growTermBuffer(length);
- buffer.getChars(offset, offset + length, termBuffer, 0);
- termLength = length;
- }
-
public final char[] buffer() {
return termBuffer;
}
-
- @Deprecated
- public char[] termBuffer() {
- return termBuffer;
- }
public final char[] resizeBuffer(int newSize) {
if(termBuffer.length < newSize){
@@ -88,11 +55,6 @@ public class CharTermAttributeImpl exten
}
return termBuffer;
}
-
- @Deprecated
- public char[] resizeTermBuffer(int newSize) {
- return resizeBuffer(newSize);
- }
private void growTermBuffer(int newSize) {
if(termBuffer.length < newSize){
@@ -101,11 +63,6 @@ public class CharTermAttributeImpl exten
termBuffer = new char[ArrayUtil.oversize(newSize, RamUsageEstimator.NUM_BYTES_CHAR)];
}
}
-
- @Deprecated
- public int termLength() {
- return termLength;
- }
public final CharTermAttribute setLength(int length) {
if (length > termBuffer.length)
@@ -119,11 +76,6 @@ public class CharTermAttributeImpl exten
return this;
}
- @Deprecated
- public void setTermLength(int length) {
- setLength(length);
- }
-
// *** TermToBytesRefAttribute interface ***
public final int toBytesRef(BytesRef target) {
return UnicodeUtil.UTF16toUTF8WithHash(termBuffer, 0, termLength, target);
@@ -292,13 +244,8 @@ public class CharTermAttributeImpl exten
@Override
public void copyTo(AttributeImpl target) {
- if (target instanceof CharTermAttribute) {
- CharTermAttribute t = (CharTermAttribute) target;
- t.copyBuffer(termBuffer, 0, termLength);
- } else {
- TermAttribute t = (TermAttribute) target;
- t.setTermBuffer(termBuffer, 0, termLength);
- }
+ CharTermAttribute t = (CharTermAttribute) target;
+ t.copyBuffer(termBuffer, 0, termLength);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java Tue Jun 8 11:27:55 2010
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
-import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.util.BytesRef;
@@ -290,14 +289,7 @@ final class TermsHashPerField extends In
@Override
void start(Fieldable f) {
- if (fieldState.attributeSource.hasAttribute(TermToBytesRefAttribute.class)) {
- termAtt = fieldState.attributeSource.getAttribute(TermToBytesRefAttribute.class);
- } else if (fieldState.attributeSource.hasAttribute(TermAttribute.class)) {
- perThread.legacyTermAttributeWrapper.setTermAttribute(fieldState.attributeSource.getAttribute(TermAttribute.class));
- termAtt = perThread.legacyTermAttributeWrapper;
- } else {
- throw new IllegalArgumentException("Could not find a term attribute (that implements TermToBytesRefAttribute) in the TokenStream");
- }
+ termAtt = fieldState.attributeSource.getAttribute(TermToBytesRefAttribute.class);
consumer.start(f);
if (nextPerField != null) {
nextPerField.start(f);
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java Tue Jun 8 11:27:55 2010
@@ -19,8 +19,6 @@ package org.apache.lucene.index;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.UnicodeUtil;
-import org.apache.lucene.analysis.tokenattributes.TermAttribute;
-import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import java.io.IOException;
@@ -42,23 +40,6 @@ final class TermsHashPerThread extends I
// Used by perField:
final BytesRef utf8 = new BytesRef(10);
-
- final LegacyTermAttributeWrapper legacyTermAttributeWrapper = new LegacyTermAttributeWrapper();
-
- /** This class is used to wrap a legacy TermAttribute without support for {@link TermToBytesRefAttribute}. */
- @Deprecated
- static class LegacyTermAttributeWrapper implements TermToBytesRefAttribute {
- private TermAttribute termAtt = null;
-
- void setTermAttribute(TermAttribute termAtt) {
- this.termAtt = termAtt;
- }
-
- public int toBytesRef(BytesRef target) {
- assert target.bytes != null : "target byteref must be != null, because utf8 is used here";
- return UnicodeUtil.UTF16toUTF8WithHash(termAtt.termBuffer(), 0, termAtt.termLength(), target);
- }
- }
public TermsHashPerThread(DocInverterPerThread docInverterPerThread, final TermsHash termsHash, final TermsHash nextTermsHash, final TermsHashPerThread primaryPerThread) {
docState = docInverterPerThread.docState;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java Tue Jun 8 11:27:55 2010
@@ -21,6 +21,8 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttributeImpl;
public class TestNumericTokenStream extends BaseTokenStreamTestCase {
@@ -91,4 +93,23 @@ public class TestNumericTokenStream exte
}
}
+ public static interface TestAttribute extends CharTermAttribute {}
+ public static class TestAttributeImpl extends CharTermAttributeImpl implements TestAttribute {}
+
+ public void testCTA() throws Exception {
+ final NumericTokenStream stream=new NumericTokenStream();
+ try {
+ stream.addAttribute(CharTermAttribute.class);
+ fail("Succeeded to add CharTermAttribute.");
+ } catch (IllegalArgumentException iae) {
+ assertTrue(iae.getMessage().startsWith("NumericTokenStream does not support"));
+ }
+ try {
+ stream.addAttribute(TestAttribute.class);
+ fail("Succeeded to add TestAttribute.");
+ } catch (IllegalArgumentException iae) {
+ assertTrue(iae.getMessage().startsWith("NumericTokenStream does not support"));
+ }
+ }
+
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestToken.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestToken.java?rev=952616&r1=952615&r2=952616&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestToken.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestToken.java Tue Jun 8 11:27:55 2010
@@ -34,17 +34,17 @@ public class TestToken extends LuceneTes
public void testCtor() throws Exception {
Token t = new Token();
char[] content = "hello".toCharArray();
- t.setTermBuffer(content, 0, content.length);
- assertNotSame(t.termBuffer(), content);
+ t.copyBuffer(content, 0, content.length);
+ assertNotSame(t.buffer(), content);
assertEquals(0, t.startOffset());
assertEquals(0, t.endOffset());
- assertEquals("hello", t.term());
+ assertEquals("hello", t.toString());
assertEquals("word", t.type());
assertEquals(0, t.getFlags());
t = new Token(6, 22);
- t.setTermBuffer(content, 0, content.length);
- assertEquals("hello", t.term());
+ t.copyBuffer(content, 0, content.length);
+ assertEquals("hello", t.toString());
assertEquals("hello", t.toString());
assertEquals(6, t.startOffset());
assertEquals(22, t.endOffset());
@@ -52,8 +52,8 @@ public class TestToken extends LuceneTes
assertEquals(0, t.getFlags());
t = new Token(6, 22, 7);
- t.setTermBuffer(content, 0, content.length);
- assertEquals("hello", t.term());
+ t.copyBuffer(content, 0, content.length);
+ assertEquals("hello", t.toString());
assertEquals("hello", t.toString());
assertEquals(6, t.startOffset());
assertEquals(22, t.endOffset());
@@ -61,8 +61,8 @@ public class TestToken extends LuceneTes
assertEquals(7, t.getFlags());
t = new Token(6, 22, "junk");
- t.setTermBuffer(content, 0, content.length);
- assertEquals("hello", t.term());
+ t.copyBuffer(content, 0, content.length);
+ assertEquals("hello", t.toString());
assertEquals("hello", t.toString());
assertEquals(6, t.startOffset());
assertEquals(22, t.endOffset());
@@ -73,12 +73,12 @@ public class TestToken extends LuceneTes
public void testResize() {
Token t = new Token();
char[] content = "hello".toCharArray();
- t.setTermBuffer(content, 0, content.length);
+ t.copyBuffer(content, 0, content.length);
for (int i = 0; i < 2000; i++)
{
- t.resizeTermBuffer(i);
- assertTrue(i <= t.termBuffer().length);
- assertEquals("hello", t.term());
+ t.resizeBuffer(i);
+ assertTrue(i <= t.buffer().length);
+ assertEquals("hello", t.toString());
}
}
@@ -88,86 +88,73 @@ public class TestToken extends LuceneTes
for (int i = 0; i < 20; i++)
{
char[] content = buf.toString().toCharArray();
- t.setTermBuffer(content, 0, content.length);
- assertEquals(buf.length(), t.termLength());
- assertEquals(buf.toString(), t.term());
+ t.copyBuffer(content, 0, content.length);
+ assertEquals(buf.length(), t.length());
+ assertEquals(buf.toString(), t.toString());
buf.append(buf.toString());
}
- assertEquals(1048576, t.termLength());
-
- // now as a string, first variant
- t = new Token();
- buf = new StringBuilder("ab");
- for (int i = 0; i < 20; i++)
- {
- String content = buf.toString();
- t.setTermBuffer(content, 0, content.length());
- assertEquals(content.length(), t.termLength());
- assertEquals(content, t.term());
- buf.append(content);
- }
- assertEquals(1048576, t.termLength());
+ assertEquals(1048576, t.length());
// now as a string, second variant
t = new Token();
buf = new StringBuilder("ab");
for (int i = 0; i < 20; i++)
{
+ t.setEmpty().append(buf);
String content = buf.toString();
- t.setTermBuffer(content);
- assertEquals(content.length(), t.termLength());
- assertEquals(content, t.term());
+ assertEquals(content.length(), t.length());
+ assertEquals(content, t.toString());
buf.append(content);
}
- assertEquals(1048576, t.termLength());
+ assertEquals(1048576, t.length());
// Test for slow growth to a long term
t = new Token();
buf = new StringBuilder("a");
for (int i = 0; i < 20000; i++)
{
+ t.setEmpty().append(buf);
String content = buf.toString();
- t.setTermBuffer(content);
- assertEquals(content.length(), t.termLength());
- assertEquals(content, t.term());
+ assertEquals(content.length(), t.length());
+ assertEquals(content, t.toString());
buf.append("a");
}
- assertEquals(20000, t.termLength());
+ assertEquals(20000, t.length());
// Test for slow growth to a long term
t = new Token();
buf = new StringBuilder("a");
for (int i = 0; i < 20000; i++)
{
+ t.setEmpty().append(buf);
String content = buf.toString();
- t.setTermBuffer(content);
- assertEquals(content.length(), t.termLength());
- assertEquals(content, t.term());
+ assertEquals(content.length(), t.length());
+ assertEquals(content, t.toString());
buf.append("a");
}
- assertEquals(20000, t.termLength());
+ assertEquals(20000, t.length());
}
public void testToString() throws Exception {
char[] b = {'a', 'l', 'o', 'h', 'a'};
Token t = new Token("", 0, 5);
- t.setTermBuffer(b, 0, 5);
+ t.copyBuffer(b, 0, 5);
assertEquals("aloha", t.toString());
- t.setTermBuffer("hi there");
+ t.setEmpty().append("hi there");
assertEquals("hi there", t.toString());
}
public void testTermBufferEquals() throws Exception {
Token t1a = new Token();
char[] content1a = "hello".toCharArray();
- t1a.setTermBuffer(content1a, 0, 5);
+ t1a.copyBuffer(content1a, 0, 5);
Token t1b = new Token();
char[] content1b = "hello".toCharArray();
- t1b.setTermBuffer(content1b, 0, 5);
+ t1b.copyBuffer(content1b, 0, 5);
Token t2 = new Token();
char[] content2 = "hello2".toCharArray();
- t2.setTermBuffer(content2, 0, 6);
+ t2.copyBuffer(content2, 0, 6);
assertTrue(t1a.equals(t1b));
assertFalse(t1a.equals(t2));
assertFalse(t2.equals(t1b));
@@ -175,27 +162,27 @@ public class TestToken extends LuceneTes
public void testMixedStringArray() throws Exception {
Token t = new Token("hello", 0, 5);
- assertEquals(t.termLength(), 5);
- assertEquals(t.term(), "hello");
- t.setTermBuffer("hello2");
- assertEquals(t.termLength(), 6);
- assertEquals(t.term(), "hello2");
- t.setTermBuffer("hello3".toCharArray(), 0, 6);
- assertEquals(t.term(), "hello3");
+ assertEquals(t.length(), 5);
+ assertEquals(t.toString(), "hello");
+ t.setEmpty().append("hello2");
+ assertEquals(t.length(), 6);
+ assertEquals(t.toString(), "hello2");
+ t.copyBuffer("hello3".toCharArray(), 0, 6);
+ assertEquals(t.toString(), "hello3");
- char[] buffer = t.termBuffer();
+ char[] buffer = t.buffer();
buffer[1] = 'o';
- assertEquals(t.term(), "hollo3");
+ assertEquals(t.toString(), "hollo3");
}
public void testClone() throws Exception {
Token t = new Token(0, 5);
char[] content = "hello".toCharArray();
- t.setTermBuffer(content, 0, 5);
- char[] buf = t.termBuffer();
+ t.copyBuffer(content, 0, 5);
+ char[] buf = t.buffer();
Token copy = (Token) TestSimpleAttributeImpls.assertCloneIsEqual(t);
- assertEquals(t.term(), copy.term());
- assertNotSame(buf, copy.termBuffer());
+ assertEquals(t.toString(), copy.toString());
+ assertNotSame(buf, copy.buffer());
Payload pl = new Payload(new byte[]{1,2,3,4});
t.setPayload(pl);
@@ -207,16 +194,16 @@ public class TestToken extends LuceneTes
public void testCopyTo() throws Exception {
Token t = new Token();
Token copy = (Token) TestSimpleAttributeImpls.assertCopyIsEqual(t);
- assertEquals("", t.term());
- assertEquals("", copy.term());
+ assertEquals("", t.toString());
+ assertEquals("", copy.toString());
t = new Token(0, 5);
char[] content = "hello".toCharArray();
- t.setTermBuffer(content, 0, 5);
- char[] buf = t.termBuffer();
+ t.copyBuffer(content, 0, 5);
+ char[] buf = t.buffer();
copy = (Token) TestSimpleAttributeImpls.assertCopyIsEqual(t);
- assertEquals(t.term(), copy.term());
- assertNotSame(buf, copy.termBuffer());
+ assertEquals(t.toString(), copy.toString());
+ assertNotSame(buf, copy.buffer());
Payload pl = new Payload(new byte[]{1,2,3,4});
t.setPayload(pl);
@@ -241,7 +228,7 @@ public class TestToken extends LuceneTes
public void testTokenAttributeFactory() throws Exception {
TokenStream ts = new MockTokenizer(Token.TOKEN_ATTRIBUTE_FACTORY, new StringReader("foo bar"), MockTokenizer.WHITESPACE, false);
- assertTrue("TypeAttribute is not implemented by SenselessAttributeImpl",
+ assertTrue("SenselessAttribute is not implemented by SenselessAttributeImpl",
ts.addAttribute(SenselessAttribute.class) instanceof SenselessAttributeImpl);
assertTrue("CharTermAttribute is not implemented by Token",