annotation for TaskoBunch

uyuni-project · Jan 27, 2025 · f9e161f · f9e161f
1 parent 02e2d61
commit f9e161f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 63 deletions.
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java b/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java
@@ -139,6 +139,7 @@
 import com.redhat.rhn.domain.user.legacy.UserImpl;
 import com.redhat.rhn.domain.user.legacy.UserInfo;
 import com.redhat.rhn.manager.system.ServerGroupManager;
+import com.redhat.rhn.taskomatic.domain.TaskoBunch;
 import com.redhat.rhn.taskomatic.domain.TaskoTask;
 import com.redhat.rhn.taskomatic.domain.TaskoTemplate;
 
@@ -290,6 +291,7 @@ private AnnotationRegistry() {
             SslCryptoKey.class,
             StateChange.class,
             Task.class,
+            TaskoBunch.class,
             TaskoTask.class,
             TaskoTemplate.class,
             TemplateString.class,

diff --git a/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoBunch.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoBunch.hbm.xml
@@ -3,34 +3,6 @@
 PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
-    <class name="com.redhat.rhn.taskomatic.domain.TaskoBunch"
-        table="rhnTaskoBunch">
-
-        <id name="id" type="long" column="id">
-            <meta attribute="scope-set">protected</meta>
-            <generator class="org.hibernate.id.enhanced.SequenceStyleGenerator">
-                <param name="sequence_name">RHN_TASKO_BUNCH_ID_SEQ</param>
-                <param name="increment_size">1</param>
-            </generator>
-        </id>
-
-        <property name="name" type="string" column="name" unique="true"/>
-        <property name="description" type="string" column="description"/>
-        <property name="orgBunch" type="string" column="org_bunch"/>
-
-        <property name="created" column="created" type="timestamp"
-            insert="false" update="false"/>
-        <property name="modified" column="modified" type="timestamp"
-            insert="false" update="false"/>
-
-        <list name="templates" inverse="true" lazy="false" table="rhnTaskoTemplate">
-            <key column="bunch_id"/>
-            <index column="ordering"/>
-            <one-to-many class="com.redhat.rhn.taskomatic.domain.TaskoTemplate"/>
-        </list>
-
-    </class>
-
     <query name="TaskoBunch.lookupByName">
         <![CDATA[FROM com.redhat.rhn.taskomatic.domain.TaskoBunch WHERE name = :name]]>
     </query>

diff --git a/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoBunch.java b/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoBunch.java
@@ -14,22 +14,47 @@
  */
 package com.redhat.rhn.taskomatic.domain;
 
-import java.util.ArrayList;
-import java.util.Date;
+import com.redhat.rhn.domain.BaseDomainHelper;
+
 import java.util.List;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
 /**
  * TaskoBunch
  */
-public class TaskoBunch {
-
+@Entity
+@Table(name = "rhnTaskoBunch")
+public class TaskoBunch extends BaseDomainHelper {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tasko_bunch_seq")
+    @SequenceGenerator(name = "tasko_bunch_seq", sequenceName = "RHN_TASKO_BUNCH_ID_SEQ", allocationSize = 1)
+    @Column(name = "id", nullable = false)
     private Long id;
+
+    @Column(name = "name", unique = true)
     private String name;
+
+    @Column(name = "description")
     private String description;
+
+    @Column(name = "org_bunch")
     private String orgBunch;
-    private List<TaskoTemplate> templates = new ArrayList<>();
-    private Date created;
-    private Date modified;
+
+    @OneToMany(mappedBy = "bunch", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
+    @OrderColumn(name = "ordering")
+    private List<TaskoTemplate> templates;
 
     /**
      * @return Returns the id.
@@ -73,34 +98,6 @@ public void setDescription(String descriptionIn) {
         this.description = descriptionIn;
     }
 
-    /**
-     * @return Returns the created.
-     */
-    public Date getCreated() {
-        return created;
-    }
-
-    /**
-     * @param createdIn The created to set.
-     */
-    public void setCreated(Date createdIn) {
-        this.created = createdIn;
-    }
-
-    /**
-     * @return Returns the modified.
-     */
-    public Date getModified() {
-        return modified;
-    }
-
-    /**
-     * @param modifiedIn The modified to set.
-     */
-    public void setModified(Date modifiedIn) {
-        this.modified = modifiedIn;
-    }
-
     /**
      * @return Returns the templates.
      */