Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3723] trunk/openutils-bshd5/src/test/java/it/ openutils/hibernate/test/model
|
From: <gca...@us...> - 2011-12-02 14:38:39
|
Revision: 3723
http://openutils.svn.sourceforge.net/openutils/?rev=3723&view=rev
Author: gcatania
Date: 2011-12-02 14:38:27 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
BSHD-2 various test model fixes, improvements
Modified Paths:
--------------
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/Designer.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.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/Car.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java 2011-12-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -27,6 +27,7 @@
import java.util.Calendar;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -46,13 +47,10 @@
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
- @ManyToOne
- private final CarModel model;
+ @ManyToOne(cascade = CascadeType.ALL)
+ private CarModel model;
- @ManyToOne
- private final CarMaker maker;
-
- @ManyToOne
+ @ManyToOne(cascade = CascadeType.ALL)
private Owner owner;
@Column
@@ -61,12 +59,6 @@
@Column
private CurrencyAmount marketValue;
- public Car(Calendar registrationDate, CarModel model, CarMaker maker)
- {
- this.model = model;
- this.maker = maker;
- }
-
/**
* @return the id
*/
@@ -140,11 +132,11 @@
}
/**
- * @return the maker
+ * @param model the model to set
*/
- public CarMaker getMaker()
+ public void setModel(CarModel model)
{
- return maker;
+ this.model = model;
}
/**
@@ -156,7 +148,6 @@
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((maker == null) ? 0 : maker.hashCode());
result = prime * result + ((marketValue == null) ? 0 : marketValue.hashCode());
result = prime * result + ((model == null) ? 0 : model.hashCode());
result = prime * result + ((owner == null) ? 0 : owner.hashCode());
@@ -194,17 +185,6 @@
{
return false;
}
- if (maker == null)
- {
- if (other.maker != null)
- {
- return false;
- }
- }
- else if (!maker.equals(other.maker))
- {
- return false;
- }
if (marketValue == null)
{
if (other.marketValue != null)
@@ -252,4 +232,26 @@
return true;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder
+ .append("Car [id=")
+ .append(id)
+ .append(", model=")
+ .append(model)
+ .append(", owner=")
+ .append(owner)
+ .append(", registrationDate=")
+ .append(registrationDate)
+ .append(", marketValue=")
+ .append(marketValue)
+ .append("]");
+ return builder.toString();
+ }
+
}
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-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -27,10 +27,9 @@
import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
@@ -43,8 +42,7 @@
{
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private Long id;
+ private String code;
@Column
private String name;
@@ -52,23 +50,23 @@
@Column
private CurrencyAmount capitalization;
- @OneToMany
+ @OneToMany(cascade = CascadeType.ALL, mappedBy = "make")
private List<CarModel> models;
/**
- * @return the id
+ * @return the code
*/
- public Long getId()
+ public String getCode()
{
- return id;
+ return code;
}
/**
- * @param id the id to set
+ * @param code the code to set
*/
- public void setId(Long id)
+ public void setCode(String code)
{
- this.id = id;
+ this.code = code;
}
/**
@@ -128,7 +126,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((capitalization == null) ? 0 : capitalization.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((code == null) ? 0 : code.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
return result;
}
@@ -163,14 +161,14 @@
{
return false;
}
- if (id == null)
+ if (code == null)
{
- if (other.id != null)
+ if (other.code != null)
{
return false;
}
}
- else if (!id.equals(other.id))
+ else if (!code.equals(other.code))
{
return false;
}
@@ -188,4 +186,24 @@
return true;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder
+ .append("CarMaker [id=")
+ .append(code)
+ .append(", name=")
+ .append(name)
+ .append(", capitalization=")
+ .append(capitalization)
+ .append(", models=")
+ .append(models)
+ .append("]");
+ return builder.toString();
+ }
+
}
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-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -25,6 +25,7 @@
package it.openutils.hibernate.test.model;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -44,7 +45,7 @@
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
- @ManyToOne
+ @ManyToOne(cascade = CascadeType.ALL)
private CarMaker make;
@Column
@@ -198,4 +199,22 @@
return true;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder
+ .append("CarModel [id=")
+ .append(id)
+ .append(", name=")
+ .append(name)
+ .append(", year=")
+ .append(year)
+ .append("]");
+ return builder.toString();
+ }
+
}
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-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -134,4 +134,13 @@
this.currency = currency;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return new StringBuilder().append(currency).append(' ').append(amount).toString();
+ }
+
}
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java 2011-12-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -27,6 +27,7 @@
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
@@ -44,8 +45,8 @@
@Column
private int hipsterFactor;
- @ManyToMany
- Set<CarModel> designedModels;
+ @ManyToMany(cascade = CascadeType.ALL)
+ private Set<CarModel> designedModels;
/**
* @return the hipsterFactor
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java 2011-12-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -27,6 +27,7 @@
import java.util.Calendar;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
@@ -41,7 +42,7 @@
public class Employee extends Person
{
- @ManyToOne
+ @ManyToOne(cascade = CascadeType.ALL)
private CarMaker employer;
@Column
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-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -27,6 +27,7 @@
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
@@ -41,7 +42,7 @@
public class Owner extends Person
{
- @OneToMany
+ @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner")
private Set<Car> cars;
@Transient
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-02 14:37:44 UTC (rev 3722)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2011-12-02 14:38:27 UTC (rev 3723)
@@ -245,15 +245,16 @@
@Override
public String toString()
{
- return "Person [currentAddress="
- + currentAddress
- + ", fiscalAddress="
- + fiscalAddress
- + ", id="
- + id
- + ", name="
- + name
- + "]";
+ StringBuilder builder = new StringBuilder();
+ builder.append("Person [id=").append(id).append(", name=").append(name)
+ // .append(", birthDate=")
+ // .append(birthDate)
+ .append(", currentAddress=")
+ .append(currentAddress)
+ .append(", fiscalAddress=")
+ .append(fiscalAddress)
+ .append("]");
+ return builder.toString();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
