forked from mybatis/mybatis-3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Avoid invoking equals/hashCode when assigning generated keys
When detecting single parameter case, it now checks parameter name instead of equality of the parameter objects. This should fix mybatisgh-1719. A caveat : when there is only one parameter and its name is 'param2' (for whatever reason), `keyProperty` must include the parameter name i.e. `keyProperty="param2.xx"`.
- Loading branch information
Showing
6 changed files
with
138 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
src/test/java/org/apache/ibatis/submitted/keygen/NpeCountry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/** | ||
* Copyright 2009-2019 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.ibatis.submitted.keygen; | ||
|
||
// See gh-1719 | ||
public class NpeCountry { | ||
private Integer id; | ||
private String countryname; | ||
private String countrycode; | ||
|
||
public NpeCountry() { | ||
} | ||
|
||
public NpeCountry(String countryname, String countrycode) { | ||
this.countryname = countryname; | ||
this.countrycode = countrycode; | ||
} | ||
|
||
public Integer getId() { | ||
return id; | ||
} | ||
|
||
public void setId(Integer id) { | ||
this.id = id; | ||
} | ||
|
||
public String getCountryname() { | ||
return countryname; | ||
} | ||
|
||
public void setCountryname(String countryname) { | ||
this.countryname = countryname; | ||
} | ||
|
||
public String getCountrycode() { | ||
return countrycode; | ||
} | ||
|
||
public void setCountrycode(String countrycode) { | ||
this.countrycode = countrycode; | ||
} | ||
|
||
@Override | ||
public boolean equals(Object o) { | ||
if (this == o) { | ||
return true; | ||
} | ||
if (o == null || getClass() != o.getClass()) { | ||
return false; | ||
} | ||
NpeCountry other = (NpeCountry) o; | ||
// throws NPE when id is null | ||
return id.equals(other.id); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
// throws NPE when id is null | ||
return id.hashCode(); | ||
} | ||
} |