#594 fix. Misspelled methods.

mybatis · Mar 2, 2016 · fa0e39b · fa0e39b
1 parent 37163bc
commit fa0e39b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java b/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java
@@ -286,7 +286,7 @@ public MappedStatement addMappedStatement(
         .databaseId(databaseId)
         .lang(lang)
         .resultOrdered(resultOrdered)
-        .resulSets(resultSets)
+        .resultSets(resultSets)
         .resultMaps(getStatementResultMaps(resultMap, resultType, id))
         .resultSetType(resultSetType)
         .flushCacheRequired(valueOrDefault(flushCache, !isSelect))

diff --git a/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java b/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
@@ -368,14 +368,14 @@ private ResultMapping buildResultMappingFromContext(XNode context, Class<?> resu
     String notNullColumn = context.getStringAttribute("notNullColumn");
     String columnPrefix = context.getStringAttribute("columnPrefix");
     String typeHandler = context.getStringAttribute("typeHandler");
-    String resulSet = context.getStringAttribute("resultSet");
+    String resultSet = context.getStringAttribute("resultSet");
     String foreignColumn = context.getStringAttribute("foreignColumn");
     boolean lazy = "lazy".equals(context.getStringAttribute("fetchType", configuration.isLazyLoadingEnabled() ? "lazy" : "eager"));
     Class<?> javaTypeClass = resolveClass(javaType);
     @SuppressWarnings("unchecked")
     Class<? extends TypeHandler<?>> typeHandlerClass = (Class<? extends TypeHandler<?>>) resolveClass(typeHandler);
     JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
-    return builderAssistant.buildResultMapping(resultType, property, column, javaTypeClass, jdbcTypeEnum, nestedSelect, nestedResultMap, notNullColumn, columnPrefix, typeHandlerClass, flags, resulSet, foreignColumn, lazy);
+    return builderAssistant.buildResultMapping(resultType, property, column, javaTypeClass, jdbcTypeEnum, nestedSelect, nestedResultMap, notNullColumn, columnPrefix, typeHandlerClass, flags, resultSet, foreignColumn, lazy);
   }
 
   private String processNestedResultMappings(XNode context, List<ResultMapping> resultMappings) throws Exception {

diff --git a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -186,7 +186,7 @@ public List<Object> handleResultSets(Statement stmt) throws SQLException {
       resultSetCount++;
     }
 
-    String[] resultSets = mappedStatement.getResulSets();
+    String[] resultSets = mappedStatement.getResultSets();
     if (resultSets != null) {
       while (rsw != null && resultSetCount < resultSets.length) {
         ResultMapping parentMapping = nextResultMaps.get(resultSets[resultSetCount]);

diff --git a/src/main/java/org/apache/ibatis/mapping/MappedStatement.java b/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
@@ -168,6 +168,13 @@ public Builder lang(LanguageDriver driver) {
       return this;
     }
 
+    public Builder resultSets(String resultSet) {
+      mappedStatement.resultSets = delimitedStringtoArray(resultSet);
+      return this;
+    }
+
+    /** @deprecated Use {@link #resultSets} */
+    @Deprecated
     public Builder resulSets(String resultSet) {
       mappedStatement.resultSets = delimitedStringtoArray(resultSet);
       return this;
@@ -271,6 +278,12 @@ public LanguageDriver getLang() {
     return lang;
   }
 
+  public String[] getResultSets() {
+    return resultSets;
+  }
+
+  /** @deprecated Use {@link #getResultSets()} */
+  @Deprecated
   public String[] getResulSets() {
     return resultSets;
   }