Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3716] trunk/openutils-bshd5/src/test/java/it/ openutils/hibernate/test/model
|
From: <gca...@us...> - 2011-12-01 09:10:46
|
Revision: 3716
http://openutils.svn.sourceforge.net/openutils/?rev=3716&view=rev
Author: gcatania
Date: 2011-12-01 09:10:37 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
BSHD-2 cleanup test model objects
Modified Paths:
--------------
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -27,8 +27,6 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
@@ -40,7 +38,6 @@
{
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
@Column(nullable = false, length = 50)
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -29,8 +29,6 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
@@ -43,7 +41,6 @@
{
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
@ManyToOne
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -126,7 +126,6 @@
int result = 1;
result = prime * result + ((capitalization == null) ? 0 : capitalization.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((models == null) ? 0 : models.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
return result;
}
@@ -172,17 +171,6 @@
{
return false;
}
- if (models == null)
- {
- if (other.models != null)
- {
- return false;
- }
- }
- else if (!models.equals(other.models))
- {
- return false;
- }
if (name == null)
{
if (other.name != null)
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -28,6 +28,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.ManyToOne;
/**
@@ -40,6 +41,9 @@
@Id
private Long id;
+ @ManyToOne
+ private CarMaker make;
+
@Column
private String name;
@@ -63,6 +67,22 @@
}
/**
+ * @return the make
+ */
+ public CarMaker getMake()
+ {
+ return make;
+ }
+
+ /**
+ * @param make the make to set
+ */
+ public void setMake(CarMaker make)
+ {
+ this.make = make;
+ }
+
+ /**
* @return the name
*/
public String getName()
@@ -103,6 +123,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((make == null) ? 0 : make.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((year == null) ? 0 : year.hashCode());
return result;
@@ -138,6 +159,17 @@
{
return false;
}
+ if (make == null)
+ {
+ if (other.make != null)
+ {
+ return false;
+ }
+ }
+ else if (!make.equals(other.make))
+ {
+ return false;
+ }
if (name == null)
{
if (other.name != null)
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -35,10 +35,14 @@
public class CurrencyAmount
{
- private final double amount;
+ private double amount;
- private final String currency;
+ private String currency;
+ public CurrencyAmount()
+ {
+ }
+
public CurrencyAmount(double amount, String currency)
{
super();
@@ -114,4 +118,20 @@
return true;
}
+ /**
+ * @param amount the amount to set
+ */
+ public void setAmount(double amount)
+ {
+ this.amount = amount;
+ }
+
+ /**
+ * @param currency the currency to set
+ */
+ public void setCurrency(String currency)
+ {
+ this.currency = currency;
+ }
+
}
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -87,7 +87,6 @@
{
final int prime = 31;
int result = super.hashCode();
- result = prime * result + ((cars == null) ? 0 : cars.hashCode());
result = prime * result + ((totalValueOfCars == null) ? 0 : totalValueOfCars.hashCode());
return result;
}
@@ -111,17 +110,6 @@
return false;
}
Owner other = (Owner) obj;
- if (cars == null)
- {
- if (other.cars != null)
- {
- return false;
- }
- }
- else if (!cars.equals(other.cars))
- {
- return false;
- }
if (totalValueOfCars == null)
{
if (other.totalValueOfCars != null)
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2011-12-01 08:34:48 UTC (rev 3715)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2011-12-01 09:10:37 UTC (rev 3716)
@@ -33,8 +33,6 @@
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
@@ -51,7 +49,6 @@
{
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
@Embedded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
