Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r9791 - trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined
|
From: <hib...@li...> - 2006-04-25 17:09:24
|
Author: epbernard
Date: 2006-04-25 13:09:09 -0400 (Tue, 25 Apr 2006)
New Revision: 9791
Added:
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformation.java
Removed:
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/AlarmT.java
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformationT.java
Modified:
trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
Log:
more tests but cleaned
Copied: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java (from rev 9790, trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/AlarmT.java)
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/AlarmT.java 2006-04-25 17:07:59 UTC (rev 9790)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java 2006-04-25 17:09:09 UTC (rev 9791)
@@ -0,0 +1,40 @@
+//$Id: Sweater.java 8974 2006-01-04 00:43:49Z epbernard $
+package org.hibernate.test.annotations.inheritance.joined;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.OneToOne;
+
+@Entity
+@DiscriminatorValue("AlarmT")
+public class Alarm extends EventInformation {
+
+ protected EventInformation eventInfo;
+
+ @OneToOne
+ @JoinColumns({@JoinColumn(name = "EVENTINFORMATIONT_NOTIFICATIONID",
+ referencedColumnName = "NOTIFICATIONID")})
+ public EventInformation getEventInfo() {
+ return eventInfo;
+ }
+
+ public void setEventInfo(EventInformation value) {
+ this.eventInfo = value;
+ }
+
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ String eventId = ( getEventInfo() != null ?
+ getEventInfo().getNotificationId() : null );
+ sb.append(
+ "AlarmT: id = " + getNotificationId() + "\t" +
+ "has event id = " + eventId
+ );
+ return sb.toString();
+ }
+
+}
Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/AlarmT.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/AlarmT.java 2006-04-25 17:07:59 UTC (rev 9790)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/AlarmT.java 2006-04-25 17:09:09 UTC (rev 9791)
@@ -1,40 +0,0 @@
-//$Id: Sweater.java 8974 2006-01-04 00:43:49Z epbernard $
-package org.hibernate.test.annotations.inheritance.joined;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.OneToOne;
-
-@Entity
-@DiscriminatorValue("AlarmT")
-public class AlarmT extends EventInformationT {
-
- protected EventInformationT eventInfo;
-
- @OneToOne
- @JoinColumns({@JoinColumn(name = "EVENTINFORMATIONT_NOTIFICATIONID",
- referencedColumnName = "NOTIFICATIONID")})
- public EventInformationT getEventInfo() {
- return eventInfo;
- }
-
- public void setEventInfo(EventInformationT value) {
- this.eventInfo = value;
- }
-
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- String eventId = ( getEventInfo() != null ?
- getEventInfo().getNotificationId() : null );
- sb.append(
- "AlarmT: id = " + getNotificationId() + "\t" +
- "has event id = " + eventId
- );
- return sb.toString();
- }
-
-}
Copied: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformation.java (from rev 9790, trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformationT.java)
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformationT.java 2006-04-25 17:07:59 UTC (rev 9790)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformation.java 2006-04-25 17:09:09 UTC (rev 9791)
@@ -0,0 +1,38 @@
+//$Id: Sweater.java 8974 2006-01-04 00:43:49Z epbernard $
+package org.hibernate.test.annotations.inheritance.joined;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+
+
+@Entity
+@Inheritance(strategy = InheritanceType.JOINED)
+@DiscriminatorColumn(name = "DTYPE", discriminatorType = DiscriminatorType.STRING, length = 80)
+@DiscriminatorValue("EventInformationT")
+public class EventInformation implements java.io.Serializable {
+
+
+ protected String notificationId;
+
+ @Id
+ public String getNotificationId() {
+ return notificationId;
+ }
+
+ public void setNotificationId(String value) {
+ this.notificationId = value;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append( "EventInformationT: id = " + getNotificationId() );
+ return sb.toString();
+ }
+
+}
Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformationT.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformationT.java 2006-04-25 17:07:59 UTC (rev 9790)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/EventInformationT.java 2006-04-25 17:09:09 UTC (rev 9791)
@@ -1,38 +0,0 @@
-//$Id: Sweater.java 8974 2006-01-04 00:43:49Z epbernard $
-package org.hibernate.test.annotations.inheritance.joined;
-
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-
-
-@Entity
-@Inheritance(strategy = InheritanceType.JOINED)
-@DiscriminatorColumn(name = "DTYPE", discriminatorType = DiscriminatorType.STRING, length = 80)
-@DiscriminatorValue("EventInformationT")
-public class EventInformationT implements java.io.Serializable {
-
-
- protected String notificationId;
-
- @Id
- public String getNotificationId() {
- return notificationId;
- }
-
- public void setNotificationId(String value) {
- this.notificationId = value;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append( "EventInformationT: id = " + getNotificationId() );
- return sb.toString();
- }
-
-}
Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java 2006-04-25 17:07:59 UTC (rev 9790)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java 2006-04-25 17:09:09 UTC (rev 9791)
@@ -105,30 +105,20 @@
Session session = openSession();
Transaction transaction = session.beginTransaction();
String eventPK = "event1";
- System.out.println( "*******Finding event " + eventPK );
- EventInformationT event = (EventInformationT) session.get( EventInformationT.class, eventPK );
+ EventInformation event = (EventInformation) session.get( EventInformation.class, eventPK );
if ( event == null ) {
- System.out.println( "Creating event " + eventPK );
- event = new EventInformationT();
+ event = new EventInformation();
event.setNotificationId( eventPK );
session.persist( event );
}
- else {
- System.out.println( "Found " + event );
- }
String alarmPK = "alarm1";
- System.out.println( "*******Finding alarm " + alarmPK );
- AlarmT alarm = (AlarmT) session.get( AlarmT.class, alarmPK );
+ Alarm alarm = (Alarm) session.get( Alarm.class, alarmPK );
if ( alarm == null ) {
- System.out.println( "Creating alarm " + alarmPK );
- alarm = new AlarmT();
+ alarm = new Alarm();
alarm.setNotificationId( alarmPK );
alarm.setEventInfo( event );
session.persist( alarm );
}
- else {
- System.out.println( "Found " + alarm );
- }
transaction.commit();
session.close();
}
@@ -145,8 +135,8 @@
ProgramExecution.class,
Clothing.class,
Sweater.class,
- EventInformationT.class,
- AlarmT.class
+ EventInformation.class,
+ Alarm.class
};
}
|
