Author: cbegin
Date: Tue May 19 05:05:06 2009
New Revision: 776189
URL: http://svn.apache.org/viewvc?rev=776189&view=rev
Log:
Removed commented-out code after annotation refactoring.
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Arg.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Case.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Delete.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Insert.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/InsertProvider.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Many.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/One.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Options.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Result.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Results.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Select.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/SelectProvider.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/TypeDiscriminator.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Update.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Arg.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Arg.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Arg.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Arg.java
Tue May 19 05:05:06 2009
@@ -8,8 +8,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Arg {
+...@target(ElementType.METHOD)
+public @interface Arg {
public abstract boolean id() default false;
public abstract String column() default "";
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomain.java
Tue May 19 05:05:06 2009
@@ -9,8 +9,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.TYPE)
- public @interface CacheDomain {
+...@target(ElementType.TYPE)
+public @interface CacheDomain {
public abstract Class<? extends org.apache.ibatis.cache.Cache>
implementation() default PerpetualCache.class;
public abstract Class<? extends org.apache.ibatis.cache.Cache> eviction()
default LruCache.class;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/CacheDomainRef.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.TYPE)
- public @interface CacheDomainRef {
+...@target(ElementType.TYPE)
+public @interface CacheDomainRef {
public abstract Class value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Case.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Case.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Case.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Case.java
Tue May 19 05:05:06 2009
@@ -6,8 +6,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Case {
+...@target(ElementType.METHOD)
+public @interface Case {
public abstract String value();
public abstract Class type();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface ConstructorArgs {
+...@target(ElementType.METHOD)
+public @interface ConstructorArgs {
public abstract Arg[] value() default {};
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Delete.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Delete.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Delete.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Delete.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Delete {
+...@target(ElementType.METHOD)
+public @interface Delete {
public abstract String[] value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/DeleteProvider.java
Tue May 19 05:05:06 2009
@@ -6,8 +6,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface DeleteProvider {
+...@target(ElementType.METHOD)
+public @interface DeleteProvider {
public abstract Class type();
public abstract String method();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Insert.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Insert.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Insert.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Insert.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Insert {
+...@target(ElementType.METHOD)
+public @interface Insert {
public abstract String[] value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/InsertProvider.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/InsertProvider.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/InsertProvider.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/InsertProvider.java
Tue May 19 05:05:06 2009
@@ -6,8 +6,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface InsertProvider {
+...@target(ElementType.METHOD)
+public @interface InsertProvider {
public abstract Class type();
public abstract String method();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Many.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Many.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Many.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Many.java
Tue May 19 05:05:06 2009
@@ -6,13 +6,12 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Many {
+...@target(ElementType.METHOD)
+public @interface Many {
public abstract Class javaType();
public abstract String select() default "";
public abstract ConstructorArgs constructor() default @ConstructorArgs;
-// public abstract Results results() default @Results;
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/One.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/One.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/One.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/One.java
Tue May 19 05:05:06 2009
@@ -6,11 +6,10 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface One {
+...@target(ElementType.METHOD)
+public @interface One {
public abstract String select() default "";
public abstract ConstructorArgs constructor() default @ConstructorArgs;
-// public abstract Results results() default @Results;
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Options.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Options.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Options.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Options.java
Tue May 19 05:05:06 2009
@@ -9,8 +9,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Options {
+...@target(ElementType.METHOD)
+public @interface Options {
public abstract boolean useCache() default true;
public abstract boolean flushCache() default false;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Result.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Result.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Result.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Result.java
Tue May 19 05:05:06 2009
@@ -8,8 +8,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Result {
+...@target(ElementType.METHOD)
+public @interface Result {
public abstract boolean id() default false;
public abstract String column() default "";
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Results.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Results.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Results.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Results.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Results {
+...@target(ElementType.METHOD)
+public @interface Results {
public abstract Result[] value() default {};
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Select.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Select.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Select.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Select.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Select {
+...@target(ElementType.METHOD)
+public @interface Select {
public abstract String[] value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/SelectProvider.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/SelectProvider.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/SelectProvider.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/SelectProvider.java
Tue May 19 05:05:06 2009
@@ -6,8 +6,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface SelectProvider {
+...@target(ElementType.METHOD)
+public @interface SelectProvider {
public abstract Class type();
public abstract String method();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/TypeDiscriminator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/TypeDiscriminator.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/TypeDiscriminator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/TypeDiscriminator.java
Tue May 19 05:05:06 2009
@@ -8,8 +8,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface TypeDiscriminator {
+...@target(ElementType.METHOD)
+public @interface TypeDiscriminator {
public abstract String column();
public abstract Class javaType() default void.class;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Update.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Update.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Update.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/Update.java
Tue May 19 05:05:06 2009
@@ -6,7 +6,7 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface Update {
+...@target(ElementType.METHOD)
+public @interface Update {
public abstract String[] value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
Tue May 19 05:05:06 2009
@@ -6,8 +6,8 @@
import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- public @interface UpdateProvider {
+...@target(ElementType.METHOD)
+public @interface UpdateProvider {
public abstract Class type();
public abstract String method();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
Tue May 19 05:05:06 2009
@@ -7,7 +7,6 @@
import org.apache.ibatis.executor.keygen.*;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.reflection.MetaClass;
import org.apache.ibatis.type.JdbcType;
import java.io.*;
@@ -90,10 +89,9 @@
}
private void applyResultMap(String resultMapId, Class returnType, Arg[]
args, Result[] results, TypeDiscriminator discriminator) {
- applyNestedResultMaps(resultMapId, returnType, results);
sequentialBuilder.resultMapStart(resultMapId, returnType, null);
applyConstructorArgs(args);
- applyResults(resultMapId, results);
+ applyResults(results);
applyDiscriminator(resultMapId, discriminator);
sequentialBuilder.resultMapEnd();
createDiscriminatorResultMaps(resultMapId, discriminator);
@@ -117,7 +115,7 @@
result.javaType() == void.class ? null : result.javaType(),
result.jdbcType() == JdbcType.UNDEFINED ? null :
result.jdbcType(),
hasNestedSelect(result) ? nestedSelectId(result) : null,
- hasCollectionOrAssociation(result) ?
nestedResultMapId(resultMapId, result) : null,
+ null,
result.typeHandler() == void.class ? null : result.typeHandler(),
flags);
}
@@ -144,26 +142,6 @@
}
}
- private void applyNestedResultMaps(String resultMapId, Class returnType,
Result[] results) {
- if (results != null) {
- for (Result result : results) {
- ensureHasOnlyCollectionOrResultNotBoth(result);
- if (hasCollection(result)) {
-// Class propertyType = result.many().javaType();
-// Arg[] nestedArgs = result.many().constructor().value();
-// Result[] nestedResults = result.many().results().value();
-// applyResultMap(nestedResultMapId(resultMapId, result),
propertyType, nestedArgs, nestedResults, null);
- }
- if (hasAssociation(result)) {
-// Class propertyType =
MetaClass.forClass(returnType).getSetterType(result.property());
-// Arg[] nestedArgs = result.one().constructor().value();
-// Result[] nestedResults = result.one().results().value();
-// applyResultMap(nestedResultMapId(resultMapId, result),
propertyType, nestedArgs, nestedResults, null);
- }
- }
- }
- }
-
private void parseStatement(Method method) {
Configuration configuration = sequentialBuilder.getConfiguration();
SqlSource sqlSource = getSqlSourceFromAnnotations(method);
@@ -291,7 +269,7 @@
return null;
}
- private void applyResults(String resultMapId, Result[] results) {
+ private void applyResults(Result[] results) {
if (results.length > 0) {
for (Result result : results) {
ArrayList<ResultFlag> flags = new ArrayList<ResultFlag>();
@@ -302,7 +280,7 @@
result.javaType() == void.class ? null : result.javaType(),
result.jdbcType() == JdbcType.UNDEFINED ? null : result.jdbcType(),
hasNestedSelect(result) ? nestedSelectId(result) : null,
- hasCollectionOrAssociation(result) ?
nestedResultMapId(resultMapId, result) : null,
+ null,
result.typeHandler() == void.class ? null : result.typeHandler(),
flags);
}
@@ -344,30 +322,6 @@
}
}
- private String nestedResultMapId(String resultMapId, Result result) {
- return resultMapId + "." + result.property();
- }
-
- private void ensureHasOnlyCollectionOrResultNotBoth(Result result) {
- if (hasCollection(result) && hasAssociation(result)) {
- throw new BindingException("On each result you can only use an
association or a collection, not both!");
- }
- }
-
- private boolean hasCollectionOrAssociation(Result result) {
- return hasCollection(result) || hasAssociation(result);
- }
-
- private boolean hasAssociation(Result result) {
- return result.one().constructor().value().length > 1;
-// || result.one().results().value().length > 1;
- }
-
- private boolean hasCollection(Result result) {
- return result.many().constructor().value().length > 1;
-// || result.many().results().value().length > 1;
- }
-
private Result[] resultsIf(Results results) {
return results == null ? new Result[0] : results.value();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BindingTest.java
Tue May 19 05:05:06 2009
@@ -138,26 +138,6 @@
}
}
-// @Test
-// public void shouldSelectBlogWithAssociations() {
-// SqlSession session = sqlSessionFactory.openSession();
-// try {
-// BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
-// List<Blog> blogs = mapper.selectBlogWithAssociations(1);
-// assertEquals(1, blogs.size());
-// Blog blog = blogs.get(0);
-// assertEquals(2, blog.getPosts().size());
-// Post firstPost = blog.getPosts().get(0);
-// assertEquals(3, firstPost.getTags().size());
-// assertEquals(2, firstPost.getComments().size());
-// Post secondPost = blog.getPosts().get(1);
-// assertEquals(1, secondPost.getTags().size());
-// assertEquals(0, secondPost.getComments().size());
-// } finally {
-// session.close();
-// }
-// }
-
@Test
public void shouldExecuteBoundSelectOneBlogStatement() {
SqlSession session = sqlSessionFactory.openSession();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java?rev=776189&r1=776188&r2=776189&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java
Tue May 19 05:05:06 2009
@@ -79,74 +79,4 @@
//======================================================
-// @Results({
-// @Result(id = true, property = "id", column = "blog_id"),
-// @Result(property = "title", column = "blog_title"),
-// @Result(property = "author", column = "author_id", one = @One(
-// results = @Results({
-// @Result(id = true, property = "id", column = "author_id"),
-// @Result(property = "username", column = "author_username"),
-// @Result(property = "email", column = "author_email")
-// }))),
-// @Result(property = "posts", column = "post_id", many = @Many(
-// javaType = Post.class,
-// results = @Results({
-// @Result(id = true, property = "id", column = "post_id"),
-// @Result(property = "subject", column = "post_subject"),
-// @Result(property = "body", column = "post_body"),
-// @Result(property = "section", column = "post_section"),
-// @Result(id = true, property = "author.id", column = "author_id"),
-// @Result(property = "author.username", column = "author_username"),
-// @Result(property = "author.email", column = "author_email"),
-// @Result(property = "createdOn", column = "post_created_on")
-// , @Result(property = "tags", column = "tag_id", many = @Many(
-// javaType = Tag.class,
-// results = @Results({
-// @Result(id = true, property = "id", column = "tag_id"),
-// @Result(property = "name", column = "tag_name")
-// })))
-// , @Result(property = "comments", column = "comment_id", many =
@Many(
-// javaType = Comment.class,
-// results = @Results({
-// @Result(id = true, property = "id", column = "comment_id"),
-// @Result(property = "name", column = "comment_name"),
-// @Result(property = "comment", column = "comment_text")
-// })))
-// })))
-// })
-// @Select("select" +
-// " B.id as blog_id," +
-// " B.title as blog_title," +
-// " B.author_id as blog_author_id," +
-// " A.id as author_id," +
-// " A.username as author_username," +
-// " A.password as author_password," +
-// " A.email as author_email," +
-// " A.bio as author_bio," +
-// " A.favourite_section as author_favourite_section," +
-// " P.id as post_id," +
-// " P.blog_id as post_blog_id," +
-// " P.author_id as post_author_id," +
-// " P.created_on as post_created_on," +
-// " P.section as post_section," +
-// " P.subject as post_subject," +
-// " P.draft as draft," +
-// " P.body as post_body," +
-// " C.id as comment_id," +
-// " C.post_id as comment_post_id," +
-// " C.name as comment_name," +
-// " C.comment as comment_text," +
-// " T.id as tag_id," +
-// " T.name as tag_name" +
-// " from Blog B" +
-// " left outer join Author A on B.author_id = A.id" +
-// " left outer join Post P on B.id = P.blog_id" +
-// " left outer join Comment C on P.id = C.post_id" +
-// " left outer join Post_Tag PT on PT.post_id = P.id" +
-// " left outer join Tag T on PT.tag_id = T.id" +
-// " where B.id = #{id}")
-// List<Blog> selectBlogWithAssociations(int id);
-
- //======================================================
-
}
