Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mybatis 3.2.7 #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
665 changes: 334 additions & 331 deletions pom.xml

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/main/java/org/apache/ibatis/annotations/Arg.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Arg {
boolean id() default false;
boolean id() default false;

String column() default "";
String column() default "";

Class<?> javaType() default void.class;
Class<?> javaType() default void.class;

JdbcType jdbcType() default JdbcType.UNDEFINED;
JdbcType jdbcType() default JdbcType.UNDEFINED;

Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;
Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;

String select() default "";
String select() default "";

String resultMap() default "";
String resultMap() default "";
}
10 changes: 5 additions & 5 deletions src/main/java/org/apache/ibatis/annotations/CacheNamespace.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface CacheNamespace {
Class<? extends org.apache.ibatis.cache.Cache> implementation() default PerpetualCache.class;
Class<? extends org.apache.ibatis.cache.Cache> implementation() default PerpetualCache.class;

Class<? extends org.apache.ibatis.cache.Cache> eviction() default LruCache.class;
Class<? extends org.apache.ibatis.cache.Cache> eviction() default LruCache.class;

long flushInterval() default 3600000;
long flushInterval() default 3600000;

int size() default 1000;
int size() default 1000;

boolean readWrite() default true;
boolean readWrite() default true;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface CacheNamespaceRef {
Class<?> value();
Class<?> value();
}
8 changes: 4 additions & 4 deletions src/main/java/org/apache/ibatis/annotations/Case.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Case {
String value();
String value();

Class<?> type();
Class<?> type();

Result[] results() default {};
Result[] results() default {};

Arg[] constructArgs() default {};
Arg[] constructArgs() default {};
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface ConstructorArgs {
Arg[] value() default {};
Arg[] value() default {};
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Delete.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Delete {
String[] value();
String[] value();
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface DeleteProvider {
Class<?> type();
Class<?> type();

String method();
String method();
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Insert.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Insert {
String[] value();
String[] value();
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface InsertProvider {
Class<?> type();
Class<?> type();

String method();
String method();
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Lang.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Lang {
Class<?> value();
Class<?> value();
}
8 changes: 4 additions & 4 deletions src/main/java/org/apache/ibatis/annotations/Many.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Many {
String select() default "";
FetchType fetchType() default FetchType.DEFAULT;
String select() default "";

FetchType fetchType() default FetchType.DEFAULT;

}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/MapKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface MapKey {
String value();
String value();
}
6 changes: 3 additions & 3 deletions src/main/java/org/apache/ibatis/annotations/One.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface One {
String select() default "";
FetchType fetchType() default FetchType.DEFAULT;
String select() default "";

FetchType fetchType() default FetchType.DEFAULT;

}
18 changes: 9 additions & 9 deletions src/main/java/org/apache/ibatis/annotations/Options.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Options {
boolean useCache() default true;
boolean useCache() default true;

boolean flushCache() default false;
boolean flushCache() default false;

ResultSetType resultSetType() default ResultSetType.FORWARD_ONLY;
ResultSetType resultSetType() default ResultSetType.FORWARD_ONLY;

StatementType statementType() default StatementType.PREPARED;
StatementType statementType() default StatementType.PREPARED;

int fetchSize() default -1;
int fetchSize() default -1;

int timeout() default -1;
int timeout() default -1;

boolean useGeneratedKeys() default false;
boolean useGeneratedKeys() default false;

String keyProperty() default "id";
String keyProperty() default "id";

String keyColumn() default "";
String keyColumn() default "";
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Param.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PARAMETER)
public @interface Param {
String value();
String value();
}
16 changes: 8 additions & 8 deletions src/main/java/org/apache/ibatis/annotations/Result.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Result {
boolean id() default false;
boolean id() default false;

String column() default "";
String column() default "";

String property() default "";
String property() default "";

Class<?> javaType() default void.class;
Class<?> javaType() default void.class;

JdbcType jdbcType() default JdbcType.UNDEFINED;
JdbcType jdbcType() default JdbcType.UNDEFINED;

Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;
Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;

One one() default @One;
One one() default @One;

Many many() default @Many;
Many many() default @Many;
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/ResultMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface ResultMap {
String[] value();
String[] value();
}
6 changes: 3 additions & 3 deletions src/main/java/org/apache/ibatis/annotations/ResultType.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
* ResultHandler. Those methods must have void return type, so
* this annotation can be used to tell MyBatis what kind of object
* it should build for each row.
*
* @since 3.2.0
*
* @author Jeff Butler
* @since 3.2.0
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface ResultType {
Class<?> value();
Class<?> value();
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Results.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Results {
Result[] value() default {};
Result[] value() default {};
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Select.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Select {
String[] value();
String[] value();
}
12 changes: 6 additions & 6 deletions src/main/java/org/apache/ibatis/annotations/SelectKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface SelectKey {
String[] statement();
String[] statement();

String keyProperty();
String keyProperty();

String keyColumn() default "";
String keyColumn() default "";

boolean before();
boolean before();

Class<?> resultType();
Class<?> resultType();

StatementType statementType() default StatementType.PREPARED;
StatementType statementType() default StatementType.PREPARED;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface SelectProvider {
Class<?> type();
Class<?> type();

String method();
String method();
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface TypeDiscriminator {
String column();
String column();

Class<?> javaType() default void.class;
Class<?> javaType() default void.class;

JdbcType jdbcType() default JdbcType.UNDEFINED;
JdbcType jdbcType() default JdbcType.UNDEFINED;

Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;
Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;

Case[] cases();
Case[] cases();
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/annotations/Update.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface Update {
String[] value();
String[] value();
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface UpdateProvider {
Class<?> type();
Class<?> type();

String method();
String method();
}
26 changes: 13 additions & 13 deletions src/main/java/org/apache/ibatis/binding/BindingException.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
*/
public class BindingException extends PersistenceException {

private static final long serialVersionUID = 4300802238789381562L;
private static final long serialVersionUID = 4300802238789381562L;

public BindingException() {
super();
}
public BindingException() {
super();
}

public BindingException(String message) {
super(message);
}
public BindingException(String message) {
super(message);
}

public BindingException(String message, Throwable cause) {
super(message, cause);
}
public BindingException(String message, Throwable cause) {
super(message, cause);
}

public BindingException(Throwable cause) {
super(cause);
}
public BindingException(Throwable cause) {
super(cause);
}
}
Loading