You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/08/15 07:17:57 UTC
svn commit: r804437 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src:
main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
test/java/domain/blog/Author.java test/java/domain/blog/ImmutableAuthor.java
Author: cbegin
Date: Sat Aug 15 05:17:56 2009
New Revision: 804437
URL: http://svn.apache.org/viewvc?rev=804437&view=rev
Log:
JIRA-624 Setter is expected if column name is same as property name. -- Fixed.
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Author.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/ImmutableAuthor.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?rev=804437&r1=804436&r2=804437&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java Sat Aug 15 05:17:56 2009
@@ -158,7 +158,7 @@
columnLabel = columnLabel.toUpperCase();
String propName = metaResultObject.findProperty(columnLabel);
colSet.add(columnLabel);
- if (propName != null) {
+ if (propName != null && metaResultObject.hasSetter(propName)) {
propSet.add(propName);
Class javaType = metaResultObject.getSetterType(propName);
TypeHandler typeHandler = typeHandlerRegistry.getTypeHandler(javaType);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Author.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Author.java?rev=804437&r1=804436&r2=804437&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Author.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/Author.java Sat Aug 15 05:17:56 2009
@@ -1,17 +1,31 @@
package domain.blog;
-public class Author extends ImmutableAuthor {
+import java.io.Serializable;
+
+public class Author implements Serializable {
+
+ protected int id;
+ protected String username;
+ protected String password;
+ protected String email;
+ protected String bio;
+ protected Section favouriteSection;
public Author() {
- super(-1, null, null, null, null, null);
+ this(-1, null, null, null, null, null);
}
public Author(Integer id, String username, String password, String email, String bio, Section section) {
- super(id, username, password, email, bio, section);
+ this.id = id;
+ this.username = username;
+ this.password = password;
+ this.email = email;
+ this.bio = bio;
+ this.favouriteSection = section;
}
public Author(Integer id) {
- super(id, null, null, null, null, null);
+ this(id, null, null, null, null, null);
}
public void setId(int id) {
@@ -38,6 +52,58 @@
this.favouriteSection = favouriteSection;
}
+ public int getId() {
+ return id;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public String getBio() {
+ return bio;
+ }
+
+ public Section getFavouriteSection() {
+ return favouriteSection;
+ }
+
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof Author)) return false;
+
+ Author author = (Author) o;
+
+ if (id != author.id) return false;
+ if (bio != null ? !bio.equals(author.bio) : author.bio != null) return false;
+ if (email != null ? !email.equals(author.email) : author.email != null) return false;
+ if (password != null ? !password.equals(author.password) : author.password != null) return false;
+ if (username != null ? !username.equals(author.username) : author.username != null) return false;
+ if (favouriteSection != null ? !favouriteSection.equals(author.favouriteSection) : author.favouriteSection != null)
+ return false;
+
+ return true;
+ }
+
+ public int hashCode() {
+ int result;
+ result = id;
+ result = 31 * result + (username != null ? username.hashCode() : 0);
+ result = 31 * result + (password != null ? password.hashCode() : 0);
+ result = 31 * result + (email != null ? email.hashCode() : 0);
+ result = 31 * result + (bio != null ? bio.hashCode() : 0);
+ result = 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0);
+ return result;
+ }
+
public String toString() {
return "Author : " + id + " : " + username + " : " + email;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/ImmutableAuthor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/ImmutableAuthor.java?rev=804437&r1=804436&r2=804437&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/ImmutableAuthor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/ImmutableAuthor.java Sat Aug 15 05:17:56 2009
@@ -3,12 +3,12 @@
import java.io.Serializable;
public class ImmutableAuthor implements Serializable {
- protected int id;
- protected String username;
- protected String password;
- protected String email;
- protected String bio;
- protected Section favouriteSection;
+ protected final int id;
+ protected final String username;
+ protected final String password;
+ protected final String email;
+ protected final String bio;
+ protected final Section favouriteSection;
public ImmutableAuthor(Integer id, String username, String password, String email, String bio, Section section) {
this.id = id;