removed unnecessary enums

Author: emacarron

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -358,11 +358,6 @@ private ResultMapping buildResultMappingFromContext(XNode context, Class<?> resu
     String notNullColumn = context.getStringAttribute("notNullColumn");
     String columnPrefix = context.getStringAttribute("columnPrefix");
     String typeHandler = context.getStringAttribute("typeHandler");
-    if ("association".equals(context.getName())) {
-      flags.add(ResultFlag.ASSOCIATION);
-    } else if ("collection".equals(context.getName())) {
-      flags.add(ResultFlag.COLLECTION);
-    }
     Class<?> javaTypeClass = resolveClass(javaType);
     @SuppressWarnings("unchecked")
     Class<? extends TypeHandler<?>> typeHandlerClass = (Class<? extends TypeHandler<?>>) resolveClass(typeHandler);

src/main/java/org/apache/ibatis/executor/resultset/NestedResultSetHandler.java

@@ -156,13 +156,14 @@ private boolean applyNestedResultMappings(ResultSet rs, ResultMap resultMap, Met
           final CacheKey absoluteKey = createAbsoluteKey(nestedResultMap, rs, columnPrefix, resultColumnCache);
           final CacheKey combinedKey = getCombinedKey(absoluteKey, parentRowKey);
           final boolean knownValue = objectCache.containsKey(combinedKey);
+          final boolean isAncestor = ancestorCache.containsKey(absoluteKey);
           Object rowValue = getRowValue(rs, nestedResultMap, combinedKey, absoluteKey, columnPrefix, resultColumnCache);          
           if (!knownValue && rowValue != null && anyNotNullColumnHasValue(resultMapping, columnPrefix, rs)) {
             if (collectionProperty != null) {
               final MetaObject targetMetaObject = configuration.newMetaObject(collectionProperty);
               targetMetaObject.add(rowValue);
             } else {
-              if (!parentIsNew && !ancestorCache.containsKey(absoluteKey)) { 
+              if (!parentIsNew && !isAncestor) { 
                 throw new ExecutorException("Trying to set a 1 to 1 child element twice  for '" + resultMapping.getProperty() + "'. Check your id properties.");
               }
               metaObject.setValue(resultMapping.getProperty(), rowValue);

src/main/java/org/apache/ibatis/mapping/ResultFlag.java

@@ -16,5 +16,5 @@
 package org.apache.ibatis.mapping;
 
 public enum ResultFlag {
-  ID, CONSTRUCTOR, COLLECTION, ASSOCIATION
+  ID, CONSTRUCTOR
 }