[Openutils-svn] SF.net SVN: openutils:[4091] trunk/openutils-bshd5/src/test/java/it/ openutils/hibernate/test

[<gca...@us...>]

Revision: 4091
          http://openutils.svn.sourceforge.net/openutils/?rev=4091&view=rev
Author:   gcatania
Date:     2012-07-05 14:42:38 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-17 preliminary: avoid possible sql keywords as field names

Modified Paths:
--------------
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2012-07-05 14:42:38 UTC (rev 4091)
@@ -115,7 +115,7 @@
         CarModel prius = new CarModel();
         prius.setName("Prius");
         prius.setMake(toyota);
-        prius.setYear(Integer.valueOf(2008));
+        prius.setLaunchYear(Integer.valueOf(2008));
 
         List<CarModel> toyotaModels = toyota.getModels();
         if (toyotaModels == null)

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-07-05 14:42:38 UTC (rev 4091)
@@ -128,7 +128,7 @@
         Assert.assertEquals(rd.getEmployer(), toyota);
         Assert.assertEquals(prius.getMake(), toyota);
         Assert.assertEquals(rd.getHipsterFactor(), 97);
-        Assert.assertEquals(rd.getDesignedModels().iterator().next().getYear(), Integer.valueOf(2008));
+        Assert.assertEquals(rd.getDesignedModels().iterator().next().getLaunchYear(), Integer.valueOf(2008));
     }
 
     @Test

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	2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java	2012-07-05 14:42:38 UTC (rev 4091)
@@ -47,7 +47,7 @@
     private String street;
 
     @Column(nullable = false, scale = 4)
-    private Integer no;
+    private Integer streetNumber;
 
     @Column(nullable = false, length = 50)
     private String city;
@@ -62,10 +62,10 @@
     {
     }
 
-    public Address(String street, Integer no, String city, String county, Integer zipCode)
+    public Address(String street, Integer streetNumber, String city, String county, Integer zipCode)
     {
         this.street = street;
-        this.no = no;
+        this.streetNumber = streetNumber;
         this.city = city;
         this.county = county;
         this.zipCode = zipCode;
@@ -104,19 +104,19 @@
     }
 
     /**
-     * @return the no
+     * @return the streetNumber
      */
-    public Integer getNo()
+    public Integer getStreetNumber()
     {
-        return no;
+        return streetNumber;
     }
 
     /**
-     * @param no the no to set
+     * @param streetNumber the no to set
      */
-    public void setNo(Integer no)
+    public void setStreetNumber(Integer streetNumber)
     {
-        this.no = no;
+        this.streetNumber = streetNumber;
     }
 
     /**
@@ -178,7 +178,7 @@
         result = prime * result + ((city == null) ? 0 : city.hashCode());
         result = prime * result + ((county == null) ? 0 : county.hashCode());
         result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + ((no == null) ? 0 : no.hashCode());
+        result = prime * result + ((streetNumber == null) ? 0 : streetNumber.hashCode());
         result = prime * result + ((street == null) ? 0 : street.hashCode());
         result = prime * result + ((zipCode == null) ? 0 : zipCode.hashCode());
         return result;
@@ -236,14 +236,14 @@
         {
             return false;
         }
-        if (no == null)
+        if (streetNumber == null)
         {
-            if (other.no != null)
+            if (other.streetNumber != null)
             {
                 return false;
             }
         }
-        else if (!no.equals(other.no))
+        else if (!streetNumber.equals(other.streetNumber))
         {
             return false;
         }
@@ -284,8 +284,8 @@
             + county
             + ", id="
             + id
-            + ", no="
-            + no
+            + ", streetNumber="
+            + streetNumber
             + ", street="
             + street
             + ", zipCode="

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	2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java	2012-07-05 14:42:38 UTC (rev 4091)
@@ -52,7 +52,7 @@
     private String name;
 
     @Column
-    private Integer year;
+    private Integer launchYear;
 
     /**
      * @return the id
@@ -103,19 +103,19 @@
     }
 
     /**
-     * @return the year
+     * @return the launchYear
      */
-    public Integer getYear()
+    public Integer getLaunchYear()
     {
-        return year;
+        return launchYear;
     }
 
     /**
-     * @param year the year to set
+     * @param launchYear the launchYear to set
      */
-    public void setYear(Integer year)
+    public void setLaunchYear(Integer launchYear)
     {
-        this.year = year;
+        this.launchYear = launchYear;
     }
 
     /**
@@ -129,7 +129,7 @@
         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());
+        result = prime * result + ((launchYear == null) ? 0 : launchYear.hashCode());
         return result;
     }
 
@@ -185,14 +185,14 @@
         {
             return false;
         }
-        if (year == null)
+        if (launchYear == null)
         {
-            if (other.year != null)
+            if (other.launchYear != null)
             {
                 return false;
             }
         }
-        else if (!year.equals(other.year))
+        else if (!launchYear.equals(other.launchYear))
         {
             return false;
         }
@@ -211,8 +211,8 @@
             .append(id)
             .append(", name=")
             .append(name)
-            .append(", year=")
-            .append(year)
+            .append(", launchYear=")
+            .append(launchYear)
             .append("]");
         return builder.toString();
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.