You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/12/16 21:49:07 UTC
svn commit: r1774664 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src:
main/java/org/apache/uima/cas/FeaturePath.java
main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
test/java/org/apache/uima/cas/impl/FeaturePathTest.java
Author: schor
Date: Fri Dec 16 21:49:07 2016
New Revision: 1774664
URL: http://svn.apache.org/viewvc?rev=1774664&view=rev
Log:
revert an api rename to reduce problems with backwards compatibility
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java?rev=1774664&r1=1774663&r2=1774664&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeaturePath.java Fri Dec 16 21:49:07 2016
@@ -176,7 +176,7 @@ public interface FeaturePath {
* @return Returns the type class of the feature path or null if the feature
* path is not set
*/
- public TypeClass getTypeClass(FeatureStructure fs);
+ public TypeClass getTypClass(FeatureStructure fs);
/**
* Returns the feature path as string.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java?rev=1774664&r1=1774663&r2=1774664&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java Fri Dec 16 21:49:07 2016
@@ -395,7 +395,7 @@ class FeaturePathImpl implements Feature
* FeatureStructure)
*/
@Override
- public TypeClass getTypeClass(FeatureStructure fs) {
+ public TypeClass getTypClass(FeatureStructure fs) {
TypeImpl type = (TypeImpl) getType(fs);
return (type == null) ? null : TypeClass.values()[TypeSystemImpl.getTypeClass(type)];
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java?rev=1774664&r1=1774663&r2=1774664&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java Fri Dec 16 21:49:07 2016
@@ -71,7 +71,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("TestString", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(stringFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -91,7 +91,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("12", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_SHORT, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_SHORT, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(shortFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -111,7 +111,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("1.12", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_FLOAT, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FLOAT, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(floatFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -131,7 +131,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("100.5", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_DOUBLE, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_DOUBLE, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(doubleFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -151,7 +151,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("2000", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_LONG, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_LONG, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(longFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -171,7 +171,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("5", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_INT, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_INT, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(intFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -191,7 +191,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("true", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_BOOLEAN, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_BOOLEAN, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(boolFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -211,7 +211,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("127", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_BYTE, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_BYTE, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(byteFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -238,7 +238,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(cas.getDocumentAnnotation().getType(), featurePath
.getType(cas.getDocumentAnnotation()));
@@ -254,7 +254,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(null, featurePath.getTypeClass (cas.getDocumentAnnotation()));
+ assertEquals(null, featurePath.getTypClass (cas.getDocumentAnnotation()));
assertEquals(null, featurePath.getType (cas.getDocumentAnnotation()));
assertEquals(null, featurePath.getValueAsString(cas.getDocumentAnnotation()));
assertEquals(null, featurePath.getFSValue(cas.getDocumentAnnotation()));
@@ -272,7 +272,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(stringFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -287,7 +287,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(stringFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -298,7 +298,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(cas.getDocumentAnnotation().getType(), featurePath
.getType(cas.getDocumentAnnotation()));
@@ -430,7 +430,7 @@ public class FeaturePathTest extends Tes
llc.ll_getFSRef(cas.getDocumentAnnotation()),
llc));
assertEquals(cas.getDocumentAnnotation().getType(), featurePath.getType(cas.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypeClass(cas.getDocumentAnnotation()));
+ assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypClass(cas.getDocumentAnnotation()));
// test fsId() on root
path = "/:fsId()";
@@ -589,7 +589,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize("/refFeature:coveredText()");
featurePath.typeInit(cas.getDocumentAnnotation().getType());
assertEquals(null, featurePath.getValueAsString(null));
- assertEquals(null, featurePath.getTypeClass(null));
+ assertEquals(null, featurePath.getTypClass(null));
assertEquals(null, featurePath.getType(null));
}
@@ -717,7 +717,7 @@ public class FeaturePathTest extends Tes
assertEquals("Test0,Test1,Test2,null", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
assertEquals(TypeClass.TYPE_CLASS_STRINGARRAY, featurePath
- .getTypeClass(cas.getDocumentAnnotation()));
+ .getTypClass(cas.getDocumentAnnotation()));
assertEquals(stringArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -737,7 +737,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("0,2,54", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_SHORTARRAY, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_SHORTARRAY, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(shortArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -758,7 +758,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("1.4,0.0,3434.34", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_FLOATARRAY, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FLOATARRAY, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(floatArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -781,7 +781,7 @@ public class FeaturePathTest extends Tes
assertEquals("1.4,0.0,3434.34", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
assertEquals(TypeClass.TYPE_CLASS_DOUBLEARRAY, featurePath
- .getTypeClass(cas.getDocumentAnnotation()));
+ .getTypClass(cas.getDocumentAnnotation()));
assertEquals(doubleArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -801,7 +801,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("14,0,343434", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_LONGARRAY, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_LONGARRAY, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(longArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -822,7 +822,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("14,0,343", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_INTARRAY, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_INTARRAY, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(intArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -845,7 +845,7 @@ public class FeaturePathTest extends Tes
assertEquals("true,false,true", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
assertEquals(TypeClass.TYPE_CLASS_BOOLEANARRAY, featurePath
- .getTypeClass(cas.getDocumentAnnotation()));
+ .getTypClass(cas.getDocumentAnnotation()));
assertEquals(booleanArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -865,7 +865,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("23,47,11", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_BYTEARRAY, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_BYTEARRAY, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(byteArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -886,7 +886,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertTrue(featurePath.getValueAsString(cas.getDocumentAnnotation())
.indexOf("11") > 0);
- assertEquals(TypeClass.TYPE_CLASS_FSARRAY, featurePath.getTypeClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FSARRAY, featurePath.getTypClass(cas
.getDocumentAnnotation()));
assertEquals(fsArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
Re: svn commit: r1774664 - revert an api rename to reduce problems with backwards compatibility
Posted by Richard Eckart de Castilho <re...@apache.org>.
Hi,
having a typo in the API for backwards compatibility? Wouldn't it be more sensible to add a second deprecated method with the typo in the name and have a properly named one as well?
Best,
-- Richard
> On 16.12.2016, at 22:49, schor@apache.org wrote:
>
> revert an api rename to reduce problems with backwards compatibility
>
> - public TypeClass getTypeClass(FeatureStructure fs);
> + public TypeClass getTypClass(FeatureStructure fs);