Merge pull request #12 from axonivy-market/simplify

simplify

stateful-datatable-demo/pom.xml

@@ -6,14 +6,6 @@
   <artifactId>stateful-datatable-demo</artifactId>
   <version>10.0.3-SNAPSHOT</version>
   <packaging>iar</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>com.axonivy.portal</groupId>
-      <artifactId>portal-components</artifactId>
-      <version>10.0.0</version>
-      <type>iar</type>
-    </dependency>
-  </dependencies>
   <repositories>
     <repository>
       <snapshots>

stateful-datatable-demo/src/com/axonivy/demo/statefuldatatable/dao/IAbstractEntityDAO.java

@@ -15,16 +15,16 @@ public interface IAbstractEntityDAO<AE extends AbstractEntity> {
 
     /**
      * Defines the DAO class
-     * 
-     * @return
+     *
+     * @return type
      */
     Class<AE> getType();
 
     /**
      * save entity in DB
      *
      * @param entity
-     * @return
+     * @return saved
      */
     AE save(AE entity);
 
@@ -36,33 +36,27 @@ public interface IAbstractEntityDAO<AE extends AbstractEntity> {
     void delete(AE entity);
 
     /**
-     * Finds all entities
-     *
-     * @return
+     * @return all entities
      */
     List<AE> getAll();
 
     /**
      * Finds entity by its id
      *
-     * @param ae
-     * @return
+     * @param id
+     * @return entity
      */
     AE getById(String id);
 
     /**
      * Makes query using {@link EntityManager} / {@link CriteriaQuery}
      *
-     * @param cf
-     * @return
+     * @param cc
      */
     List<AE> getByCriteriaQuery(CriteriaQuery<AE> cc);
 
     /**
      * Makes query using {@link EntityManager} / {@link CriteriaQuery}
-     *
-     * @param cf
-     * @return
      */
     List<AE> getByCriteriaQuery(CriteriaQuery<AE> cc, int offset, int resultSize);
 
@@ -71,15 +65,13 @@ public interface IAbstractEntityDAO<AE extends AbstractEntity> {
      * one is found by query, null otherwise.
      *
      * @param cc
-     * @return
      */
     AE getByCriteriaQuerySingle(CriteriaQuery<AE> cc);
 
     /**
      * Returns single result - count of items found by query.
-     * 
+     *
      * @param cc
-     * @return
      */
     Long countByCriteriaQuery(CriteriaQuery<Long> cc);
 }

stateful-datatable-demo/src/com/axonivy/demo/statefuldatatable/dao/ProductRepoDAO.java

@@ -9,27 +9,33 @@
 
 public class ProductRepoDAO implements IProductDAO {
 
+	@Override
 	public Product save(Product product) {
 		Ivy.repo().save(product);
 		return product;
 	}
-
+
+	@Override
 	public Product getById(String id) {
 		return Ivy.repo().find(id, Product.class);
-	};
-
+	}
+
+	@Override
 	public List<Product> getAll(){
 		return Ivy.repo().search(Product.class).limit(10000).execute().getAll();
 	}
-
+
+	@Override
 	public void delete(Product product) {
 		Ivy.repo().delete(product);
 	}
-
+
+	@Override
 	public List<Product> callQueryWithLimit(Query<Product> query, int first, int pageSize) {
 		return query.limit(first, pageSize).execute().getAll();
 	}
-
+
+	@Override
 	public long getQueryRowCount(Query<Product> query) {
 		return query.limit(0, 10000).execute().count();
 	}

stateful-datatable-demo/src/com/axonivy/demo/statefuldatatable/entity/AbstractEntity.java

@@ -1,6 +1,7 @@
 package com.axonivy.demo.statefuldatatable.entity;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import javax.persistence.MappedSuperclass;
 
@@ -11,13 +12,11 @@
 public abstract class AbstractEntity implements Serializable {
 
 	private static final long serialVersionUID = 4128302279946094433L;
-	
+
 	protected static final String COLUMN_ID = "ID";
 
 	/**
-	 * ID of database entity - getter
-	 *
-	 * @return
+	 * return: ID of database entity
 	 */
 	public abstract String getId();
 
@@ -27,17 +26,17 @@ public abstract class AbstractEntity implements Serializable {
 	 * @param id
 	 */
 	public abstract void setId(String id);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+
 	@Override
 	public boolean equals(Object obj) {
 		if (obj == null || !AbstractEntity.class.isAssignableFrom(obj.getClass())) {
 			return false;
 		}
 		return getId().equals(((AbstractEntity) obj).getId());
 	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(getId());
+	}
 }

stateful-datatable-demo/src/com/axonivy/demo/statefuldatatable/entity/Product.java

@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.axonivy.demo.statefuldatatable.entity;
 
@@ -24,51 +24,53 @@ public class Product extends AbstractEntity {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@Column(length = 32, nullable = false) 
+	@Column(length = 32, nullable = false)
 	@GeneratedValue(generator="system-uuid")
 	@GenericGenerator(name="system-uuid", strategy = "uuid")
 	private String id;
 	//Adding Column STEP 1
 	@Column
 	private Date validThrough;
-	
+
 	@Column
 	private Date orderDate;
-	
+
 	@Column
 	private Date deliveryDate;
-	
+
 	@Column
 	private Integer quantity;
 
 	@Column
 	@Enumerated(EnumType.STRING)
 	private Quality quality;
-	
+
 	@Column
 	@Enumerated(EnumType.STRING)
 	private Availability availability;
-	
+
 	@Column
 	@Enumerated(EnumType.STRING)
 	private ProductStatus productStatus;
-	
+
 	@Column
 	private String productName;
-	
+
 	@Column
 	private Boolean onSale;
 
 	/**
 	 * @return the id
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
 
 	/**
 	 * @param id the id to set
 	 */
+	@Override
 	public void setId(String id) {
 		this.id = id;
 	}

stateful-datatable-demo/src/com/axonivy/demo/statefuldatatable/enums/HasCmsName.java

@@ -25,9 +25,7 @@ public interface HasCmsName {
 	String name();
 
 	/**
-	 * Return the name entry of the instance.
-	 *
-	 * @return
+	 * @return the name entry of the instance.
 	 */
 	default String getCmsName() {
 		return getCms("name");
@@ -53,11 +51,9 @@ default String getCms(String entry) {
 
 	/**
 	 * Lookup the URL of an entry in the Ivy Cms.
-	 * 
-	 * If the entry is not found, then the name of the entry is returned.
-	 * 
+	 *
 	 * @param entry
-	 * @return
+	 * @return If the entry is not found, then the name of the entry is returned.
 	 */
 	default String getCmsUrl(String entry) {
 		String cmsPath = getEntryPath(entry);