diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java index 1a412946..3ccb5c9b 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/DummyDistinguishedNameConsumer.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ldap.itest.core; import org.springframework.ldap.core.DistinguishedName; diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java index 8aa56e5e..0db97b83 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapPathAware.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ldap.itest.core.support; import org.springframework.ldap.core.DistinguishedName; diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java index d317bffb..5e3fa48a 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/filter/DummyFilterConsumer.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ldap.itest.filter; import org.springframework.ldap.filter.Filter; diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java index c98f15a9..0d1828b5 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyException.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ldap.itest.transaction.compensating.manager; public class DummyException extends RuntimeException { diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java index f654ccc3..dc940563 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/DummyServiceImpl.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ldap.itest.transaction.compensating.manager; public class DummyServiceImpl { diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java index 25e41593..1893fb6f 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java @@ -68,7 +68,8 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { ctx.setAttributeValue("sn", lastname); ctx.setAttributeValue("description", description); this.ldapTemplate.bind(dn, ctx, null); - this.jdbcTemplate.update("insert into PERSON values(?, ?, ?)", new Object[] { fullname, lastname, description }); + this.jdbcTemplate.update("insert into PERSON values(?, ?, ?)", + new Object[] { fullname, lastname, description }); } /* diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java index 4ce60f59..130734c9 100755 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/transaction/compensating/manager/hibernate/OrgPerson.java @@ -84,6 +84,60 @@ public class OrgPerson { this.description = description; } + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final OrgPerson other = (OrgPerson) obj; + if (this.company == null) { + if (other.company != null) { + return false; + } + } + else if (!this.company.equals(other.company)) { + return false; + } + if (this.country == null) { + if (other.country != null) { + return false; + } + } + else if (!this.country.equals(other.country)) { + return false; + } + if (this.description == null) { + if (other.description != null) { + return false; + } + } + else if (!this.description.equals(other.description)) { + return false; + } + if (this.fullname == null) { + if (other.fullname != null) { + return false; + } + } + else if (!this.fullname.equals(other.fullname)) { + return false; + } + if (this.lastname == null) { + if (other.lastname != null) { + return false; + } + } + else if (!this.lastname.equals(other.lastname)) { + return false; + } + return true; + } + public int hashCode() { final int prime = 31; int result = 1; @@ -95,45 +149,4 @@ public class OrgPerson { return result; } - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final OrgPerson other = (OrgPerson) obj; - if (this.company == null) { - if (other.company != null) - return false; - } - else if (!this.company.equals(other.company)) - return false; - if (this.country == null) { - if (other.country != null) - return false; - } - else if (!this.country.equals(other.country)) - return false; - if (this.description == null) { - if (other.description != null) - return false; - } - else if (!this.description.equals(other.description)) - return false; - if (this.fullname == null) { - if (other.fullname != null) - return false; - } - else if (!this.fullname.equals(other.fullname)) - return false; - if (this.lastname == null) { - if (other.lastname != null) - return false; - } - else if (!this.lastname.equals(other.lastname)) - return false; - return true; - } - }