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 2018/12/03 22:00:05 UTC
svn commit: r1848108 [2/5] - in /uima/uv3/uimaj-v3/trunk:
PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/
jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/
jcasgen-maven-plugin/src/test/java/org/apache/uima/tool...
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java Mon Dec 3 22:00:02 2018
@@ -66,7 +66,7 @@ public class ConstraintFactoryImpl exten
@Override
public FSMatchConstraint embedConstraint(FeaturePath featPath,
FSConstraint constraint) {
- ArrayList<String> path = new ArrayList<String>();
+ ArrayList<String> path = new ArrayList<>();
for (int i = 0; i < featPath.size(); i++) {
path.add(featPath.getFeature(i).getShortName());
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java Mon Dec 3 22:00:02 2018
@@ -411,7 +411,7 @@ public class DebugFSLogicalStructure {
public static IndexInfo[] getIndexes(CAS cas) {
Iterator<String> it = cas.getIndexRepository().getLabels();
- List<IndexInfo> ll = new ArrayList<IndexInfo>();
+ List<IndexInfo> ll = new ArrayList<>();
while (it.hasNext()) {
ll.add(new IndexInfo(cas, it.next()));
}
@@ -421,7 +421,7 @@ public class DebugFSLogicalStructure {
public static ViewInfo[] getOtherViews(CAS cas) {
Iterator<SofaFS> sofaIt = cas.getSofaIterator();
- List<ViewInfo> r = new ArrayList<ViewInfo>();
+ List<ViewInfo> r = new ArrayList<>();
while (sofaIt.hasNext()) {
SofaFS item = sofaIt.next();
CAS oCas = cas.getView(item);
@@ -437,7 +437,7 @@ public class DebugFSLogicalStructure {
@SuppressWarnings("unchecked")
private static <T> T[] iteratorToArray(Iterator<? extends T> it, Class<T> c) {
- ArrayList<T> items = new ArrayList<T>();
+ ArrayList<T> items = new ArrayList<>();
while (it.hasNext()) {
items.add(it.next());
}
@@ -445,13 +445,13 @@ public class DebugFSLogicalStructure {
}
public static Object floatListToArray(FeatureStructure fs) {
- List<Float> list = new ArrayList<Float>();
+ List<Float> list = new ArrayList<>();
TypeSystem ts = fs.getCAS().getTypeSystem();
Type emptyFSList = ts.getType("uima.cas.EmptyFloatList");
Feature headFeature = ts.getFeatureByFullName("uima.cas.NonEmptyFloatList:head");
Feature tailFeature = ts.getFeatureByFullName("uima.cas.NonEmptyFloatList:tail");
- Set<FeatureStructure> alreadySeen = new HashSet<FeatureStructure>();
+ Set<FeatureStructure> alreadySeen = new HashSet<>();
FeatureStructure nextFs;
for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) {
list.add(Float.valueOf(currentFs.getFloatValue(headFeature)));
@@ -469,13 +469,13 @@ public class DebugFSLogicalStructure {
}
public static Object integerListToArray(FeatureStructure fs) {
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
TypeSystem ts = fs.getCAS().getTypeSystem();
Type emptyFSList = ts.getType("uima.cas.EmptyIntegerList");
Feature headFeature = ts.getFeatureByFullName("uima.cas.NonEmptyIntegerList:head");
Feature tailFeature = ts.getFeatureByFullName("uima.cas.NonEmptyIntegerList:tail");
- Set<FeatureStructure> alreadySeen = new HashSet<FeatureStructure>();
+ Set<FeatureStructure> alreadySeen = new HashSet<>();
FeatureStructure nextFs;
for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) {
list.add(Integer.valueOf(currentFs.getIntValue(headFeature)));
@@ -493,13 +493,13 @@ public class DebugFSLogicalStructure {
}
public static Object stringListToArray(FeatureStructure fs) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
TypeSystem ts = fs.getCAS().getTypeSystem();
Type emptyFSList = ts.getType("uima.cas.EmptyStringList");
Feature headFeature = ts.getFeatureByFullName("uima.cas.NonEmptyStringList:head");
Feature tailFeature = ts.getFeatureByFullName("uima.cas.NonEmptyStringList:tail");
- Set<FeatureStructure> alreadySeen = new HashSet<FeatureStructure>();
+ Set<FeatureStructure> alreadySeen = new HashSet<>();
FeatureStructure nextFs;
for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) {
list.add(currentFs.getStringValue(headFeature));
@@ -513,13 +513,13 @@ public class DebugFSLogicalStructure {
}
public static Object fsListToArray(FeatureStructure fs) {
- List<FeatureStructure> list = new ArrayList<FeatureStructure>();
+ List<FeatureStructure> list = new ArrayList<>();
TypeSystem ts = fs.getCAS().getTypeSystem();
Type emptyFSList = ts.getType("uima.cas.EmptyFSList");
Feature headFeature = ts.getFeatureByFullName("uima.cas.NonEmptyFSList:head");
Feature tailFeature = ts.getFeatureByFullName("uima.cas.NonEmptyFSList:tail");
- Set<FeatureStructure> alreadySeen = new HashSet<FeatureStructure>();
+ Set<FeatureStructure> alreadySeen = new HashSet<>();
FeatureStructure nextFs;
for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) {
list.add(currentFs.getFeatureValue(headFeature));
@@ -542,4 +542,4 @@ public class DebugFSLogicalStructure {
array[list.size()] = "... loop in list";
return array;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java Mon Dec 3 22:00:02 2018
@@ -1262,7 +1262,7 @@ public abstract class FSClassRegistry {
private static void add2errors(ThreadLocal<List<ErrorReport>> errors, Exception e, boolean doThrow) {
List<ErrorReport> es = errors.get();
if (es == null) {
- es = new ArrayList<ErrorReport>();
+ es = new ArrayList<>();
errors.set(es);
}
es.add(new ErrorReport(e, doThrow));
@@ -1477,4 +1477,4 @@ public abstract class FSClassRegistry {
return lookup;
}
}
-
\ No newline at end of file
+
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java Mon Dec 3 22:00:02 2018
@@ -50,7 +50,7 @@ class FSFloatConstraintImpl implements F
FSFloatConstraintImpl() {
this.codes = new IntVector();
- this.values = new Vector<Float>();
+ this.values = new Vector<>();
}
@Override
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java Mon Dec 3 22:00:02 2018
@@ -51,7 +51,7 @@ public class FSIndexComparatorImpl imple
// Public only for testing purposes.
public FSIndexComparatorImpl() {
this.type = null;
- this.keySpecs = new ArrayList<Object>();
+ this.keySpecs = new ArrayList<>();
this.directions = new IntVector();
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java Mon Dec 3 22:00:02 2018
@@ -200,9 +200,9 @@ public class FSIndexRepositoryImpl imple
* only used when processing updates in batch mode
*/
private static class ProcessedIndexInfo {
- final private Set<TOP> fsAddedToIndex = new ObjHashSet<TOP>(TOP.class, TOP._singleton);
- final private Set<TOP> fsDeletedFromIndex = new ObjHashSet<TOP>(TOP.class, TOP._singleton);
- final private Set<TOP> fsReindexed = new ObjHashSet<TOP>(TOP.class, TOP._singleton);
+ final private Set<TOP> fsAddedToIndex = new ObjHashSet<>(TOP.class, TOP._singleton);
+ final private Set<TOP> fsDeletedFromIndex = new ObjHashSet<>(TOP.class, TOP._singleton);
+ final private Set<TOP> fsReindexed = new ObjHashSet<>(TOP.class, TOP._singleton);
}
/**
@@ -346,8 +346,8 @@ public class FSIndexRepositoryImpl imple
/**
* speedup for annotation index accessing by type, lazily initialized
*/
- final private Map<TypeImpl, FsIndex_annotation<Annotation>> annotationIndexes =
- new IdentityHashMap<TypeImpl, FsIndex_annotation<Annotation>>();
+ final private Map<TypeImpl, FsIndex_annotation<Annotation>> annotationIndexes =
+ new IdentityHashMap<>();
// the next are for journaling updates to indexes
final private List<TOP> indexUpdates;
@@ -452,7 +452,7 @@ public class FSIndexRepositoryImpl imple
final int numTypes = ts.getNumberOfTypes() + 1;
// this.detectIllegalIndexUpdates = new int[numTypes];
// this.flattenedIndexValid = new ConcurrentBits(numTypes);
- this.name2indexMap = new HashMap<String, FsIndex_iicp<TOP>>();
+ this.name2indexMap = new HashMap<>();
this.indexUpdates = new ArrayList<>();
this.indexUpdateOperation = new BitSet();
this.logProcessed = false;
@@ -482,7 +482,7 @@ public class FSIndexRepositoryImpl imple
// this.detectIllegalIndexUpdates = new int[numTypes];
// this.flattenedIndexValid = new ConcurrentBits(numTypes);
- this.name2indexMap = new HashMap<String, FsIndex_iicp<TOP>>();
+ this.name2indexMap = new HashMap<>();
this.indexUpdates = new ArrayList<>();
this.indexUpdateOperation = new BitSet();
this.logProcessed = false;
@@ -712,10 +712,10 @@ public class FSIndexRepositoryImpl imple
FsIndex_iicp<T> iicp = null;
if (isAnnotationIndex(comparator, indexType)) {
FsIndex_singletype<Annotation> index = addNewIndexCore(comparator, initialSize, indexType);
- iicp = (FsIndex_iicp<T>) new FsIndex_annotation<Annotation>(index);
+ iicp = (FsIndex_iicp<T>) new FsIndex_annotation<>(index);
} else {
FsIndex_singletype<TOP> index = addNewIndexCore(comparator, initialSize, indexType);
- iicp = (FsIndex_iicp<T>) new FsIndex_iicp<TOP>(index);
+ iicp = (FsIndex_iicp<T>) new FsIndex_iicp<>(index);
}
final Type type = comparator.getType();
final int typeCode = ((TypeImpl) type).getCode();
@@ -764,7 +764,7 @@ public class FSIndexRepositoryImpl imple
switch (indexingStrategy) {
case FSIndex.SET_INDEX:
- ind = new FsIndex_set_sorted<T>(this.cas, type, indexingStrategy, comparatorForIndexSpecs); // false = is set
+ ind = new FsIndex_set_sorted<>(this.cas, type, indexingStrategy, comparatorForIndexSpecs); // false = is set
break;
// case FSIndex.FLAT_INDEX:
@@ -773,12 +773,12 @@ public class FSIndexRepositoryImpl imple
case FSIndex.BAG_INDEX:
case FSIndex.DEFAULT_BAG_INDEX:
- ind = new FsIndex_bag<T>(this.cas, type, initialSize, indexingStrategy, comparatorForIndexSpecs);
+ ind = new FsIndex_bag<>(this.cas, type, initialSize, indexingStrategy, comparatorForIndexSpecs);
break;
default:
// SORTED_INDEX is the default. We don't throw any errors, if the code is unknown, we just create a sorted index.
- ind = new FsIndex_set_sorted<T>(this.cas, type, FSIndex.SORTED_INDEX, comparatorForIndexSpecs); // true = is sorted
+ ind = new FsIndex_set_sorted<>(this.cas, type, FSIndex.SORTED_INDEX, comparatorForIndexSpecs); // true = is sorted
break;
}
@@ -950,7 +950,7 @@ public class FSIndexRepositoryImpl imple
}
public Iterator<LowLevelIndex> ll_getIndexes() {
- ArrayList<LowLevelIndex> indexList = new ArrayList<LowLevelIndex>();
+ ArrayList<LowLevelIndex> indexList = new ArrayList<>();
final Iterator<String> it = this.getLabels();
String label;
while (it.hasNext()) {
@@ -976,7 +976,7 @@ public class FSIndexRepositoryImpl imple
* @return An iterator over the labels.
*/
public <T extends FeatureStructure> Iterator<String> getLabels(FSIndexComparator comp) {
- final ArrayList<String> labels = new ArrayList<String>();
+ final ArrayList<String> labels = new ArrayList<>();
final Iterator<String> it = this.getLabels();
String label;
while (it.hasNext()) {
@@ -1146,7 +1146,7 @@ public class FSIndexRepositoryImpl imple
fss.add(fs);
}
}
- Collections.sort(fss, (fs1, fs2) -> Integer.compare(fs1._id, fs2._id));
+ fss.sort((fs1, fs2) -> Integer.compare(fs1._id, fs2._id));
for (TOP fs : fss) {
action.accept(fs);
}
@@ -1475,7 +1475,7 @@ public class FSIndexRepositoryImpl imple
}
LowLevelIterator<T>[] ia = new LowLevelIterator[iteratorListSize];
- return new FsIterator_aggregation_common<T>(iteratorList.toArray(ia), null, null);
+ return new FsIterator_aggregation_common<>(iteratorList.toArray(ia), null, null);
}
private final <T extends FeatureStructure> void getAllIndexedFS(Type type, List<LowLevelIterator<T>> iteratorList) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java Mon Dec 3 22:00:02 2018
@@ -36,7 +36,7 @@ class FSTypeConstraintImpl implements FS
private static final long serialVersionUID = 7557683109761796280L;
- private Set<String> nameSet = new HashSet<String>();
+ private Set<String> nameSet = new HashSet<>();
private transient SortedIntSet typeSet = new SortedIntSet();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java Mon Dec 3 22:00:02 2018
@@ -130,7 +130,7 @@ abstract class FSsTobeAddedback implemen
/**
* list of views where the FS was removed; used when adding the fs back
*/
- final List<FSIndexRepositoryImpl> views = new ArrayList<FSIndexRepositoryImpl>();
+ final List<FSIndexRepositoryImpl> views = new ArrayList<>();
@Override
void recordRemove(FSIndexRepositoryImpl view) {
@@ -183,7 +183,7 @@ abstract class FSsTobeAddedback implemen
/**
* For each FS, the list of views where it was removed.
*/
- final Map<TOP, List<?>> fss2views = new HashMap<TOP, List<?>>();
+ final Map<TOP, List<?>> fss2views = new HashMap<>();
/**
* An arbitrary cas view or base cas
@@ -200,7 +200,7 @@ abstract class FSsTobeAddedback implemen
@SuppressWarnings("unchecked")
List<FSIndexRepositoryImpl> irList = (List<FSIndexRepositoryImpl>) fss2views.get(fs);
if (null == irList) {
- fss2views.put(fs, irList = new ArrayList<FSIndexRepositoryImpl>());
+ fss2views.put(fs, irList = new ArrayList<>());
}
irList.add(view);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java Mon Dec 3 22:00:02 2018
@@ -62,7 +62,7 @@ class FeaturePathImpl implements Feature
private String originalBuiltInName = null;
// featurePath element names
- final private ArrayList<String> featurePathElementNames = new ArrayList<String>();
+ final private ArrayList<String> featurePathElementNames = new ArrayList<>();
private boolean pathStartsWithSlash = true;
/**
@@ -73,7 +73,7 @@ class FeaturePathImpl implements Feature
* It has values for the first names in the featurePathElementNames which are always valid for a
* given starting type (set into boundBaseType).
*/
- final private ArrayList<FeatureImpl> boundFeatures = new ArrayList<FeatureImpl>();
+ final private ArrayList<FeatureImpl> boundFeatures = new ArrayList<>();
private FeatureImpl targetFeature; // set to the last value of boundFeatures
private TypeImpl targetType; // set to type of range of last found feature, works when there are no features
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java Mon Dec 3 22:00:02 2018
@@ -969,9 +969,9 @@ public class FeatureStructureImplC imple
// 1) key not in map
// 2) key in map, but value is "seen once" - first time value seen
// 3) key in map, value is #nnnn - when value is seen more than once
- private Map<FeatureStructure, String> tree = new HashMap<FeatureStructure, String>();
+ private Map<FeatureStructure, String> tree = new HashMap<>();
- private Set<FeatureStructure> seen = new HashSet<FeatureStructure>();
+ private Set<FeatureStructure> seen = new HashSet<>();
private int count;
@@ -1835,4 +1835,4 @@ public class FeatureStructureImplC imple
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java Mon Dec 3 22:00:02 2018
@@ -150,7 +150,7 @@ public class FeatureValuePathImpl implem
static {
Arrays.sort(SIMPLE_VAL_TYPES);
- CONTAINER_TO_ELEMENTYPE_MAP = new HashMap<String, String>();
+ CONTAINER_TO_ELEMENTYPE_MAP = new HashMap<>();
CONTAINER_TO_ELEMENTYPE_MAP.put(CAS.TYPE_NAME_INTEGER_ARRAY, CAS.TYPE_NAME_INTEGER);
CONTAINER_TO_ELEMENTYPE_MAP.put(CAS.TYPE_NAME_STRING_ARRAY, CAS.TYPE_NAME_STRING);
CONTAINER_TO_ELEMENTYPE_MAP.put(CAS.TYPE_NAME_FLOAT_ARRAY, CAS.TYPE_NAME_FLOAT);
@@ -158,7 +158,7 @@ public class FeatureValuePathImpl implem
CONTAINER_TO_ELEMENTYPE_MAP.put(CAS.TYPE_NAME_STRING_LIST, CAS.TYPE_NAME_STRING);
CONTAINER_TO_ELEMENTYPE_MAP.put(CAS.TYPE_NAME_FLOAT_LIST, CAS.TYPE_NAME_FLOAT);
- LIST_TO_ARRAYTYPE_MAP = new HashMap<String, String>();
+ LIST_TO_ARRAYTYPE_MAP = new HashMap<>();
LIST_TO_ARRAYTYPE_MAP.put(CAS.TYPE_NAME_INTEGER_LIST, CAS.TYPE_NAME_INTEGER_ARRAY);
LIST_TO_ARRAYTYPE_MAP.put(CAS.TYPE_NAME_STRING_LIST, CAS.TYPE_NAME_STRING_ARRAY);
LIST_TO_ARRAYTYPE_MAP.put(CAS.TYPE_NAME_FLOAT_LIST, CAS.TYPE_NAME_FLOAT_ARRAY);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java Mon Dec 3 22:00:02 2018
@@ -105,7 +105,7 @@ class FilteredIterator<T extends Feature
* @see org.apache.uima.cas.FSIterator#copy()
*/
public FilteredIterator<T> copy() {
- return new FilteredIterator<T>(this.it.copy(), this.cons);
+ return new FilteredIterator<>(this.it.copy(), this.cons);
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_annotation.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_annotation.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_annotation.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_annotation.java Mon Dec 3 22:00:02 2018
@@ -52,14 +52,14 @@ public class FsIndex_annotation <T exten
}
// return non-constrained, non-strict, unambiguous iterator
boolean strict = false; // https://issues.apache.org/jira/browse/UIMA-5063
- return new Subiterator<T>(iterator(),
- null,
- ambiguous,
- strict,
- null, // no BoundsUse
- true, // type priority used
- true // ignored
- );
+ return new Subiterator<>(iterator(),
+ null,
+ ambiguous,
+ strict,
+ null, // no BoundsUse
+ true, // type priority used
+ true // ignored
+ );
}
/**
@@ -74,14 +74,14 @@ public class FsIndex_annotation <T exten
return iterator(orderNotNeeded, ignoreType);
}
// return non-constrained, non-strict, unambiguous iterator
- return new Subiterator<T>(iterator(orderNotNeeded, ignoreType),
- null, // no bounding fs
- ambiguous,
- strict,
- null, // no BoundsUse
- ! ignoreType, // type priority used
- true // ignored - only for coveredBy or covering
- );
+ return new Subiterator<>(iterator(orderNotNeeded, ignoreType),
+ null, // no bounding fs
+ ambiguous,
+ strict,
+ null, // no BoundsUse
+ !ignoreType, // type priority used
+ true // ignored - only for coveredBy or covering
+ );
}
/*
@@ -102,14 +102,14 @@ public class FsIndex_annotation <T exten
*/
@Override
public FSIterator<T> subiterator(AnnotationFS annot, boolean ambiguous, boolean strict) {
- return new Subiterator<T>(iterator(),
+ return new Subiterator<>(iterator(),
(Annotation) annot,
- ambiguous,
- strict,
+ ambiguous,
+ strict,
BoundsUse.coveredBy, // isBounded
true, // uses type priority
true // skip returning results equal to annot
- );
+ );
}
/*
@@ -119,8 +119,8 @@ public class FsIndex_annotation <T exten
*/
@Override
public AnnotationTree<T> tree(T annot) {
- AnnotationTreeImpl<T> tree = new AnnotationTreeImpl<T>();
- AnnotationTreeNodeImpl<T> root = new AnnotationTreeNodeImpl<T>();
+ AnnotationTreeImpl<T> tree = new AnnotationTreeImpl<>();
+ AnnotationTreeNodeImpl<T> root = new AnnotationTreeNodeImpl<>();
tree.setRoot(root);
root.set(annot);
addChildren(root, subiterator(annot, false, true));
@@ -132,7 +132,7 @@ public class FsIndex_annotation <T exten
T annot;
while (it.isValid()) {
annot = it.nextNvc();
- dtr = new AnnotationTreeNodeImpl<T>();
+ dtr = new AnnotationTreeNodeImpl<>();
dtr.set(annot);
node.addChild(dtr);
addChildren(dtr, subiterator(annot, false, true));
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java Mon Dec 3 22:00:02 2018
@@ -57,7 +57,7 @@ public class FsIndex_bag<T extends Featu
FsIndex_bag(CASImpl cas, Type type, int initialSize, int indexType, FSIndexComparator comparatorForIndexSpecs) {
super(cas, type, indexType, cleanUpComparator(comparatorForIndexSpecs, cas));
- this.index = new ObjHashSet<TOP>(initialSize, TOP.class, TOP._singleton);
+ this.index = new ObjHashSet<>(initialSize, TOP.class, TOP._singleton);
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java Mon Dec 3 22:00:02 2018
@@ -106,7 +106,7 @@ public class FsIndex_flat<T extends Feat
: ignoreType
? idx.comparatorNoTypeWithoutID
: idx.comparatorWithoutID;
- return new FsIterator_subtypes_snapshot<T>(this, comp);
+ return new FsIterator_subtypes_snapshot<>(this, comp);
}
/* (non-Javadoc)
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java Mon Dec 3 22:00:02 2018
@@ -164,7 +164,7 @@ class FsIndex_iicp<T extends FeatureStru
final int indexKind = this.getIndexingStrategy();
int size = (indexKind == FSIndex.DEFAULT_BAG_INDEX) ? 1 : 1 + (int) rootType.getAllSubtypes().count();
- final ArrayList<FsIndex_singletype<FeatureStructure>> tempSubIndexCache = new ArrayList<FsIndex_singletype<FeatureStructure>>();
+ final ArrayList<FsIndex_singletype<FeatureStructure>> tempSubIndexCache = new ArrayList<>();
sortedTypeCodes = (indexKind == FSIndex.SORTED_INDEX) ? new int[size] : null;
initOneTypeThenAllSubtypes(rootType, tempSubIndexCache, indexKind);
@@ -504,10 +504,10 @@ class FsIndex_iicp<T extends FeatureStru
if (! fsIndex_singletype.isSorted() || // is a set index, or
orderNotNeeded) { // order is not needed
- return new FsIterator_aggregation_common<T>(getIterators(), this, comparatorMaybeNoTypeWithoutId);
+ return new FsIterator_aggregation_common<>(getIterators(), this, comparatorMaybeNoTypeWithoutId);
}
- return new FsIterator_subtypes_ordered<T>(this, comparatorMaybeNoTypeWithoutId);
+ return new FsIterator_subtypes_ordered<>(this, comparatorMaybeNoTypeWithoutId);
}
/**
@@ -524,7 +524,7 @@ class FsIndex_iicp<T extends FeatureStru
LowLevelIterator<T> it = iterator(IS_ORDERED, IS_TYPE_ORDER);
return ambiguous
? it
- : new LLUnambiguousIteratorImpl<T>(it);
+ : new LLUnambiguousIteratorImpl<>(it);
}
// /* ***********************************
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java Mon Dec 3 22:00:02 2018
@@ -64,7 +64,7 @@ final public class FsIndex_set_sorted<T
FsIndex_set_sorted(CASImpl cas, Type type, int indexType, FSIndexComparator comparatorForIndexSpecs) {
super(cas, type, indexType, comparatorForIndexSpecs);
- this.indexedFSs = new OrderedFsSet_array<T>(comparatorNoTypeWithID, comparatorNoTypeWithoutID);
+ this.indexedFSs = new OrderedFsSet_array<>(comparatorNoTypeWithID, comparatorNoTypeWithoutID);
}
@Override
@@ -253,8 +253,8 @@ final public class FsIndex_set_sorted<T
// not an empty one, because it may become non-empty
Comparator<TOP> comparatorMaybeNoTypeWithoutID = ignoreType ? comparatorNoTypeWithoutID : comparatorWithoutID;
return casImpl.inPearContext()
- ? new FsIterator_set_sorted_pear<T>(this, cow_wrapper, comparatorMaybeNoTypeWithoutID)
- : new FsIterator_set_sorted2<T>(this, cow_wrapper, comparatorMaybeNoTypeWithoutID); }
+ ? new FsIterator_set_sorted_pear<>(this, cow_wrapper, comparatorMaybeNoTypeWithoutID)
+ : new FsIterator_set_sorted2<>(this, cow_wrapper, comparatorMaybeNoTypeWithoutID); }
@Override
protected CopyOnWriteIndexPart createCopyOnWriteIndexPart() {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java Mon Dec 3 22:00:02 2018
@@ -83,7 +83,7 @@ public class FsIndex_snapshot <T extends
@Override
public LowLevelIterator<T> iterator(boolean orderNotNeeded, boolean ignoreType) {
Comparator<TOP> comparatorMaybeNoTypeWithoutID = ignoreType ? comparatorNoTypeWithoutId : comparatorWithoutId;
- return new FsIterator_subtypes_snapshot<T>(new FsIndex_flat<T>(wrapped), comparatorMaybeNoTypeWithoutID);
+ return new FsIterator_subtypes_snapshot<>(new FsIndex_flat<>(wrapped), comparatorMaybeNoTypeWithoutID);
}
/* (non-Javadoc)
@@ -98,7 +98,7 @@ public class FsIndex_snapshot <T extends
*/
@Override
public FSIndex<T> withSnapshotIterators() {
- return new FsIndex_snapshot<T>(wrapped, comparatorWithoutId, comparatorNoTypeWithoutId);
+ return new FsIndex_snapshot<>(wrapped, comparatorWithoutId, comparatorNoTypeWithoutId);
}
/* (non-Javadoc)
@@ -119,7 +119,7 @@ public class FsIndex_snapshot <T extends
LowLevelIterator<T> it = iterator(IS_ORDERED, IS_TYPE_ORDER);
return ambiguous
? it
- : new LLUnambiguousIteratorImpl<T>(it);
+ : new LLUnambiguousIteratorImpl<>(it);
}
@Override
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java Mon Dec 3 22:00:02 2018
@@ -248,7 +248,7 @@ class FsIterator_aggregation_common<T ex
*/
@Override
public FsIterator_aggregation_common<T> copy() {
- return new FsIterator_aggregation_common<T>(this);
+ return new FsIterator_aggregation_common<>(this);
}
@Override
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java Mon Dec 3 22:00:02 2018
@@ -119,7 +119,7 @@ class FsIterator_backwards<T extends Fea
@Override
public FSIterator<T> copy() {
- return new FsIterator_backwards<T>(it.copy());
+ return new FsIterator_backwards<>(it.copy());
}
/* (non-Javadoc)
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java Mon Dec 3 22:00:02 2018
@@ -134,7 +134,7 @@ class FsIterator_bag<T extends FeatureSt
*/
@Override
public FsIterator_bag<T> copy() {
- FsIterator_bag<T> copy = new FsIterator_bag<T>(this.fsBagIndex, this.ti, bag);
+ FsIterator_bag<T> copy = new FsIterator_bag<>(this.fsBagIndex, this.ti, bag);
copyCommonSetup(copy);
return copy;
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java Mon Dec 3 22:00:02 2018
@@ -42,7 +42,7 @@ class FsIterator_bag_pear<T extends Feat
@Override
public FsIterator_bag_pear<T> copy() {
- FsIterator_bag_pear<T> copy = new FsIterator_bag_pear<T>(this.fsBagIndex, this.ti, this.bag );
+ FsIterator_bag_pear<T> copy = new FsIterator_bag_pear<>(this.fsBagIndex, this.ti, this.bag);
copyCommonSetup(copy);
return copy;
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java Mon Dec 3 22:00:02 2018
@@ -95,7 +95,7 @@ class FsIterator_limited<T extends Featu
@Override
public FSIterator<T> copy() {
- return new FsIterator_limited<T>(iterator.copy(), limit);
+ return new FsIterator_limited<>(iterator.copy(), limit);
}
@Override
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java Mon Dec 3 22:00:02 2018
@@ -44,6 +44,6 @@ class FsIterator_set_sorted_pear<T exten
@Override
public FsIterator_set_sorted_pear<T> copy() {
- return new FsIterator_set_sorted_pear<T>(ll_index, ofsa, this.comparatorMaybeNoTypeWithoutID);
+ return new FsIterator_set_sorted_pear<>(ll_index, ofsa, this.comparatorMaybeNoTypeWithoutID);
}
}
\ No newline at end of file
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java Mon Dec 3 22:00:02 2018
@@ -486,7 +486,7 @@ public class FsIterator_subtypes_ordered
*/
@Override
public FSIterator<T> copy() {
- FsIterator_subtypes_ordered<T> it = new FsIterator_subtypes_ordered<T>(iicp, comparatorMaybeNoTypeWithoutId);
+ FsIterator_subtypes_ordered<T> it = new FsIterator_subtypes_ordered<>(iicp, comparatorMaybeNoTypeWithoutId);
if (!isValid()) {
it.moveToPrevious(); // mark new one also invalid
} else {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java Mon Dec 3 22:00:02 2018
@@ -205,9 +205,9 @@ public class FsIterator_subtypes_snapsho
*/
@Override
public FSIterator<T> copy() {
- FsIterator_subtypes_snapshot<T> it = new FsIterator_subtypes_snapshot<T>(
- this.snapshot,
- this.indexForComparator,
+ FsIterator_subtypes_snapshot<T> it = new FsIterator_subtypes_snapshot<>(
+ this.snapshot,
+ this.indexForComparator,
this.is_unordered,
this.comparatorMaybeNoTypeWithoutId);
it.pos = pos;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java Mon Dec 3 22:00:02 2018
@@ -20,6 +20,7 @@
package org.apache.uima.cas.impl;
import java.util.ArrayList;
+import java.util.List;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.jcas.tcas.Annotation;
@@ -43,7 +44,7 @@ public class LLUnambiguousIteratorImpl<T
// this is static because can't have instance method call before super call in constructor
private static Annotation[] createItemsArray(LowLevelIterator<FeatureStructure> it) {
- ArrayList<Annotation> items = new ArrayList<Annotation>();
+ List<Annotation> items = new ArrayList<>();
int lastSeenEnd = 0;
it.moveToFirst();
// Iterate over the input iterator.
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java Mon Dec 3 22:00:02 2018
@@ -240,7 +240,7 @@ public class LinearTypeOrderBuilderImpl
private class Graph {
// Map type names to graph nodes.
- private final HashMap<String, Node> nodeMap = new HashMap<String, Node>();
+ private final Map<String, Node> nodeMap = new HashMap<>();
private int size() {
return this.nodeMap.size();
@@ -297,7 +297,7 @@ public class LinearTypeOrderBuilderImpl
// an
// in-degree of 0, we don't need to worry about in-arcs.
// Node node = (Node) this.nodeMap.get(name);
- ArrayList<Node> rank0s = new ArrayList<Node>();
+ ArrayList<Node> rank0s = new ArrayList<>();
// if (node == null) {
// return ;
// }
@@ -314,7 +314,7 @@ public class LinearTypeOrderBuilderImpl
}
private boolean pathFromTo(Node n1, Node n2) {
- final HashMap<Node, Node> map = new HashMap<Node, Node>();
+ final HashMap<Node, Node> map = new HashMap<>();
return pathFromTo(n1, n2, map);
}
@@ -384,7 +384,7 @@ public class LinearTypeOrderBuilderImpl
}
private void addInheritanceTypes() {
- List<Type> typesToModify = new ArrayList<Type>();
+ List<Type> typesToModify = new ArrayList<>();
for (Iterator<Type> tsi = this.ts.getTypeIterator(); tsi.hasNext();) {
Type bottomType = tsi.next();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java Mon Dec 3 22:00:02 2018
@@ -161,7 +161,7 @@ public interface LowLevelIterator<T exte
/**
* an empty iterator
*/
- static final LowLevelIterator<FeatureStructure> FS_ITERATOR_LOW_LEVEL_EMPTY = new LowLevelIterator_empty<FeatureStructure>();
+ static final LowLevelIterator<FeatureStructure> FS_ITERATOR_LOW_LEVEL_EMPTY = new LowLevelIterator_empty<>();
/**
* Internal use constants
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java Mon Dec 3 22:00:02 2018
@@ -42,7 +42,7 @@ public class OutOfTypeSystemData {
/**
* List of FSData objects for out-of-typesystem FSs.
*/
- final List<FSData> fsList = new ArrayList<FSData>();
+ final List<FSData> fsList = new ArrayList<>();
/**
* Map from Feature Structure to List of String arrays holding feature names and values for
@@ -61,7 +61,7 @@ public class OutOfTypeSystemData {
* Map used during re-serialization. Stores mapping from out-of-typesystem FS IDs to the actual
* IDs used in the generated XCAS.
*/
- final Map<String, String> idMap = new HashMap<String, String>();
+ final Map<String, String> idMap = new HashMap<>();
/**
* For debugging purposes only.
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java Mon Dec 3 22:00:02 2018
@@ -637,11 +637,11 @@ public class SelectFSs_impl <T extends F
FSIterator<T> it;
T[] a = (T[]) asArray(baseIterator, FeatureStructure.class); // array is in forward order because
// it's produced by a backwards iterator, but then the array is reversed
- it = new FsIterator_subtypes_snapshot<T>(
- a,
- (LowLevelIndex<T>) index,
- IS_ORDERED,
- baseIterator.getComparator());
+ it = new FsIterator_subtypes_snapshot<>(
+ a,
+ (LowLevelIndex<T>) index,
+ IS_ORDERED,
+ baseIterator.getComparator());
if (!bkwd) {
it = new FsIterator_backwards<>(it);
@@ -650,7 +650,7 @@ public class SelectFSs_impl <T extends F
return (limit == -1)
? it
// rewrap with limit - needs to be outer shell to get right invalid behavior
- : new FsIterator_limited<T>(it, limit);
+ : new FsIterator_limited<>(it, limit);
}
private LowLevelIterator<T> fsIterator1() {
@@ -682,7 +682,7 @@ public class SelectFSs_impl <T extends F
// indexes[i - 1] = index;
}
// return new FsIterator_aggregation_common<T>(ita, new FsIndex_aggr<>(indexes));
- return new FsIterator_aggregation_common<T>(ita, null, null);
+ return new FsIterator_aggregation_common<>(ita, null, null);
}
@@ -761,9 +761,9 @@ public class SelectFSs_impl <T extends F
: idx.iterator(isUnordered, ! isTypePriority);
if (isPreceding) {
// filter the iterator to skip annotations whose end is > the position-begin
- it = new FilteredIterator<T>(it, fs ->
- // true if ok, false to skip
- ((Annotation)fs).getEnd() <= ((Annotation)startingFs).getBegin());
+ it = new FilteredIterator<>(it, fs ->
+ // true if ok, false to skip
+ ((Annotation) fs).getEnd() <= ((Annotation) startingFs).getBegin());
}
}
} else {
@@ -771,13 +771,13 @@ public class SelectFSs_impl <T extends F
return (LowLevelIterator<T>) LowLevelIterator.FS_ITERATOR_LOW_LEVEL_EMPTY;
}
// bounds in use, index must be annotation index, is ordered
- it = (LowLevelIterator<T>) new Subiterator<Annotation>(
- (FSIterator<Annotation>) idx.iterator(isUnordered, ! isTypePriority),
- boundingFs,
+ it = (LowLevelIterator<T>) new Subiterator<>(
+ (FSIterator<Annotation>) idx.iterator(isUnordered, !isTypePriority),
+ boundingFs,
!isNonOverlapping, // ambiguous
!isIncludeAnnotBeyondBounds, // strict
boundsUse,
- isTypePriority,
+ isTypePriority,
isSkipSameBeginEndType);
}
@@ -796,7 +796,7 @@ public class SelectFSs_impl <T extends F
private LowLevelIterator<T> altSourceIterator() {
T[] filtered;
if (sourceFSList != null) {
- List<T> filteredItems = new ArrayList<T>();
+ List<T> filteredItems = new ArrayList<>();
FSList fsl = sourceFSList;
while (!(fsl instanceof EmptyFSList)) {
NonEmptyFSList nefsl = (NonEmptyFSList) fsl;
@@ -813,10 +813,10 @@ public class SelectFSs_impl <T extends F
// skip filtering if nullOK and no subsumption test needed because type = TOP or higher
boolean noTypeFilter = ti == view.getTypeSystemImpl().topType;
if (!isNullOK && noTypeFilter) {
- return new FsIterator_subtypes_snapshot<T>((T[]) sourceFSArray, null, IS_UNORDERED, null);
+ return new FsIterator_subtypes_snapshot<>((T[]) sourceFSArray, null, IS_UNORDERED, null);
}
- List<T> filteredItems = new ArrayList<T>();
+ List<T> filteredItems = new ArrayList<>();
boolean noNullsWereFiltered = true;
for (FeatureStructure item : sourceFSArray) {
if (!isNullOK && null == item) {
@@ -830,18 +830,18 @@ public class SelectFSs_impl <T extends F
}
if (noTypeFilter && !noNullsWereFiltered) {
- return new FsIterator_subtypes_snapshot<T>(
- (T[]) sourceFSArray,
- null,
+ return new FsIterator_subtypes_snapshot<>(
+ (T[]) sourceFSArray,
+ null,
IS_UNORDERED,
null);
}
filtered = filteredItems.toArray((T[]) Array.newInstance(FeatureStructure.class, filteredItems.size()));
}
- return new FsIterator_subtypes_snapshot<T>(
- filtered,
- null,
+ return new FsIterator_subtypes_snapshot<>(
+ filtered,
+ null,
IS_UNORDERED,
null); // items not sorted
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java Mon Dec 3 22:00:02 2018
@@ -42,7 +42,7 @@ final class StringHeap {
// Initialize internal datastructures. This used to be a lot more complicated when we had the
// character heap option.
private final void initMemory() {
- this.stringList = new ArrayList<String>();
+ this.stringList = new ArrayList<>();
this.stringList.add(null);
}
@@ -59,19 +59,16 @@ final class StringHeap {
int stringOffset;
int stringLength;
String charHeapInString = new String(shdh.charHeap); // UIMA-2460
- Map<String, String> reuseStrings = new HashMap<String, String>(
- Math.min(8,
- (shdh.refHeap.length / StringHeapDeserializationHelper.REF_HEAP_CELL_SIZE)
- / 2));
+ Map<String, String> reuseStrings = new HashMap<>(
+ Math.min(8,
+ (shdh.refHeap.length / StringHeapDeserializationHelper.REF_HEAP_CELL_SIZE)
+ / 2));
for (int i = StringHeapDeserializationHelper.FIRST_CELL_REF; i < shdh.refHeap.length; i += StringHeapDeserializationHelper.REF_HEAP_CELL_SIZE) {
stringOffset = shdh.refHeap[i + StringHeapDeserializationHelper.CHAR_HEAP_POINTER_OFFSET];
stringLength = shdh.refHeap[i + StringHeapDeserializationHelper.CHAR_HEAP_STRLEN_OFFSET];
String s = charHeapInString.substring(stringOffset, stringOffset + stringLength);
- String reuse = reuseStrings.get(s);
- if (reuse == null) {
- reuseStrings.put(s, s);
- }
- this.stringList.add(reuse != null ? reuse : s);
+ String reuse = reuseStrings.putIfAbsent(s, s);
+ this.stringList.add(reuse != null ? reuse : s);
}
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java Mon Dec 3 22:00:02 2018
@@ -384,7 +384,7 @@ public class Subiterator<T extends Annot
private void convertToListForm() {
moveToStart(); // moves to the start annotation, including moving past equals for annot style,
// and accommodating strict
- this.list = new ArrayList<Annotation>();
+ this.list = new ArrayList<>();
while (isValid()) {
list.add((Annotation) it.getNvc());
moveToNext(); // does all the adjustments, so list has only appropriate elements
@@ -1181,15 +1181,15 @@ public class Subiterator<T extends Annot
*/
@Override
public FSIterator<T> copy() {
- Subiterator<T> copy = new Subiterator<T>(
- this.it.copy(),
- this.boundingAnnot,
- ! this.isUnambiguous,
+ Subiterator<T> copy = new Subiterator<>(
+ this.it.copy(),
+ this.boundingAnnot,
+ !this.isUnambiguous,
this.isStrict,
this.boundsUse,
- this.isUseTypePriority,
+ this.isUseTypePriority,
this.isSkipSameBeginEndType,
-
+
this.startId,
this.isEmpty,
this.coveringStartPos,
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java Mon Dec 3 22:00:02 2018
@@ -367,7 +367,7 @@ public class TypeImpl implements Type, C
@Override
@Deprecated
public Vector<Feature> getAppropriateFeatures() {
- return new Vector<Feature>(getFeatures());
+ return new Vector<>(getFeatures());
}
@@ -481,7 +481,7 @@ public class TypeImpl implements Type, C
*/
@Override
public List<Feature> getFeatures() {
- return new ArrayList<Feature>(Arrays.asList(getFeatureImpls()));
+ return new ArrayList<>(Arrays.asList(getFeatureImpls()));
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java Mon Dec 3 22:00:02 2018
@@ -79,7 +79,7 @@ public class TypeSystem2Xml {
ResourceSpecifierFactory factory = UIMAFramework.getResourceSpecifierFactory();
TypeSystemDescription tsDesc = factory.createTypeSystemDescription();
- List<TypeDescription> typeDescs = new ArrayList<TypeDescription>();
+ List<TypeDescription> typeDescs = new ArrayList<>();
Iterator<Type> typeIterator = aTypeSystem.getTypeIterator();
while (typeIterator.hasNext()) {
TypeImpl type = (TypeImpl) typeIterator.next();
@@ -93,7 +93,7 @@ public class TypeSystem2Xml {
typeDesc.setName(type.getName());
typeDesc.setSupertypeName(superType.getName());
LowLevelTypeSystem llts = aTypeSystem.getLowLevelTypeSystem();
- List<FeatureDescription> featDescs = new ArrayList<FeatureDescription>();
+ List<FeatureDescription> featDescs = new ArrayList<>();
Iterator<FeatureImpl> featIterator = Arrays.asList(type.getFeatureImpls()).iterator();
while (featIterator.hasNext()) {
Feature feat = featIterator.next();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Mon Dec 3 22:00:02 2018
@@ -188,7 +188,7 @@ public class TypeSystemImpl implements T
/**
* Map from component name to built-in array name
*/
- private final static Map<String, String> builtInArrayComponentName2ArrayTypeName = new HashMap<String, String>(9);
+ private final static Map<String, String> builtInArrayComponentName2ArrayTypeName = new HashMap<>(9);
static {
builtInArrayComponentName2ArrayTypeName.put(CAS.TYPE_NAME_TOP, CAS.TYPE_NAME_FS_ARRAY);
@@ -278,7 +278,7 @@ public class TypeSystemImpl implements T
/**
* Map from built-in array name to component Type
*/
- private final Map<String, TypeImpl> arrayName2ComponentType = new HashMap<String, TypeImpl>(9);
+ private final Map<String, TypeImpl> arrayName2ComponentType = new HashMap<>(9);
// not static in general because need different instances for each type system
// because instances have direct subtypes
@@ -735,7 +735,7 @@ public class TypeSystemImpl implements T
}
public Vector<Feature> getIntroFeatures(Type type) {
- Vector<Feature> feats = new Vector<Feature>();
+ Vector<Feature> feats = new Vector<>();
List<Feature> appropFeats = type.getFeatures();
final int max = appropFeats.size();
Feature feat;
@@ -1052,7 +1052,7 @@ public class TypeSystemImpl implements T
*/
@Override
public Vector<Type> getDirectlySubsumedTypes(Type type) {
- return new Vector<Type>(getDirectSubtypes(type));
+ return new Vector<>(getDirectSubtypes(type));
}
@Override
@@ -2070,8 +2070,8 @@ public class TypeSystemImpl implements T
* The map itself is not synchronized, because all accesses to it are
* from the synchronized getTypeSystemMapper method
*********************************************************/
- public final Map<TypeSystemImpl, CasTypeSystemMapper> typeSystemMappers =
- new WeakHashMap<TypeSystemImpl, CasTypeSystemMapper>();
+ public final Map<TypeSystemImpl, CasTypeSystemMapper> typeSystemMappers =
+ new WeakHashMap<>();
synchronized CasTypeSystemMapper getTypeSystemMapper(TypeSystemImpl tgtTs) {
CasTypeSystemMapper ctsm = getTypeSystemMapperInner(tgtTs);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Mon Dec 3 22:00:02 2018
@@ -205,12 +205,12 @@ public class XCASDeserializer {
this.cas = aCAS.getBaseCAS();
// Reset the CAS.
cas.resetNoQuestions();
- this.fsTree = new RedBlackTree<FSInfo>();
- this.idLess = new ArrayList<FSInfo>();
+ this.fsTree = new RedBlackTree<>();
+ this.idLess = new ArrayList<>();
this.buffer = new StringBuffer();
this.outOfTypeSystemData = ootsData;
- this.indexRepositories = new ArrayList<FSIndexRepository>();
- this.views = new ArrayList<CAS>();
+ this.indexRepositories = new ArrayList<>();
+ this.views = new ArrayList<>();
// using the baseCas for indexing Sofas
indexRepositories.add(this.cas.getBaseIndexRepository());
// There should always be another index for the Initial View
@@ -652,11 +652,7 @@ public class XCASDeserializer {
if (feat == null) { // feature does not exist in typesystem
if (outOfTypeSystemData != null) {
// Add to Out-Of-Typesystem data (APL)
- List<Pair<String, Object>> ootsAttrs = outOfTypeSystemData.extraFeatureValues.get(fs);
- if (ootsAttrs == null) {
- ootsAttrs = new ArrayList<Pair<String, Object>>();
- outOfTypeSystemData.extraFeatureValues.put(fs, ootsAttrs);
- }
+ List<Pair<String, Object>> ootsAttrs = outOfTypeSystemData.extraFeatureValues.computeIfAbsent(fs, k -> new ArrayList<>());
ootsAttrs.add(new Pair(featName, featVal));
} else if (!lenient) {
throw createException(XCASParsingException.UNKNOWN_FEATURE, featName);
@@ -898,11 +894,7 @@ public class XCASDeserializer {
// this feature may be a ref to an out-of-typesystem FS.
// add it to the Out-of-typesystem features list (APL)
if (extId != 0 && outOfTypeSystemData != null) {
- List<Pair<String, Object>> ootsAttrs = outOfTypeSystemData.extraFeatureValues.get(fs);
- if (ootsAttrs == null) {
- ootsAttrs = new ArrayList<Pair<String, Object>>();
- outOfTypeSystemData.extraFeatureValues.put(fs, ootsAttrs);
- }
+ List<Pair<String, Object>> ootsAttrs = outOfTypeSystemData.extraFeatureValues.computeIfAbsent(fs, k -> new ArrayList<>());
String featFullName = fi.getName();
int separatorOffset = featFullName.indexOf(TypeSystem.FEATURE_SEPARATOR);
String featName = "_ref_" + featFullName.substring(separatorOffset + 1);
@@ -945,11 +937,7 @@ public class XCASDeserializer {
// this element may be a ref to an out-of-typesystem FS.
// add it to the Out-of-typesystem array elements list (APL)
if (extId != 0 && outOfTypeSystemData != null) {
- List<ArrayElement> ootsElements = outOfTypeSystemData.arrayElements.get(fs);
- if (ootsElements == null) {
- ootsElements = new ArrayList<ArrayElement>();
- outOfTypeSystemData.arrayElements.put(fs, ootsElements);
- }
+ List<ArrayElement> ootsElements = outOfTypeSystemData.arrayElements.computeIfAbsent(fs, k -> new ArrayList<>());
// the "value" of the reference is the ID, but we prefix with a letter to indicate
// that this ID refers to an array OOTS FS
ArrayElement ootsElem = new ArrayElement(pos, "a" + Integer.toString(extId));
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Mon Dec 3 22:00:02 2018
@@ -195,7 +195,7 @@ public class XmiCasDeserializer {
// map from namespace prefixes to URIs. Allows namespace resolution even
// with a non-namespace-enabled SAX parser.
- private Map<String, String> nsPrefixToUriMap = new HashMap<String, String>();
+ private Map<String, String> nsPrefixToUriMap = new HashMap<>();
// container for data shared between the XmiCasSerialier and
// XmiDeserializer, to support things such as consistency of IDs across
@@ -314,8 +314,8 @@ public class XmiCasDeserializer {
this.nextSofaNum = this.casBeingFilled.getViewCount() + 1;
}
this.buffer = new StringBuilder();
- this.indexRepositories = new ArrayList<FSIndexRepository>();
- this.views = new ArrayList<CAS>();
+ this.indexRepositories = new ArrayList<>();
+ this.views = new ArrayList<>();
indexRepositories.add(this.casBeingFilled.getBaseIndexRepository());
// There should always be another index for the Initial View
indexRepositories.add(this.casBeingFilled.getView(CAS.NAME_DEFAULT_SOFA).getIndexRepository());
@@ -448,7 +448,7 @@ public class XmiCasDeserializer {
//correctly.
if (this.outOfTypeSystemElement != null) {
XmlElementName elemName = new XmlElementName(nameSpaceURI, localName, qualifiedName);
- List<XmlAttribute> ootsAttrs = new ArrayList<XmlAttribute>();
+ List<XmlAttribute> ootsAttrs = new ArrayList<>();
ootsAttrs.add(new XmlAttribute("href", href));
XmlElementNameAndContents elemWithContents = new XmlElementNameAndContents(elemName, null, ootsAttrs);
this.outOfTypeSystemElement.childElements.add(elemWithContents);
@@ -458,11 +458,7 @@ public class XmiCasDeserializer {
//the integer value, which will be interpreted as a reference later.
//NOTE: this will end up causing it to be reserialized as an attribute
//rather than an element, but that is not in violation of the XMI spec.
- ArrayList<String> valueList = this.multiValuedFeatures.get(qualifiedName);
- if (valueList == null) {
- valueList = new ArrayList<String>();
- this.multiValuedFeatures.put(qualifiedName, valueList);
- }
+ ArrayList<String> valueList = this.multiValuedFeatures.computeIfAbsent(qualifiedName, k -> new ArrayList<>());
valueList.add(href.substring(1));
}
state = REF_FEAT_STATE;
@@ -967,7 +963,7 @@ public class XmiCasDeserializer {
else {
// this logic mimics the way version 2 did this.
if (isDoingDeferredChildElements) {
- ArrayList<String> featValAsArrayList = new ArrayList<String>(1);
+ ArrayList<String> featValAsArrayList = new ArrayList<>(1);
featValAsArrayList.add(featVal);
sharedData.addOutOfTypeSystemChildElements(fs, featName, featValAsArrayList);
} else {
@@ -1676,11 +1672,7 @@ public class XmiCasDeserializer {
case FEAT_CONTENT_STATE: {
// We have just processed one of possibly many values for a feature.
// Store this value in the multiValuedFeatures map for later use.
- ArrayList<String> valueList = this.multiValuedFeatures.get(qualifiedName);
- if (valueList == null) {
- valueList = new ArrayList<String>();
- this.multiValuedFeatures.put(qualifiedName, valueList);
- }
+ ArrayList<String> valueList = this.multiValuedFeatures.computeIfAbsent(qualifiedName, k -> new ArrayList<>());
valueList.add(buffer.toString());
// go back to the state where we're expecting a feature
@@ -2069,7 +2061,7 @@ public class XmiCasDeserializer {
private TypeSystemImpl ts;
- private Map<String, String> xmiNamespaceToUimaNamespaceMap = new HashMap<String, String>();
+ private Map<String, String> xmiNamespaceToUimaNamespaceMap = new HashMap<>();
/**
* Create a new deserializer from a type system.
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Mon Dec 3 22:00:02 2018
@@ -731,7 +731,7 @@ public class XmiCasSerializer {
if (fsArray instanceof StringArray && ((StringArray)fsArray).size() != 0) {
// string arrays are encoded as elements, in case they contain whitespace
- List<XmlElementNameAndContents> childElements = new ArrayList<XmlElementNameAndContents>();
+ List<XmlElementNameAndContents> childElements = new ArrayList<>();
stringArrayToElementList("elements", (StringArray) fsArray, childElements);
startElement(xmlElementName, workAttrs, childElements.size());
sendElementEvents(childElements);
@@ -868,7 +868,7 @@ public class XmiCasSerializer {
*/
private List<XmlElementNameAndContents> encodeFeatures(TOP fs, AttributesImpl attrs, boolean insideListNode)
throws SAXException {
- List<XmlElementNameAndContents> childElements = new ArrayList<XmlElementNameAndContents>();
+ List<XmlElementNameAndContents> childElements = new ArrayList<>();
// int heapValue = cds.cas.getHeapValue(addr);
// int[] feats = cds.tsi.ll_getAppropriateFeatures(heapValue);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java Mon Dec 3 22:00:02 2018
@@ -84,13 +84,13 @@ public class XmiSerializationSharedData
* List of OotsElementData objects, each of which captures information about
* incoming XMI elements that did not correspond to any type in the type system.
*/
- private List<OotsElementData> ootsFs = new ArrayList<OotsElementData>();
+ private List<OotsElementData> ootsFs = new ArrayList<>();
/**
* Map from the xmi:id (String) of a Sofa to a List of xmi:id's (Strings) for
* the out-of-typesystem FSs that are members of that Sofa's view.
*/
- private Map<String, List<String>> ootsViewMembers = new HashMap<String, List<String>>();
+ private Map<String, List<String>> ootsViewMembers = new HashMap<>();
/** Map from Feature Structures to OotsElementData object, capturing information
* about out-of-typesystem features that were part of an in-typesystem FS. These include both
@@ -221,11 +221,7 @@ public class XmiSerializationSharedData
* a member of the view for the given Sofa
*/
public void addOutOfTypeSystemViewMember(String sofaXmiId, String memberXmiId) {
- List<String> membersList = this.ootsViewMembers.get(sofaXmiId);
- if (membersList == null) {
- membersList = new ArrayList<String>();
- this.ootsViewMembers.put(sofaXmiId, membersList);
- }
+ List<String> membersList = this.ootsViewMembers.computeIfAbsent(sofaXmiId, k -> new ArrayList<>());
membersList.add(memberXmiId);
}
@@ -324,11 +320,7 @@ public class XmiSerializationSharedData
* @param xmiId xmi:id of the out-of-typesystem element that is the value at the given index
*/
public void addOutOfTypeSystemArrayElement(FSArray fsarray, int index, int xmiId) {
- List<XmiArrayElement> list = this.ootsArrayElements.get(fsarray);
- if (list == null) {
- list = new ArrayList<XmiArrayElement>();
- this.ootsArrayElements.put(fsarray, list);
- }
+ List<XmiArrayElement> list = this.ootsArrayElements.computeIfAbsent(fsarray, k -> new ArrayList<>());
list.add(new XmiArrayElement(index, Integer.toString(xmiId)));
}
@@ -415,7 +407,7 @@ public class XmiSerializationSharedData
/**
* List of XmlAttribute objects each holding name and value of an attribute.
*/
- final public List<XmlAttribute> attributes = new ArrayList<XmlAttribute>();
+ final public List<XmlAttribute> attributes = new ArrayList<>();
/**
* List of XmlElementNameAndContents objects each describing one of the
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java Mon Dec 3 22:00:02 2018
@@ -37,7 +37,7 @@ public class CasDataImpl implements CasD
* Initializes FeatureStructure list
*/
public CasDataImpl() {
- fsList = new LinkedList<FeatureStructure>();
+ fsList = new LinkedList<>();
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java Mon Dec 3 22:00:02 2018
@@ -131,7 +131,7 @@ public class CasDataUtils {
String featureName) {
Iterator<FeatureStructure> it = aCAS.getFeatureStructures();
String featureValue = null;
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
while (it.hasNext()) {
FeatureStructure fs = it.next();
if (featureStructureName.equals(fs.getType())) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java Mon Dec 3 22:00:02 2018
@@ -41,7 +41,7 @@ public class FeatureStructureImpl implem
private int[] mIndexed = Constants.EMPTY_INT_ARRAY;
public FeatureStructureImpl() {
- mFeatureMap = new TreeMap<String, FeatureValue>();
+ mFeatureMap = new TreeMap<>();
}
public String getType() {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java Mon Dec 3 22:00:02 2018
@@ -102,7 +102,7 @@ public class CasConsumerDescription_impl
getImplementationName(), CasConsumer.class.getName(), getSourceUrlString() });
}
// try to create a CAS
- List<ProcessingResourceMetaData> metadata = new ArrayList<ProcessingResourceMetaData>();
+ List<ProcessingResourceMetaData> metadata = new ArrayList<>();
metadata.add(getCasConsumerMetaData());
CasCreationUtils.createCas(metadata);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java Mon Dec 3 22:00:02 2018
@@ -102,7 +102,7 @@ public class CasInitializerDescription_i
getImplementationName(), CasInitializer.class.getName(), getSourceUrlString() });
}
// try to create a CAS
- List<ProcessingResourceMetaData> metadata = new ArrayList<ProcessingResourceMetaData>();
+ List<ProcessingResourceMetaData> metadata = new ArrayList<>();
metadata.add(getCasInitializerMetaData());
CasCreationUtils.createCas(metadata);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java Mon Dec 3 22:00:02 2018
@@ -96,7 +96,7 @@ public class CollectionReaderDescription
getImplementationName(), CollectionReader.class.getName(), getSourceUrlString() });
}
// try to create a CAS
- ArrayList<ProcessingResourceMetaData> metadata = new ArrayList<ProcessingResourceMetaData>();
+ ArrayList<ProcessingResourceMetaData> metadata = new ArrayList<>();
metadata.add(getCollectionReaderMetaData());
CasCreationUtils.createCas(metadata,
UIMAFramework.getDefaultPerformanceTuningProperties(),
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java Mon Dec 3 22:00:02 2018
@@ -58,8 +58,8 @@ public class CapabilityLanguageFlowContr
private Map<String, List<AnalysisSequenceCapabilityNode>> mFlowTable;
- private final Map<String, ResultSpecification> lastResultSpecForComponent =
- new HashMap<String, ResultSpecification>();
+ private final Map<String, ResultSpecification> lastResultSpecForComponent =
+ new HashMap<>();
/**
* main language separator e.g 'en' and 'en-US'
@@ -76,7 +76,7 @@ public class CapabilityLanguageFlowContr
mComponentMetaDataMap = aContext.getAnalysisEngineMetaDataMap();
// build a list of AnalysisSequenceNodes from the capabilityLanguageFlow
- mStaticSequence = new ArrayList<AnalysisSequenceCapabilityNode>();
+ mStaticSequence = new ArrayList<>();
CapabilityLanguageFlow flowConstraints = (CapabilityLanguageFlow) aContext
.getAggregateMetadata().getFlowConstraints();
for (String aeKey : flowConstraints.getCapabilityLanguageFlow()) {
@@ -112,11 +112,11 @@ public class CapabilityLanguageFlowContr
*/
protected Map<String, List<AnalysisSequenceCapabilityNode>> computeFlowTable(Capability[] aCapabilities) {
// create flowTable
- Map<String, List<AnalysisSequenceCapabilityNode>> flowTable =
- new HashMap<String, List<AnalysisSequenceCapabilityNode>>();
+ Map<String, List<AnalysisSequenceCapabilityNode>> flowTable =
+ new HashMap<>();
// get all languages from the capabilities
- Set<String> languages = new HashSet<String>();
+ Set<String> languages = new HashSet<>();
for (Capability capability : aCapabilities) {
for (String capabilityLanguage : capability.getLanguagesSupported()) {
languages.add(capabilityLanguage);
@@ -155,7 +155,7 @@ public class CapabilityLanguageFlowContr
}
// create array list for the current sequence
- List<AnalysisSequenceCapabilityNode> newSequence = new ArrayList<AnalysisSequenceCapabilityNode>();
+ List<AnalysisSequenceCapabilityNode> newSequence = new ArrayList<>();
// loop over all annotators that should be called
// In this loop we will gradually reduce the set of output capabilities
@@ -172,7 +172,7 @@ public class CapabilityLanguageFlowContr
// if country extension is available
if (index >= 0) {
// create Set for outputSpecs, so we can eliminate duplicates
- Set<TypeOrFeature> outputSpec = new HashSet<TypeOrFeature>();
+ Set<TypeOrFeature> outputSpec = new HashSet<>();
// add language with country extension removed,
// to the existing output capabilities (or if non exist, just use
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java Mon Dec 3 22:00:02 2018
@@ -88,7 +88,7 @@ public class FixedFlowController extends
// swtiching this to a copy-on-write kind of final list.
// -- this has the added "benefit" (maybe eventually) of having better semantics for letting existing
// Flow objects continue to use the "old" settings, and only the new ones picking up the new ones.
- final private List<String> mSequence = new CopyOnWriteArrayList<String>(); //UIMA-4013
+ final private List<String> mSequence = new CopyOnWriteArrayList<>(); //UIMA-4013
private int mActionAfterCasMultiplier;
@@ -101,7 +101,7 @@ public class FixedFlowController extends
FlowConstraints flowConstraints = aContext.getAggregateMetadata().getFlowConstraints();
if (flowConstraints instanceof FixedFlow) {
String[] sequence = ((FixedFlow) flowConstraints).getFixedFlow();
- ArrayList<String> keysToAdd = new ArrayList<String>(sequence.length);
+ ArrayList<String> keysToAdd = new ArrayList<>(sequence.length);
for( String key : sequence ) {
if( !aContext.getAnalysisEngineMetaDataMap().containsKey(key) )
throw new ResourceInitializationException(ResourceInitializationException.FLOW_CONTROLLER_MISSING_DELEGATE,
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java Mon Dec 3 22:00:02 2018
@@ -44,7 +44,7 @@ public class CompositeResourceFactory_im
/**
* List of Registration objects.
*/
- private List<Registration> mRegisteredFactories = Collections.synchronizedList(new ArrayList<Registration>());
+ private List<Registration> mRegisteredFactories = Collections.synchronizedList(new ArrayList<>());
/**
* @see org.apache.uima.ResourceFactory#produceResource(java.lang.Class,