diff --git a/.gitattributes b/.gitattributes index f0e7c09..a4193d6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ -* text=auto -*.sh text eol=lf -*.env text eol=lf +* text eol=lf +*.png binary *.bat text eol=crlf \ No newline at end of file diff --git a/build.gradle b/build.gradle index e3dea54..ca1c9c0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { - id 'war' + id 'war' + id "com.diffplug.spotless" version "6.25.0" } description = "Accelerator work map" group 'org.jlab' @@ -33,4 +34,10 @@ war { String line -> line.replaceAll("@RELEASE_DATE@", releaseDate) } } +} + +spotless { + java { + googleJavaFormat() + } } \ No newline at end of file diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java index 2fee8eb..2fab576 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java @@ -10,63 +10,61 @@ import javax.persistence.criteria.Root; /** - * * @author ryans */ @DeclareRoles("workmap-admin") public abstract class AbstractFacade { - private final Class entityClass; + private final Class entityClass; - public AbstractFacade(Class entityClass) { - this.entityClass = entityClass; - } + public AbstractFacade(Class entityClass) { + this.entityClass = entityClass; + } - protected abstract EntityManager getEntityManager(); + protected abstract EntityManager getEntityManager(); - @RolesAllowed("workmap-admin") - public void create(T entity) { - getEntityManager().persist(entity); - } + @RolesAllowed("workmap-admin") + public void create(T entity) { + getEntityManager().persist(entity); + } - @RolesAllowed("workmap-admin") - public void edit(T entity) { - getEntityManager().merge(entity); - } + @RolesAllowed("workmap-admin") + public void edit(T entity) { + getEntityManager().merge(entity); + } - @RolesAllowed("workmap-admin") - public void remove(T entity) { - getEntityManager().remove(getEntityManager().merge(entity)); - } + @RolesAllowed("workmap-admin") + public void remove(T entity) { + getEntityManager().remove(getEntityManager().merge(entity)); + } - @PermitAll - public T find(Object id) { - return getEntityManager().find(entityClass, id); - } + @PermitAll + public T find(Object id) { + return getEntityManager().find(entityClass, id); + } - @PermitAll - public List findAll() { - CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(entityClass); - cq.select(cq.from(entityClass)); - return getEntityManager().createQuery(cq).getResultList(); - } + @PermitAll + public List findAll() { + CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(entityClass); + cq.select(cq.from(entityClass)); + return getEntityManager().createQuery(cq).getResultList(); + } - @PermitAll - public List findRange(int[] range) { - CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(entityClass); - cq.select(cq.from(entityClass)); - TypedQuery q = getEntityManager().createQuery(cq); - q.setMaxResults(range[1] - range[0]); - q.setFirstResult(range[0]); - return q.getResultList(); - } + @PermitAll + public List findRange(int[] range) { + CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(entityClass); + cq.select(cq.from(entityClass)); + TypedQuery q = getEntityManager().createQuery(cq); + q.setMaxResults(range[1] - range[0]); + q.setFirstResult(range[0]); + return q.getResultList(); + } - @PermitAll - public int count() { - CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(Long.class); - Root rt = cq.from(entityClass); - cq.select(getEntityManager().getCriteriaBuilder().count(rt)); - TypedQuery q = getEntityManager().createQuery(cq); - return q.getSingleResult().intValue(); - } - + @PermitAll + public int count() { + CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(Long.class); + Root rt = cq.from(entityClass); + cq.select(getEntityManager().getCriteriaBuilder().count(rt)); + TypedQuery q = getEntityManager().createQuery(cq); + return q.getSingleResult().intValue(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java index e973d0f..84493a7 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java @@ -13,102 +13,100 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMap; /** - * * @author ryans */ @Stateless @DeclareRoles("workmap-admin") public class WorkMapFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; - @EJB - private WorkMapTaskFacade taskFacade; - @EJB - private WorkMapPssFacade pssFacade; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @EJB private WorkMapTaskFacade taskFacade; + @EJB private WorkMapPssFacade pssFacade; - public WorkMapFacade() { - super(WorkMap.class); - } + @Override + protected EntityManager getEntityManager() { + return em; + } - @PermitAll - public WorkMap findByYearMonthDay(Date yearMonthDay) { - TypedQuery q = em.createNamedQuery("WorkMap.findByYearMonthDay", WorkMap.class); + public WorkMapFacade() { + super(WorkMap.class); + } - q.setParameter("yearMonthDay", yearMonthDay); + @PermitAll + public WorkMap findByYearMonthDay(Date yearMonthDay) { + TypedQuery q = em.createNamedQuery("WorkMap.findByYearMonthDay", WorkMap.class); - List results = q.getResultList(); + q.setParameter("yearMonthDay", yearMonthDay); - WorkMap map = (results == null || results.isEmpty()) ? null : results.get(0); + List results = q.getResultList(); - return map; - } + WorkMap map = (results == null || results.isEmpty()) ? null : results.get(0); - @PermitAll - public WorkMap findByYearMonthDayEager(Date yearMonthDay) { - WorkMap map = findByYearMonthDay(yearMonthDay); + return map; + } - if (map != null) { - //map.getWorkMapTaskList().size(); - //map.getWorkMapPssList().size(); - em.detach(map); - map.setWorkMapTaskList(taskFacade.findByWorkMapIdEager(map.getWorkMapId())); - map.setWorkMapPssList(pssFacade.findByWorkMapIdEager(map.getWorkMapId())); - } + @PermitAll + public WorkMap findByYearMonthDayEager(Date yearMonthDay) { + WorkMap map = findByYearMonthDay(yearMonthDay); - return map; + if (map != null) { + // map.getWorkMapTaskList().size(); + // map.getWorkMapPssList().size(); + em.detach(map); + map.setWorkMapTaskList(taskFacade.findByWorkMapIdEager(map.getWorkMapId())); + map.setWorkMapPssList(pssFacade.findByWorkMapIdEager(map.getWorkMapId())); } - private void clearLists(WorkMap map) { - if (map.getWorkMapId() != null) { - taskFacade.deleteByWorkMapId(map.getWorkMapId()); - pssFacade.deleteByWorkMapId(map.getWorkMapId()); - em.flush(); - } - } + return map; + } - @RolesAllowed("workmap-admin") - public void save(WorkMap map) { - clearLists(map); - edit(map); + private void clearLists(WorkMap map) { + if (map.getWorkMapId() != null) { + taskFacade.deleteByWorkMapId(map.getWorkMapId()); + pssFacade.deleteByWorkMapId(map.getWorkMapId()); + em.flush(); } - - @RolesAllowed("workmap-admin") - public void copy(Date from, Date to) { - WorkMap fromMap = findByYearMonthDayEager(from); - WorkMap toMap = findByYearMonthDay(to); - - if (fromMap == null) { - if (toMap == null) { - toMap = new WorkMap(); - toMap.setYearMonthDay(to); - toMap.setLastModified(new Date()); - em.persist(toMap); - } else { - toMap.setLastModified(new Date()); - toMap.setNote(null); - clearLists(toMap); - } - } else { - if (toMap == null) { - toMap = new WorkMap(); - toMap.setYearMonthDay(to); - toMap.setLastModified(new Date()); - toMap.setNote(fromMap.getNote()); - em.persist(toMap); // Make it managed and persistent - } else { - toMap.setLastModified(new Date()); - toMap.setNote(fromMap.getNote()); - clearLists(toMap); - } - - toMap.setWorkMapTaskList(fromMap.copyWorkMapTaskList(toMap)); - toMap.setWorkMapPssList(fromMap.copyWorkMapPssList(toMap)); - } + } + + @RolesAllowed("workmap-admin") + public void save(WorkMap map) { + clearLists(map); + edit(map); + } + + @RolesAllowed("workmap-admin") + public void copy(Date from, Date to) { + WorkMap fromMap = findByYearMonthDayEager(from); + WorkMap toMap = findByYearMonthDay(to); + + if (fromMap == null) { + if (toMap == null) { + toMap = new WorkMap(); + toMap.setYearMonthDay(to); + toMap.setLastModified(new Date()); + em.persist(toMap); + } else { + toMap.setLastModified(new Date()); + toMap.setNote(null); + clearLists(toMap); + } + } else { + if (toMap == null) { + toMap = new WorkMap(); + toMap.setYearMonthDay(to); + toMap.setLastModified(new Date()); + toMap.setNote(fromMap.getNote()); + em.persist(toMap); // Make it managed and persistent + } else { + toMap.setLastModified(new Date()); + toMap.setNote(fromMap.getNote()); + clearLists(toMap); + } + + toMap.setWorkMapTaskList(fromMap.copyWorkMapTaskList(toMap)); + toMap.setWorkMapPssList(fromMap.copyWorkMapPssList(toMap)); } + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java index 684003b..99aca83 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java @@ -6,21 +6,19 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMapPssArea; /** - * * @author ryans */ @Stateless public class WorkMapPssAreaFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public WorkMapPssAreaFacade() { - super(WorkMapPssArea.class); - } - + public WorkMapPssAreaFacade() { + super(WorkMapPssArea.class); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java index da76bfa..27ede15 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java @@ -15,54 +15,52 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMapPss; /** - * * @author ryans */ @Stateless @DeclareRoles("workmap-admin") public class WorkMapPssFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public WorkMapPssFacade() { - super(WorkMapPss.class); - } + public WorkMapPssFacade() { + super(WorkMapPss.class); + } - @PermitAll - public Map createMap(List pss) { - Map map = new HashMap(); + @PermitAll + public Map createMap(List pss) { + Map map = new HashMap(); + if (pss != null) { + for (WorkMapPss p : pss) { + map.put(p.getWorkMapPssAreaId().getAreaName(), p); + } + } - if (pss != null) { - for (WorkMapPss p : pss) { - map.put(p.getWorkMapPssAreaId().getAreaName(), p); - } - } + return map; + } - return map; - } + @RolesAllowed("workmap-admin") + public int deleteByWorkMapId(BigDecimal workMapId) { + Query q = em.createNamedQuery("WorkMapPss.deleteByWorkMapId"); - @RolesAllowed("workmap-admin") - public int deleteByWorkMapId(BigDecimal workMapId) { - Query q = em.createNamedQuery("WorkMapPss.deleteByWorkMapId"); - - q.setParameter("workMapId", workMapId); - - return q.executeUpdate(); - } + q.setParameter("workMapId", workMapId); - @PermitAll - public List findByWorkMapIdEager(BigDecimal workMapId) { - TypedQuery q = em.createNamedQuery("WorkMapPss.findByWorkMapIdEager", WorkMapPss.class); + return q.executeUpdate(); + } - q.setParameter("workMapId", workMapId); + @PermitAll + public List findByWorkMapIdEager(BigDecimal workMapId) { + TypedQuery q = + em.createNamedQuery("WorkMapPss.findByWorkMapIdEager", WorkMapPss.class); - return q.getResultList(); - } - + q.setParameter("workMapId", workMapId); + + return q.getResultList(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java index 468b8d0..23094d8 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java @@ -8,44 +8,41 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; - import org.jlab.atlis.workmap.persistence.entity.WorkMapPssState; -import org.jlab.atlis.workmap.persistence.entity.WorkMapTaskType; /** - * * @author ryans */ @Stateless public class WorkMapPssStateFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public WorkMapPssStateFacade() { - super(WorkMapPssState.class); - } + public WorkMapPssStateFacade() { + super(WorkMapPssState.class); + } - @PermitAll - public Map createMap(List pssStates) { - Map map = new HashMap(); - - for(WorkMapPssState state: pssStates) { - map.put(state.getStateName(), state); - } - - return map; + @PermitAll + public Map createMap(List pssStates) { + Map map = new HashMap(); + + for (WorkMapPssState state : pssStates) { + map.put(state.getStateName(), state); } - @PermitAll - public List findAllOrdered() { - TypedQuery q = em.createNamedQuery("WorkMapPssState.findAllOrdered", WorkMapPssState.class); + return map; + } - return q.getResultList(); - } + @PermitAll + public List findAllOrdered() { + TypedQuery q = + em.createNamedQuery("WorkMapPssState.findAllOrdered", WorkMapPssState.class); + return q.getResultList(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java index 4316bca..086b263 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java @@ -6,21 +6,19 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMapTaskArea; /** - * * @author ryans */ @Stateless public class WorkMapTaskAreaFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public WorkMapTaskAreaFacade() { - super(WorkMapTaskArea.class); - } - + public WorkMapTaskAreaFacade() { + super(WorkMapTaskArea.class); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java index cc60b12..a6d883a 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java @@ -1,8 +1,6 @@ package org.jlab.atlis.workmap.business.session; import java.math.BigDecimal; -import java.util.Collection; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,54 +15,53 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMapTask; /** - * * @author ryans */ @Stateless @DeclareRoles("workmap-admin") public class WorkMapTaskFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public WorkMapTaskFacade() { - super(WorkMapTask.class); - } + public WorkMapTaskFacade() { + super(WorkMapTask.class); + } - @PermitAll - public List findByWorkMapIdEager(BigDecimal workMapId) { - TypedQuery q = em.createNamedQuery("WorkMapTask.findByWorkMapIdEager", WorkMapTask.class); + @PermitAll + public List findByWorkMapIdEager(BigDecimal workMapId) { + TypedQuery q = + em.createNamedQuery("WorkMapTask.findByWorkMapIdEager", WorkMapTask.class); - q.setParameter("workMapId", workMapId); + q.setParameter("workMapId", workMapId); - return q.getResultList(); - } + return q.getResultList(); + } - @PermitAll - public Map createMap(List tasks) { - Map map = new HashMap(); + @PermitAll + public Map createMap(List tasks) { + Map map = new HashMap(); + if (tasks != null) { + for (WorkMapTask task : tasks) { + map.put(task.getWorkMapTaskAreaId().getAreaName(), task); + } + } - if (tasks != null) { - for (WorkMapTask task : tasks) { - map.put(task.getWorkMapTaskAreaId().getAreaName(), task); - } - } + return map; + } - return map; - } + @RolesAllowed({"workmap-admin"}) + public int deleteByWorkMapId(BigDecimal workMapId) { + Query q = em.createNamedQuery("WorkMapTask.deleteByWorkMapId"); - @RolesAllowed({"workmap-admin"}) - public int deleteByWorkMapId(BigDecimal workMapId) { - Query q = em.createNamedQuery("WorkMapTask.deleteByWorkMapId"); - - q.setParameter("workMapId", workMapId); - - return q.executeUpdate(); - } + q.setParameter("workMapId", workMapId); + + return q.executeUpdate(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java index 0ba5db7..ecc4faf 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java +++ b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java @@ -11,39 +11,38 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMapTaskType; /** - * * @author ryans */ @Stateless public class WorkMapTaskTypeFacade extends AbstractFacade { - @PersistenceContext(unitName = "workmapPU") - private EntityManager em; + @PersistenceContext(unitName = "workmapPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public WorkMapTaskTypeFacade() { - super(WorkMapTaskType.class); - } + public WorkMapTaskTypeFacade() { + super(WorkMapTaskType.class); + } + + @PermitAll + public Map createMap(List types) { + Map map = new HashMap(); - @PermitAll - public Map createMap(List types) { - Map map = new HashMap(); - - for(WorkMapTaskType type: types) { - map.put(type.getTypeName(), type); - } - - return map; + for (WorkMapTaskType type : types) { + map.put(type.getTypeName(), type); } - @PermitAll - public List findAllOrdered() { - TypedQuery q = em.createNamedQuery("WorkMapTaskType.findAllOrdered", WorkMapTaskType.class); + return map; + } - return q.getResultList(); - } - + @PermitAll + public List findAllOrdered() { + TypedQuery q = + em.createNamedQuery("WorkMapTaskType.findAllOrdered", WorkMapTaskType.class); + + return q.getResultList(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/business/utility/TimeHelper.java b/src/main/java/org/jlab/atlis/workmap/business/utility/TimeHelper.java index ee59566..055b3db 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/utility/TimeHelper.java +++ b/src/main/java/org/jlab/atlis/workmap/business/utility/TimeHelper.java @@ -4,41 +4,40 @@ import java.util.Date; /** - * * @author ryans */ public class TimeHelper { - public static Date getCurrentYearMonthDay() { - Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE, 0); - c.set(Calendar.SECOND, 0); - c.set(Calendar.MILLISECOND, 0); - - return c.getTime(); - } + public static Date getCurrentYearMonthDay() { + Calendar c = Calendar.getInstance(); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.MILLISECOND, 0); - public static Date getPreviousYearMonthDay(Date yearMonthDay) { - Calendar c = Calendar.getInstance(); - c.setTime(yearMonthDay); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE, 0); - c.set(Calendar.SECOND, 0); - c.set(Calendar.MILLISECOND, 0); - c.add(Calendar.DATE, -1); - - return c.getTime(); - } + return c.getTime(); + } - public static Date getNextYearMonthDay(Date yearMonthDay) { - Calendar c = Calendar.getInstance(); - c.setTime(yearMonthDay); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE, 0); - c.set(Calendar.SECOND, 0); - c.set(Calendar.MILLISECOND, 0); - c.add(Calendar.DATE, 1); - - return c.getTime(); - } + public static Date getPreviousYearMonthDay(Date yearMonthDay) { + Calendar c = Calendar.getInstance(); + c.setTime(yearMonthDay); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.MILLISECOND, 0); + c.add(Calendar.DATE, -1); + + return c.getTime(); + } + + public static Date getNextYearMonthDay(Date yearMonthDay) { + Calendar c = Calendar.getInstance(); + c.setTime(yearMonthDay); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.MILLISECOND, 0); + c.add(Calendar.DATE, 1); + + return c.getTime(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java index 902bd26..dc0b067 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java @@ -25,151 +25,165 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"YEAR_MONTH_DAY"})}) +@Table( + name = "WORK_MAP", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"YEAR_MONTH_DAY"})}) @NamedQueries({ - @NamedQuery(name = "WorkMap.findAll", query = "SELECT w FROM WorkMap w"), - @NamedQuery(name = "WorkMap.findByWorkMapId", query = "SELECT w FROM WorkMap w WHERE w.workMapId = :workMapId"), - @NamedQuery(name = "WorkMap.findByYearMonthDay", query = "SELECT w FROM WorkMap w WHERE w.yearMonthDay = :yearMonthDay"), - @NamedQuery(name = "WorkMap.findByNote", query = "SELECT w FROM WorkMap w WHERE w.note = :note"), - @NamedQuery(name = "WorkMap.findByLastModified", query = "SELECT w FROM WorkMap w WHERE w.lastModified = :lastModified")}) + @NamedQuery(name = "WorkMap.findAll", query = "SELECT w FROM WorkMap w"), + @NamedQuery( + name = "WorkMap.findByWorkMapId", + query = "SELECT w FROM WorkMap w WHERE w.workMapId = :workMapId"), + @NamedQuery( + name = "WorkMap.findByYearMonthDay", + query = "SELECT w FROM WorkMap w WHERE w.yearMonthDay = :yearMonthDay"), + @NamedQuery(name = "WorkMap.findByNote", query = "SELECT w FROM WorkMap w WHERE w.note = :note"), + @NamedQuery( + name = "WorkMap.findByLastModified", + query = "SELECT w FROM WorkMap w WHERE w.lastModified = :lastModified") +}) public class WorkMap implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapId", sequenceName = "WORK_MAP_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapId; - @Basic(optional = false) - @NotNull - @Column(name = "YEAR_MONTH_DAY", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - private Date yearMonthDay; - @Size(max = 256) - @Column(name = "NOTE", length = 256) - private String note; - @Basic(optional = false) - @NotNull - @Column(name = "LAST_MODIFIED", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - private Date lastModified; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapId", fetch = FetchType.LAZY) - private List workMapTaskList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapId", fetch = FetchType.LAZY) - private List workMapPssList; - - public WorkMap() { - } - - public WorkMap(BigDecimal workMapId) { - this.workMapId = workMapId; - } + private static final long serialVersionUID = 1L; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator(name = "WorkMapId", sequenceName = "WORK_MAP_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapId; + + @Basic(optional = false) + @NotNull + @Column(name = "YEAR_MONTH_DAY", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date yearMonthDay; + + @Size(max = 256) + @Column(name = "NOTE", length = 256) + private String note; + + @Basic(optional = false) + @NotNull + @Column(name = "LAST_MODIFIED", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date lastModified; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapId", fetch = FetchType.LAZY) + private List workMapTaskList; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapId", fetch = FetchType.LAZY) + private List workMapPssList; + + public WorkMap() {} + + public WorkMap(BigDecimal workMapId) { + this.workMapId = workMapId; + } + + public WorkMap(BigDecimal workMapId, Date yearMonthDay, Date lastModified) { + this.workMapId = workMapId; + this.yearMonthDay = yearMonthDay; + this.lastModified = lastModified; + } + + public BigDecimal getWorkMapId() { + return workMapId; + } + + public void setWorkMapId(BigDecimal workMapId) { + this.workMapId = workMapId; + } + + public Date getYearMonthDay() { + return yearMonthDay; + } + + public void setYearMonthDay(Date yearMonthDay) { + this.yearMonthDay = yearMonthDay; + } + + public String getNote() { + return note; + } + + public void setNote(String note) { + this.note = note; + } + + public Date getLastModified() { + return lastModified; + } + + public void setLastModified(Date lastModified) { + this.lastModified = lastModified; + } + + public List getWorkMapTaskList() { + return workMapTaskList; + } + + public void setWorkMapTaskList(List workMapTaskList) { + this.workMapTaskList = workMapTaskList; + } + + public List getWorkMapPssList() { + return workMapPssList; + } + + public void setWorkMapPssList(List workMapPssList) { + this.workMapPssList = workMapPssList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapId != null ? workMapId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMap)) { + return false; + } + WorkMap other = (WorkMap) object; + return (this.workMapId != null || other.workMapId == null) + && (this.workMapId == null || this.workMapId.equals(other.workMapId)); + } - public WorkMap(BigDecimal workMapId, Date yearMonthDay, Date lastModified) { - this.workMapId = workMapId; - this.yearMonthDay = yearMonthDay; - this.lastModified = lastModified; - } + @Override + public String toString() { + return "org.jlab.atlis.workmap.persistence.entity.WorkMap[ workMapId=" + workMapId + " ]"; + } - public BigDecimal getWorkMapId() { - return workMapId; - } + public List copyWorkMapTaskList(WorkMap map) { + List tasks = new ArrayList(); - public void setWorkMapId(BigDecimal workMapId) { - this.workMapId = workMapId; + if (workMapTaskList != null) { + for (WorkMapTask task : workMapTaskList) { + tasks.add(task.copy(map)); + } } - public Date getYearMonthDay() { - return yearMonthDay; - } + return tasks; + } - public void setYearMonthDay(Date yearMonthDay) { - this.yearMonthDay = yearMonthDay; - } + public List copyWorkMapPssList(WorkMap map) { + List pss = new ArrayList(); - public String getNote() { - return note; - } + if (workMapPssList != null) { + for (WorkMapPss p : workMapPssList) { + pss.add(p.copy(map)); + } + } - public void setNote(String note) { - this.note = note; - } - - public Date getLastModified() { - return lastModified; - } - - public void setLastModified(Date lastModified) { - this.lastModified = lastModified; - } - - public List getWorkMapTaskList() { - return workMapTaskList; - } - - public void setWorkMapTaskList(List workMapTaskList) { - this.workMapTaskList = workMapTaskList; - } - - public List getWorkMapPssList() { - return workMapPssList; - } - - public void setWorkMapPssList(List workMapPssList) { - this.workMapPssList = workMapPssList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (workMapId != null ? workMapId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMap)) { - return false; - } - WorkMap other = (WorkMap)object; - return (this.workMapId != null || other.workMapId == null) && (this.workMapId == null || this.workMapId.equals(other.workMapId)); - } - - @Override - public String toString() { - return "org.jlab.atlis.workmap.persistence.entity.WorkMap[ workMapId=" + workMapId + " ]"; - } - - public List copyWorkMapTaskList(WorkMap map) { - List tasks = new ArrayList(); - - if(workMapTaskList != null) { - for(WorkMapTask task: workMapTaskList) { - tasks.add(task.copy(map)); - } - } - - return tasks; - } - - public List copyWorkMapPssList(WorkMap map) { - List pss = new ArrayList(); - - if(workMapPssList != null) { - for(WorkMapPss p: workMapPssList) { - pss.add(p.copy(map)); - } - } - - return pss; - } - + return pss; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java index 8dfb84e..8034cfa 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java @@ -19,104 +19,122 @@ import javax.validation.constraints.NotNull; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP_PSS", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"WORK_MAP_ID", "WORK_MAP_PSS_AREA_ID"})}) +@Table( + name = "WORK_MAP_PSS", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"WORK_MAP_ID", "WORK_MAP_PSS_AREA_ID"})}) @NamedQueries({ - @NamedQuery(name = "WorkMapPss.findAll", query = "SELECT w FROM WorkMapPss w"), - @NamedQuery(name = "WorkMapPss.deleteByWorkMapId", query = "DELETE FROM WorkMapPss w WHERE w.workMapId.workMapId = :workMapId"), - @NamedQuery(name = "WorkMapPss.findByWorkMapIdEager", query = "SELECT w FROM WorkMapPss w LEFT JOIN FETCH w.workMapPssStateId JOIN FETCH w.workMapPssAreaId WHERE w.workMapId.workMapId = :workMapId"), - @NamedQuery(name = "WorkMapPss.findByWorkMapPssId", query = "SELECT w FROM WorkMapPss w WHERE w.workMapPssId = :workMapPssId")}) + @NamedQuery(name = "WorkMapPss.findAll", query = "SELECT w FROM WorkMapPss w"), + @NamedQuery( + name = "WorkMapPss.deleteByWorkMapId", + query = "DELETE FROM WorkMapPss w WHERE w.workMapId.workMapId = :workMapId"), + @NamedQuery( + name = "WorkMapPss.findByWorkMapIdEager", + query = + "SELECT w FROM WorkMapPss w LEFT JOIN FETCH w.workMapPssStateId JOIN FETCH w.workMapPssAreaId WHERE w.workMapId.workMapId = :workMapId"), + @NamedQuery( + name = "WorkMapPss.findByWorkMapPssId", + query = "SELECT w FROM WorkMapPss w WHERE w.workMapPssId = :workMapPssId") +}) public class WorkMapPss implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapPssId", sequenceName = "WORK_MAP_PSS_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapPssId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_PSS_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapPssId; - @JoinColumn(name = "WORK_MAP_PSS_STATE_ID", referencedColumnName = "WORK_MAP_PSS_STATE_ID") - @ManyToOne(fetch = FetchType.LAZY) - private WorkMapPssState workMapPssStateId; - @JoinColumn(name = "WORK_MAP_PSS_AREA_ID", referencedColumnName = "WORK_MAP_PSS_AREA_ID", nullable = false) - @ManyToOne(optional = false, fetch = FetchType.LAZY) - private WorkMapPssArea workMapPssAreaId; - @JoinColumn(name = "WORK_MAP_ID", referencedColumnName = "WORK_MAP_ID", nullable = false) - @ManyToOne(optional = false, fetch = FetchType.LAZY) - private WorkMap workMapId; - - public WorkMapPss() { + private static final long serialVersionUID = 1L; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator(name = "WorkMapPssId", sequenceName = "WORK_MAP_PSS_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapPssId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_PSS_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapPssId; + + @JoinColumn(name = "WORK_MAP_PSS_STATE_ID", referencedColumnName = "WORK_MAP_PSS_STATE_ID") + @ManyToOne(fetch = FetchType.LAZY) + private WorkMapPssState workMapPssStateId; + + @JoinColumn( + name = "WORK_MAP_PSS_AREA_ID", + referencedColumnName = "WORK_MAP_PSS_AREA_ID", + nullable = false) + @ManyToOne(optional = false, fetch = FetchType.LAZY) + private WorkMapPssArea workMapPssAreaId; + + @JoinColumn(name = "WORK_MAP_ID", referencedColumnName = "WORK_MAP_ID", nullable = false) + @ManyToOne(optional = false, fetch = FetchType.LAZY) + private WorkMap workMapId; + + public WorkMapPss() {} + + public WorkMapPss(BigDecimal workMapPssId) { + this.workMapPssId = workMapPssId; + } + + public BigDecimal getWorkMapPssId() { + return workMapPssId; + } + + public void setWorkMapPssId(BigDecimal workMapPssId) { + this.workMapPssId = workMapPssId; + } + + public WorkMapPssState getWorkMapPssStateId() { + return workMapPssStateId; + } + + public void setWorkMapPssStateId(WorkMapPssState workMapPssStateId) { + this.workMapPssStateId = workMapPssStateId; + } + + public WorkMapPssArea getWorkMapPssAreaId() { + return workMapPssAreaId; + } + + public void setWorkMapPssAreaId(WorkMapPssArea workMapPssAreaId) { + this.workMapPssAreaId = workMapPssAreaId; + } + + public WorkMap getWorkMapId() { + return workMapId; + } + + public void setWorkMapId(WorkMap workMapId) { + this.workMapId = workMapId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapPssId != null ? workMapPssId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMapPss)) { + return false; } - - public WorkMapPss(BigDecimal workMapPssId) { - this.workMapPssId = workMapPssId; - } - - public BigDecimal getWorkMapPssId() { - return workMapPssId; - } - - public void setWorkMapPssId(BigDecimal workMapPssId) { - this.workMapPssId = workMapPssId; - } - - public WorkMapPssState getWorkMapPssStateId() { - return workMapPssStateId; - } - - public void setWorkMapPssStateId(WorkMapPssState workMapPssStateId) { - this.workMapPssStateId = workMapPssStateId; - } - - public WorkMapPssArea getWorkMapPssAreaId() { - return workMapPssAreaId; - } - - public void setWorkMapPssAreaId(WorkMapPssArea workMapPssAreaId) { - this.workMapPssAreaId = workMapPssAreaId; - } - - public WorkMap getWorkMapId() { - return workMapId; - } - - public void setWorkMapId(WorkMap workMapId) { - this.workMapId = workMapId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (workMapPssId != null ? workMapPssId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMapPss)) { - return false; - } - WorkMapPss other = (WorkMapPss)object; - return (this.workMapPssId != null || other.workMapPssId == null) && (this.workMapPssId == null || this.workMapPssId.equals(other.workMapPssId)); - } - - @Override - public String toString() { - return "org.jlab.atlis.workmap.persistence.entity.WorkMapPss[ workMapPssId=" + workMapPssId + " ]"; - } - - public WorkMapPss copy(WorkMap map) { - WorkMapPss p = new WorkMapPss(); - p.setWorkMapPssAreaId(workMapPssAreaId); - p.setWorkMapPssStateId(workMapPssStateId); - p.setWorkMapId(map); - return p; - } - + WorkMapPss other = (WorkMapPss) object; + return (this.workMapPssId != null || other.workMapPssId == null) + && (this.workMapPssId == null || this.workMapPssId.equals(other.workMapPssId)); + } + + @Override + public String toString() { + return "org.jlab.atlis.workmap.persistence.entity.WorkMapPss[ workMapPssId=" + + workMapPssId + + " ]"; + } + + public WorkMapPss copy(WorkMap map) { + WorkMapPss p = new WorkMapPss(); + p.setWorkMapPssAreaId(workMapPssAreaId); + p.setWorkMapPssStateId(workMapPssStateId); + p.setWorkMapId(map); + return p; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java index e81d54f..d075875 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java @@ -21,90 +21,104 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP_PSS_AREA", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"AREA_NAME"})}) +@Table( + name = "WORK_MAP_PSS_AREA", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"AREA_NAME"})}) @NamedQueries({ - @NamedQuery(name = "WorkMapPssArea.findAll", query = "SELECT w FROM WorkMapPssArea w"), - @NamedQuery(name = "WorkMapPssArea.findByWorkMapPssAreaId", query = "SELECT w FROM WorkMapPssArea w WHERE w.workMapPssAreaId = :workMapPssAreaId"), - @NamedQuery(name = "WorkMapPssArea.findByAreaName", query = "SELECT w FROM WorkMapPssArea w WHERE w.areaName = :areaName")}) + @NamedQuery(name = "WorkMapPssArea.findAll", query = "SELECT w FROM WorkMapPssArea w"), + @NamedQuery( + name = "WorkMapPssArea.findByWorkMapPssAreaId", + query = "SELECT w FROM WorkMapPssArea w WHERE w.workMapPssAreaId = :workMapPssAreaId"), + @NamedQuery( + name = "WorkMapPssArea.findByAreaName", + query = "SELECT w FROM WorkMapPssArea w WHERE w.areaName = :areaName") +}) public class WorkMapPssArea implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapPssAreaId", sequenceName = "WORK_MAP_PSS_AREA_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapPssAreaId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_PSS_AREA_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapPssAreaId; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 32) - @Column(name = "AREA_NAME", nullable = false, length = 32) - private String areaName; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapPssAreaId", fetch = FetchType.LAZY) - private List workMapPssList; - - public WorkMapPssArea() { - } + private static final long serialVersionUID = 1L; - public WorkMapPssArea(BigDecimal workMapPssAreaId) { - this.workMapPssAreaId = workMapPssAreaId; - } + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator( + name = "WorkMapPssAreaId", + sequenceName = "WORK_MAP_PSS_AREA_ID", + allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapPssAreaId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_PSS_AREA_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapPssAreaId; - public WorkMapPssArea(BigDecimal workMapPssAreaId, String areaName) { - this.workMapPssAreaId = workMapPssAreaId; - this.areaName = areaName; - } + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 32) + @Column(name = "AREA_NAME", nullable = false, length = 32) + private String areaName; - public BigDecimal getWorkMapPssAreaId() { - return workMapPssAreaId; - } + @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapPssAreaId", fetch = FetchType.LAZY) + private List workMapPssList; - public void setWorkMapPssAreaId(BigDecimal workMapPssAreaId) { - this.workMapPssAreaId = workMapPssAreaId; - } + public WorkMapPssArea() {} - public String getAreaName() { - return areaName; - } + public WorkMapPssArea(BigDecimal workMapPssAreaId) { + this.workMapPssAreaId = workMapPssAreaId; + } - public void setAreaName(String areaName) { - this.areaName = areaName; - } + public WorkMapPssArea(BigDecimal workMapPssAreaId, String areaName) { + this.workMapPssAreaId = workMapPssAreaId; + this.areaName = areaName; + } - public List getWorkMapPssList() { - return workMapPssList; - } + public BigDecimal getWorkMapPssAreaId() { + return workMapPssAreaId; + } - public void setWorkMapPssList(List workMapPssList) { - this.workMapPssList = workMapPssList; - } + public void setWorkMapPssAreaId(BigDecimal workMapPssAreaId) { + this.workMapPssAreaId = workMapPssAreaId; + } - @Override - public int hashCode() { - int hash = 0; - hash += (workMapPssAreaId != null ? workMapPssAreaId.hashCode() : 0); - return hash; - } + public String getAreaName() { + return areaName; + } - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMapPssArea)) { - return false; - } - WorkMapPssArea other = (WorkMapPssArea)object; - return (this.workMapPssAreaId != null || other.workMapPssAreaId == null) && (this.workMapPssAreaId == null || this.workMapPssAreaId.equals(other.workMapPssAreaId)); - } + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public List getWorkMapPssList() { + return workMapPssList; + } - @Override - public String toString() { - return "org.jlab.atlis.workmap.persistence.entity.WorkMapPssArea[ workMapPssAreaId=" + workMapPssAreaId + " ]"; + public void setWorkMapPssList(List workMapPssList) { + this.workMapPssList = workMapPssList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapPssAreaId != null ? workMapPssAreaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMapPssArea)) { + return false; } - + WorkMapPssArea other = (WorkMapPssArea) object; + return (this.workMapPssAreaId != null || other.workMapPssAreaId == null) + && (this.workMapPssAreaId == null || this.workMapPssAreaId.equals(other.workMapPssAreaId)); + } + + @Override + public String toString() { + return "org.jlab.atlis.workmap.persistence.entity.WorkMapPssArea[ workMapPssAreaId=" + + workMapPssAreaId + + " ]"; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java index b9085de..6fd70fe 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java @@ -20,108 +20,129 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP_PSS_STATE", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"STATE_NAME"})}) +@Table( + name = "WORK_MAP_PSS_STATE", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"STATE_NAME"})}) @NamedQueries({ - @NamedQuery(name = "WorkMapPssState.findAll", query = "SELECT w FROM WorkMapPssState w"), - @NamedQuery(name = "WorkMapPssState.findAllOrdered", query = "SELECT w FROM WorkMapPssState w order by w.weight asc"), - @NamedQuery(name = "WorkMapPssState.findByWorkMapPssStateId", query = "SELECT w FROM WorkMapPssState w WHERE w.workMapPssStateId = :workMapPssStateId"), - @NamedQuery(name = "WorkMapPssState.findByStateName", query = "SELECT w FROM WorkMapPssState w WHERE w.stateName = :stateName"), - @NamedQuery(name = "WorkMapPssState.findByCssClassName", query = "SELECT w FROM WorkMapPssState w WHERE w.cssClassName = :cssClassName")}) + @NamedQuery(name = "WorkMapPssState.findAll", query = "SELECT w FROM WorkMapPssState w"), + @NamedQuery( + name = "WorkMapPssState.findAllOrdered", + query = "SELECT w FROM WorkMapPssState w order by w.weight asc"), + @NamedQuery( + name = "WorkMapPssState.findByWorkMapPssStateId", + query = "SELECT w FROM WorkMapPssState w WHERE w.workMapPssStateId = :workMapPssStateId"), + @NamedQuery( + name = "WorkMapPssState.findByStateName", + query = "SELECT w FROM WorkMapPssState w WHERE w.stateName = :stateName"), + @NamedQuery( + name = "WorkMapPssState.findByCssClassName", + query = "SELECT w FROM WorkMapPssState w WHERE w.cssClassName = :cssClassName") +}) public class WorkMapPssState implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapPssStateId", sequenceName = "WORK_MAP_PSS_STATE_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapPssStateId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_PSS_STATE_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapPssStateId; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 32) - @Column(name = "STATE_NAME", nullable = false, length = 32) - private String stateName; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 32) - @Column(name = "CSS_CLASS_NAME", nullable = false, length = 32) - private String cssClassName; - @Column(name = "WEIGHT", nullable = true) - private Integer weight; - @OneToMany(mappedBy = "workMapPssStateId", fetch = FetchType.LAZY) - private List workMapPssList; - - public WorkMapPssState() { + private static final long serialVersionUID = 1L; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator( + name = "WorkMapPssStateId", + sequenceName = "WORK_MAP_PSS_STATE_ID", + allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapPssStateId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_PSS_STATE_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapPssStateId; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 32) + @Column(name = "STATE_NAME", nullable = false, length = 32) + private String stateName; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 32) + @Column(name = "CSS_CLASS_NAME", nullable = false, length = 32) + private String cssClassName; + + @Column(name = "WEIGHT", nullable = true) + private Integer weight; + + @OneToMany(mappedBy = "workMapPssStateId", fetch = FetchType.LAZY) + private List workMapPssList; + + public WorkMapPssState() {} + + public WorkMapPssState(BigDecimal workMapPssStateId) { + this.workMapPssStateId = workMapPssStateId; + } + + public WorkMapPssState(BigDecimal workMapPssStateId, String stateName, String cssClassName) { + this.workMapPssStateId = workMapPssStateId; + this.stateName = stateName; + this.cssClassName = cssClassName; + } + + public BigDecimal getWorkMapPssStateId() { + return workMapPssStateId; + } + + public void setWorkMapPssStateId(BigDecimal workMapPssStateId) { + this.workMapPssStateId = workMapPssStateId; + } + + public String getStateName() { + return stateName; + } + + public void setStateName(String stateName) { + this.stateName = stateName; + } + + public String getCssClassName() { + return cssClassName; + } + + public void setCssClassName(String cssClassName) { + this.cssClassName = cssClassName; + } + + public List getWorkMapPssList() { + return workMapPssList; + } + + public void setWorkMapPssList(List workMapPssList) { + this.workMapPssList = workMapPssList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapPssStateId != null ? workMapPssStateId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMapPssState)) { + return false; } - - public WorkMapPssState(BigDecimal workMapPssStateId) { - this.workMapPssStateId = workMapPssStateId; - } - - public WorkMapPssState(BigDecimal workMapPssStateId, String stateName, String cssClassName) { - this.workMapPssStateId = workMapPssStateId; - this.stateName = stateName; - this.cssClassName = cssClassName; - } - - public BigDecimal getWorkMapPssStateId() { - return workMapPssStateId; - } - - public void setWorkMapPssStateId(BigDecimal workMapPssStateId) { - this.workMapPssStateId = workMapPssStateId; - } - - public String getStateName() { - return stateName; - } - - public void setStateName(String stateName) { - this.stateName = stateName; - } - - public String getCssClassName() { - return cssClassName; - } - - public void setCssClassName(String cssClassName) { - this.cssClassName = cssClassName; - } - - public List getWorkMapPssList() { - return workMapPssList; - } - - public void setWorkMapPssList(List workMapPssList) { - this.workMapPssList = workMapPssList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (workMapPssStateId != null ? workMapPssStateId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMapPssState)) { - return false; - } - WorkMapPssState other = (WorkMapPssState)object; - return (this.workMapPssStateId != null || other.workMapPssStateId == null) && (this.workMapPssStateId == null || this.workMapPssStateId.equals(other.workMapPssStateId)); - } - - @Override - public String toString() { - return "org.jlab.atlis.workmap.persistence.entity.WorkMapPssState[ workMapPssStateId=" + workMapPssStateId + " ]"; - } - + WorkMapPssState other = (WorkMapPssState) object; + return (this.workMapPssStateId != null || other.workMapPssStateId == null) + && (this.workMapPssStateId == null + || this.workMapPssStateId.equals(other.workMapPssStateId)); + } + + @Override + public String toString() { + return "org.jlab.atlis.workmap.persistence.entity.WorkMapPssState[ workMapPssStateId=" + + workMapPssStateId + + " ]"; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java index 83fc264..d770d34 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java @@ -21,130 +21,162 @@ import javax.xml.bind.annotation.XmlRootElement; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP_TASK", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"WORK_MAP_ID", "WORK_MAP_TASK_AREA_ID"})}) +@Table( + name = "WORK_MAP_TASK", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"WORK_MAP_ID", "WORK_MAP_TASK_AREA_ID"})}) @XmlRootElement @NamedQueries({ - @NamedQuery(name = "WorkMapTask.findAll", query = "SELECT w FROM WorkMapTask w"), - @NamedQuery(name = "WorkMapTask.findByWorkMapTaskId", query = "SELECT w FROM WorkMapTask w WHERE w.workMapTaskId = :workMapTaskId"), - @NamedQuery(name = "WorkMapTask.findByWorkMapIdEager", query = "SELECT w FROM WorkMapTask w LEFT JOIN FETCH w.workMapTaskTypeId JOIN FETCH w.workMapTaskAreaId WHERE w.workMapId.workMapId = :workMapId"), - @NamedQuery(name = "WorkMapTask.deleteByWorkMapId", query = "DELETE FROM WorkMapTask w WHERE w.workMapId.workMapId = :workMapId"), - @NamedQuery(name = "WorkMapTask.findByMessage", query = "SELECT w FROM WorkMapTask w WHERE w.message = :message")}) + @NamedQuery(name = "WorkMapTask.findAll", query = "SELECT w FROM WorkMapTask w"), + @NamedQuery( + name = "WorkMapTask.findByWorkMapTaskId", + query = "SELECT w FROM WorkMapTask w WHERE w.workMapTaskId = :workMapTaskId"), + @NamedQuery( + name = "WorkMapTask.findByWorkMapIdEager", + query = + "SELECT w FROM WorkMapTask w LEFT JOIN FETCH w.workMapTaskTypeId JOIN FETCH w.workMapTaskAreaId WHERE w.workMapId.workMapId = :workMapId"), + @NamedQuery( + name = "WorkMapTask.deleteByWorkMapId", + query = "DELETE FROM WorkMapTask w WHERE w.workMapId.workMapId = :workMapId"), + @NamedQuery( + name = "WorkMapTask.findByMessage", + query = "SELECT w FROM WorkMapTask w WHERE w.message = :message") +}) public class WorkMapTask implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapTaskId", sequenceName = "WORK_MAP_TASK_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapTaskId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_TASK_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapTaskId; - @Size(max = 32) - @Column(name = "MESSAGE", length = 32) - private String message; - @Column(name = "UPSTAIRS_YN", length = 1) - @NotNull - @Size(min = 1, max = 1) - private String upstairsYn; - @JoinColumn(name = "WORK_MAP_ID", referencedColumnName = "WORK_MAP_ID", nullable = false) - @ManyToOne(optional = false, fetch = FetchType.LAZY) - private WorkMap workMapId; - @JoinColumn(name = "WORK_MAP_TASK_TYPE_ID", referencedColumnName = "WORK_MAP_TASK_TYPE_ID") - @ManyToOne(fetch = FetchType.LAZY) - private WorkMapTaskType workMapTaskTypeId; - @JoinColumn(name = "WORK_MAP_TASK_AREA_ID", referencedColumnName = "WORK_MAP_TASK_AREA_ID", nullable = false) - @ManyToOne(optional = false, fetch = FetchType.LAZY) - private WorkMapTaskArea workMapTaskAreaId; - - public WorkMapTask() { - } - - public WorkMapTask(BigDecimal workMapTaskId) { - this.workMapTaskId = workMapTaskId; - } - - public boolean isUpstairs() { - return "Y".equals(upstairsYn); - } - - public void setUpstairs(boolean upstairs) { - this.upstairsYn = upstairs ? "Y" : "N"; - } - - public BigDecimal getWorkMapTaskId() { - return workMapTaskId; - } - - public void setWorkMapTaskId(BigDecimal workMapTaskId) { - this.workMapTaskId = workMapTaskId; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (workMapTaskId != null ? workMapTaskId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMapTask)) { - return false; - } - WorkMapTask other = (WorkMapTask)object; - return (this.workMapTaskId != null || other.workMapTaskId == null) && (this.workMapTaskId == null || this.workMapTaskId.equals(other.workMapTaskId)); - } - - public WorkMapTaskType getWorkMapTaskTypeId() { - return workMapTaskTypeId; - } - - public void setWorkMapTaskTypeId(WorkMapTaskType workMapTaskTypeId) { - this.workMapTaskTypeId = workMapTaskTypeId; - } - - public WorkMapTaskArea getWorkMapTaskAreaId() { - return workMapTaskAreaId; - } - - public void setWorkMapTaskAreaId(WorkMapTaskArea workMapTaskAreaId) { - this.workMapTaskAreaId = workMapTaskAreaId; - } - - public WorkMap getWorkMapId() { - return workMapId; - } - - public void setWorkMapId(WorkMap workMapId) { - this.workMapId = workMapId; - } - - @Override - public String toString() { - return "WorkMapTask{" + "workMapTaskId=" + workMapTaskId + ", message=" + message + ", workMapId=" + workMapId + ", workMapTaskTypeId=" + workMapTaskTypeId + ", workMapTaskAreaId=" + workMapTaskAreaId + '}'; - } - - public WorkMapTask copy(WorkMap map) { - WorkMapTask task = new WorkMapTask(); - task.setUpstairs(isUpstairs()); - task.setMessage(message); - task.setWorkMapTaskAreaId(workMapTaskAreaId); - task.setWorkMapTaskTypeId(workMapTaskTypeId); - task.setWorkMapId(map); - return task; - } + private static final long serialVersionUID = 1L; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator(name = "WorkMapTaskId", sequenceName = "WORK_MAP_TASK_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapTaskId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_TASK_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapTaskId; + + @Size(max = 32) + @Column(name = "MESSAGE", length = 32) + private String message; + + @Column(name = "UPSTAIRS_YN", length = 1) + @NotNull + @Size(min = 1, max = 1) + private String upstairsYn; + + @JoinColumn(name = "WORK_MAP_ID", referencedColumnName = "WORK_MAP_ID", nullable = false) + @ManyToOne(optional = false, fetch = FetchType.LAZY) + private WorkMap workMapId; + + @JoinColumn(name = "WORK_MAP_TASK_TYPE_ID", referencedColumnName = "WORK_MAP_TASK_TYPE_ID") + @ManyToOne(fetch = FetchType.LAZY) + private WorkMapTaskType workMapTaskTypeId; + + @JoinColumn( + name = "WORK_MAP_TASK_AREA_ID", + referencedColumnName = "WORK_MAP_TASK_AREA_ID", + nullable = false) + @ManyToOne(optional = false, fetch = FetchType.LAZY) + private WorkMapTaskArea workMapTaskAreaId; + + public WorkMapTask() {} + + public WorkMapTask(BigDecimal workMapTaskId) { + this.workMapTaskId = workMapTaskId; + } + + public boolean isUpstairs() { + return "Y".equals(upstairsYn); + } + + public void setUpstairs(boolean upstairs) { + this.upstairsYn = upstairs ? "Y" : "N"; + } + + public BigDecimal getWorkMapTaskId() { + return workMapTaskId; + } + + public void setWorkMapTaskId(BigDecimal workMapTaskId) { + this.workMapTaskId = workMapTaskId; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapTaskId != null ? workMapTaskId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMapTask)) { + return false; + } + WorkMapTask other = (WorkMapTask) object; + return (this.workMapTaskId != null || other.workMapTaskId == null) + && (this.workMapTaskId == null || this.workMapTaskId.equals(other.workMapTaskId)); + } + + public WorkMapTaskType getWorkMapTaskTypeId() { + return workMapTaskTypeId; + } + + public void setWorkMapTaskTypeId(WorkMapTaskType workMapTaskTypeId) { + this.workMapTaskTypeId = workMapTaskTypeId; + } + + public WorkMapTaskArea getWorkMapTaskAreaId() { + return workMapTaskAreaId; + } + + public void setWorkMapTaskAreaId(WorkMapTaskArea workMapTaskAreaId) { + this.workMapTaskAreaId = workMapTaskAreaId; + } + + public WorkMap getWorkMapId() { + return workMapId; + } + + public void setWorkMapId(WorkMap workMapId) { + this.workMapId = workMapId; + } + + @Override + public String toString() { + return "WorkMapTask{" + + "workMapTaskId=" + + workMapTaskId + + ", message=" + + message + + ", workMapId=" + + workMapId + + ", workMapTaskTypeId=" + + workMapTaskTypeId + + ", workMapTaskAreaId=" + + workMapTaskAreaId + + '}'; + } + + public WorkMapTask copy(WorkMap map) { + WorkMapTask task = new WorkMapTask(); + task.setUpstairs(isUpstairs()); + task.setMessage(message); + task.setWorkMapTaskAreaId(workMapTaskAreaId); + task.setWorkMapTaskTypeId(workMapTaskTypeId); + task.setWorkMapId(map); + return task; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java index 6ec5fc5..78224c5 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java @@ -20,98 +20,114 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP_TASK_AREA", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"AREA_NAME"})}) +@Table( + name = "WORK_MAP_TASK_AREA", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"AREA_NAME"})}) @NamedQueries({ - @NamedQuery(name = "WorkMapTaskArea.findAll", query = "SELECT w FROM WorkMapTaskArea w"), - @NamedQuery(name = "WorkMapTaskArea.findByWorkMapTaskAreaId", query = "SELECT w FROM WorkMapTaskArea w WHERE w.workMapTaskAreaId = :workMapTaskAreaId"), - @NamedQuery(name = "WorkMapTaskArea.findByAreaName", query = "SELECT w FROM WorkMapTaskArea w WHERE w.areaName = :areaName")}) + @NamedQuery(name = "WorkMapTaskArea.findAll", query = "SELECT w FROM WorkMapTaskArea w"), + @NamedQuery( + name = "WorkMapTaskArea.findByWorkMapTaskAreaId", + query = "SELECT w FROM WorkMapTaskArea w WHERE w.workMapTaskAreaId = :workMapTaskAreaId"), + @NamedQuery( + name = "WorkMapTaskArea.findByAreaName", + query = "SELECT w FROM WorkMapTaskArea w WHERE w.areaName = :areaName") +}) public class WorkMapTaskArea implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapTaskAreaId", sequenceName = "WORK_MAP_TASK_AREA_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapTaskAreaId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_TASK_AREA_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapTaskAreaId; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 32) - @Column(name = "AREA_NAME", nullable = false, length = 32) - private String areaName; - @Column(name = "ICON_ONLY_YN", length = 1) - @NotNull - @Size(min = 1, max = 1) - private String iconOnlyYn; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapTaskAreaId") - private List workMapTaskList; - - public WorkMapTaskArea() { - } + private static final long serialVersionUID = 1L; - public WorkMapTaskArea(BigDecimal workMapTaskAreaId) { - this.workMapTaskAreaId = workMapTaskAreaId; - } + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator( + name = "WorkMapTaskAreaId", + sequenceName = "WORK_MAP_TASK_AREA_ID", + allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapTaskAreaId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_TASK_AREA_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapTaskAreaId; - public WorkMapTaskArea(BigDecimal workMapTaskAreaId, String areaName) { - this.workMapTaskAreaId = workMapTaskAreaId; - this.areaName = areaName; - } + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 32) + @Column(name = "AREA_NAME", nullable = false, length = 32) + private String areaName; - public BigDecimal getWorkMapTaskAreaId() { - return workMapTaskAreaId; - } + @Column(name = "ICON_ONLY_YN", length = 1) + @NotNull + @Size(min = 1, max = 1) + private String iconOnlyYn; - public void setWorkMapTaskAreaId(BigDecimal workMapTaskAreaId) { - this.workMapTaskAreaId = workMapTaskAreaId; - } + @OneToMany(cascade = CascadeType.ALL, mappedBy = "workMapTaskAreaId") + private List workMapTaskList; - public String getAreaName() { - return areaName; - } + public WorkMapTaskArea() {} - public void setAreaName(String areaName) { - this.areaName = areaName; - } + public WorkMapTaskArea(BigDecimal workMapTaskAreaId) { + this.workMapTaskAreaId = workMapTaskAreaId; + } - public boolean isIconOnly() { - return "Y".equals(iconOnlyYn); - } + public WorkMapTaskArea(BigDecimal workMapTaskAreaId, String areaName) { + this.workMapTaskAreaId = workMapTaskAreaId; + this.areaName = areaName; + } - public List getWorkMapTaskList() { - return workMapTaskList; - } + public BigDecimal getWorkMapTaskAreaId() { + return workMapTaskAreaId; + } - public void setWorkMapTaskList(List workMapTaskList) { - this.workMapTaskList = workMapTaskList; - } + public void setWorkMapTaskAreaId(BigDecimal workMapTaskAreaId) { + this.workMapTaskAreaId = workMapTaskAreaId; + } - @Override - public int hashCode() { - int hash = 0; - hash += (workMapTaskAreaId != null ? workMapTaskAreaId.hashCode() : 0); - return hash; - } + public String getAreaName() { + return areaName; + } - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMapTaskArea)) { - return false; - } - WorkMapTaskArea other = (WorkMapTaskArea)object; - return (this.workMapTaskAreaId != null || other.workMapTaskAreaId == null) && (this.workMapTaskAreaId == null || this.workMapTaskAreaId.equals(other.workMapTaskAreaId)); - } + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public boolean isIconOnly() { + return "Y".equals(iconOnlyYn); + } - @Override - public String toString() { - return "org.jlab.atlis.workmap.persistence.entity.WorkMapTaskArea[ workMapTaskAreaId=" + workMapTaskAreaId + " ]"; + public List getWorkMapTaskList() { + return workMapTaskList; + } + + public void setWorkMapTaskList(List workMapTaskList) { + this.workMapTaskList = workMapTaskList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapTaskAreaId != null ? workMapTaskAreaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMapTaskArea)) { + return false; } - + WorkMapTaskArea other = (WorkMapTaskArea) object; + return (this.workMapTaskAreaId != null || other.workMapTaskAreaId == null) + && (this.workMapTaskAreaId == null + || this.workMapTaskAreaId.equals(other.workMapTaskAreaId)); + } + + @Override + public String toString() { + return "org.jlab.atlis.workmap.persistence.entity.WorkMapTaskArea[ workMapTaskAreaId=" + + workMapTaskAreaId + + " ]"; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java index b956f2f..c795c58 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java @@ -19,118 +19,139 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "WORK_MAP_TASK_TYPE", schema = "WORKMAP_OWNER", uniqueConstraints = { - @UniqueConstraint(columnNames = {"TYPE_NAME"})}) +@Table( + name = "WORK_MAP_TASK_TYPE", + schema = "WORKMAP_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"TYPE_NAME"})}) @NamedQueries({ - @NamedQuery(name = "WorkMapTaskType.findAll", query = "SELECT w FROM WorkMapTaskType w"), - @NamedQuery(name = "WorkMapTaskType.findAllOrdered", query = "SELECT w FROM WorkMapTaskType w order by w.orderId asc"), - @NamedQuery(name = "WorkMapTaskType.findByWorkMapTaskTypeId", query = "SELECT w FROM WorkMapTaskType w WHERE w.workMapTaskTypeId = :workMapTaskTypeId"), - @NamedQuery(name = "WorkMapTaskType.findByTypeName", query = "SELECT w FROM WorkMapTaskType w WHERE w.typeName = :typeName"), - @NamedQuery(name = "WorkMapTaskType.findByCssClassName", query = "SELECT w FROM WorkMapTaskType w WHERE w.cssClassName = :cssClassName")}) + @NamedQuery(name = "WorkMapTaskType.findAll", query = "SELECT w FROM WorkMapTaskType w"), + @NamedQuery( + name = "WorkMapTaskType.findAllOrdered", + query = "SELECT w FROM WorkMapTaskType w order by w.orderId asc"), + @NamedQuery( + name = "WorkMapTaskType.findByWorkMapTaskTypeId", + query = "SELECT w FROM WorkMapTaskType w WHERE w.workMapTaskTypeId = :workMapTaskTypeId"), + @NamedQuery( + name = "WorkMapTaskType.findByTypeName", + query = "SELECT w FROM WorkMapTaskType w WHERE w.typeName = :typeName"), + @NamedQuery( + name = "WorkMapTaskType.findByCssClassName", + query = "SELECT w FROM WorkMapTaskType w WHERE w.cssClassName = :cssClassName") +}) public class WorkMapTaskType implements Serializable { - private static final long serialVersionUID = 1L; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @SequenceGenerator(name = "WorkMapTaskTypeId", sequenceName = "WORK_MAP_TASK_TYPE_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapTaskTypeId") - @Basic(optional = false) - @NotNull - @Column(name = "WORK_MAP_TASK_TYPE_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal workMapTaskTypeId; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 32) - @Column(name = "TYPE_NAME", nullable = false, length = 32) - private String typeName; - @NotNull - @Basic(optional = false) - @Column(name = "ORDER_ID", nullable = false, precision = 32, scale = 0) - private BigDecimal orderId; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 32) - @Column(name = "CSS_CLASS_NAME", nullable = false, length = 32) - private String cssClassName; - @OneToMany(mappedBy = "workMapTaskTypeId") - private List workMapTaskList; - - public WorkMapTaskType() { + private static final long serialVersionUID = 1L; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @SequenceGenerator( + name = "WorkMapTaskTypeId", + sequenceName = "WORK_MAP_TASK_TYPE_ID", + allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "WorkMapTaskTypeId") + @Basic(optional = false) + @NotNull + @Column(name = "WORK_MAP_TASK_TYPE_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal workMapTaskTypeId; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 32) + @Column(name = "TYPE_NAME", nullable = false, length = 32) + private String typeName; + + @NotNull + @Basic(optional = false) + @Column(name = "ORDER_ID", nullable = false, precision = 32, scale = 0) + private BigDecimal orderId; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 32) + @Column(name = "CSS_CLASS_NAME", nullable = false, length = 32) + private String cssClassName; + + @OneToMany(mappedBy = "workMapTaskTypeId") + private List workMapTaskList; + + public WorkMapTaskType() {} + + public WorkMapTaskType(BigDecimal workMapTaskTypeId) { + this.workMapTaskTypeId = workMapTaskTypeId; + } + + public WorkMapTaskType(BigDecimal workMapTaskTypeId, String typeName, String cssClassName) { + this.workMapTaskTypeId = workMapTaskTypeId; + this.typeName = typeName; + this.cssClassName = cssClassName; + } + + public BigDecimal getOrderId() { + return orderId; + } + + public void setOrderId(BigDecimal orderId) { + this.orderId = orderId; + } + + public BigDecimal getWorkMapTaskTypeId() { + return workMapTaskTypeId; + } + + public void setWorkMapTaskTypeId(BigDecimal workMapTaskTypeId) { + this.workMapTaskTypeId = workMapTaskTypeId; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getCssClassName() { + return cssClassName; + } + + public void setCssClassName(String cssClassName) { + this.cssClassName = cssClassName; + } + + public List getWorkMapTaskList() { + return workMapTaskList; + } + + public void setWorkMapTaskList(List workMapTaskList) { + this.workMapTaskList = workMapTaskList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (workMapTaskTypeId != null ? workMapTaskTypeId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof WorkMapTaskType)) { + return false; } - - public WorkMapTaskType(BigDecimal workMapTaskTypeId) { - this.workMapTaskTypeId = workMapTaskTypeId; - } - - public WorkMapTaskType(BigDecimal workMapTaskTypeId, String typeName, String cssClassName) { - this.workMapTaskTypeId = workMapTaskTypeId; - this.typeName = typeName; - this.cssClassName = cssClassName; - } - - public BigDecimal getOrderId() { - return orderId; - } - - public void setOrderId(BigDecimal orderId) { - this.orderId = orderId; - } - - public BigDecimal getWorkMapTaskTypeId() { - return workMapTaskTypeId; - } - - public void setWorkMapTaskTypeId(BigDecimal workMapTaskTypeId) { - this.workMapTaskTypeId = workMapTaskTypeId; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - - public String getCssClassName() { - return cssClassName; - } - - public void setCssClassName(String cssClassName) { - this.cssClassName = cssClassName; - } - - public List getWorkMapTaskList() { - return workMapTaskList; - } - - public void setWorkMapTaskList(List workMapTaskList) { - this.workMapTaskList = workMapTaskList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (workMapTaskTypeId != null ? workMapTaskTypeId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof WorkMapTaskType)) { - return false; - } - WorkMapTaskType other = (WorkMapTaskType)object; - return (this.workMapTaskTypeId != null || other.workMapTaskTypeId == null) && (this.workMapTaskTypeId == null || this.workMapTaskTypeId.equals(other.workMapTaskTypeId)); - } - - @Override - public String toString() { - return "org.jlab.atlis.workmap.persistence.entity.WorkMapTaskType[ workMapTaskTypeId=" + workMapTaskTypeId + " ]"; - } - + WorkMapTaskType other = (WorkMapTaskType) object; + return (this.workMapTaskTypeId != null || other.workMapTaskTypeId == null) + && (this.workMapTaskTypeId == null + || this.workMapTaskTypeId.equals(other.workMapTaskTypeId)); + } + + @Override + public String toString() { + return "org.jlab.atlis.workmap.persistence.entity.WorkMapTaskType[ workMapTaskTypeId=" + + workMapTaskTypeId + + " ]"; + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java index 6132b42..40909c9 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java @@ -1,10 +1,5 @@ package org.jlab.atlis.workmap.presentation.controller; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -14,107 +9,117 @@ import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** - * Servlet controller for proxying requests to Puppet Show to allow HTML conversion even for external / public users. + * Servlet controller for proxying requests to Puppet Show to allow HTML conversion even for + * external / public users. * - * This controller only allows relative URLs (relative to hosting server). + *

This controller only allows relative URLs (relative to hosting server). * * @author ryans */ -@WebServlet(name = "Convert", urlPatterns = {"/convert"}) +@WebServlet( + name = "Convert", + urlPatterns = {"/convert"}) public class Convert extends HttpServlet { - private static final Logger LOGGER = Logger.getLogger( - Convert.class.getName()); - - /** - * Handles the HTTP - * GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - String type = request.getParameter("type"); - String filename = request.getParameter("filename"); - String urlString = request.getParameter("url"); - String waitForSelector = request.getParameter("waitForSelector"); - - String puppetServer = System.getenv("PUPPET_SHOW_SERVER_URL"); - String internalServer = System.getenv("BACKEND_SERVER_URL"); - - if(puppetServer == null) { - puppetServer = "http://localhost"; - } + private static final Logger LOGGER = Logger.getLogger(Convert.class.getName()); + + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + String type = request.getParameter("type"); + String filename = request.getParameter("filename"); + String urlString = request.getParameter("url"); + String waitForSelector = request.getParameter("waitForSelector"); + + String puppetServer = System.getenv("PUPPET_SHOW_SERVER_URL"); + String internalServer = System.getenv("BACKEND_SERVER_URL"); + + if (puppetServer == null) { + puppetServer = "http://localhost"; + } - if(internalServer == null) { - internalServer = "http://localhost"; - } + if (internalServer == null) { + internalServer = "http://localhost"; + } - if (urlString == null) { - throw new ServletException("url parameter must not be empty"); - } + if (urlString == null) { + throw new ServletException("url parameter must not be empty"); + } - if (urlString.indexOf("://") > 0 || urlString.indexOf("//") == 0) { - throw new ServletException("url parameter must not be absolute"); - } + if (urlString.indexOf("://") > 0 || urlString.indexOf("//") == 0) { + throw new ServletException("url parameter must not be absolute"); + } - if(!urlString.startsWith("/")){ - urlString = "/" + urlString; - } + if (!urlString.startsWith("/")) { + urlString = "/" + urlString; + } - internalServer = internalServer + urlString; + internalServer = internalServer + urlString; - internalServer = URLEncoder.encode(internalServer, StandardCharsets.UTF_8); + internalServer = URLEncoder.encode(internalServer, StandardCharsets.UTF_8); - if(waitForSelector == null) { - waitForSelector = ""; - } else { - waitForSelector = URLEncoder.encode(waitForSelector, StandardCharsets.UTF_8); - } + if (waitForSelector == null) { + waitForSelector = ""; + } else { + waitForSelector = URLEncoder.encode(waitForSelector, StandardCharsets.UTF_8); + } - if ("pdf".equals(type)) { - response.setHeader("content-type", "application/pdf"); - puppetServer = puppetServer + "/puppet-show/pdf"; + if ("pdf".equals(type)) { + response.setHeader("content-type", "application/pdf"); + puppetServer = puppetServer + "/puppet-show/pdf"; - } else { - response.setHeader("content-type", "application/png"); - puppetServer = puppetServer + "/puppet-show/screenshot"; - } + } else { + response.setHeader("content-type", "application/png"); + puppetServer = puppetServer + "/puppet-show/screenshot"; + } - puppetServer = puppetServer + "?ignoreHTTPSErrors=true&format=Letter&printBackground=true&landscape=true&waitUntil=networkidle2" + "&url=" + internalServer; + puppetServer = + puppetServer + + "?ignoreHTTPSErrors=true&format=Letter&printBackground=true&landscape=true&waitUntil=networkidle2" + + "&url=" + + internalServer; - if (filename != null && !filename.isEmpty()) { - response.setHeader("content-disposition", "attachment; filename=\"" + filename + "\""); - } + if (filename != null && !filename.isEmpty()) { + response.setHeader("content-disposition", "attachment; filename=\"" + filename + "\""); + } - LOGGER.log(Level.INFO, "Puppet URL Request: " + puppetServer); + LOGGER.log(Level.INFO, "Puppet URL Request: " + puppetServer); - URL url = new URL(puppetServer); + URL url = new URL(puppetServer); - URLConnection con = url.openConnection(); + URLConnection con = url.openConnection(); - /*HttpsURLConnection con = (HttpsURLConnection) url.openConnection(); + /*HttpsURLConnection con = (HttpsURLConnection) url.openConnection(); - con.setHostnameVerifier(IOUtil.getTrustyHostnameVerifier()); + con.setHostnameVerifier(IOUtil.getTrustyHostnameVerifier()); - try { - con.setSSLSocketFactory(IOUtil.getTrustySSLSocketFactory()); - } catch (NoSuchAlgorithmException | KeyManagementException e) { - throw new ServletException("Unable to disable SSL Certificate Verification", e); - }*/ + try { + con.setSSLSocketFactory(IOUtil.getTrustySSLSocketFactory()); + } catch (NoSuchAlgorithmException | KeyManagementException e) { + throw new ServletException("Unable to disable SSL Certificate Verification", e); + }*/ - InputStream in = con.getInputStream(); - OutputStream out = response.getOutputStream(); + InputStream in = con.getInputStream(); + OutputStream out = response.getOutputStream(); - in.transferTo(out); + in.transferTo(out); - in.close(); - } + in.close(); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java index fbc8bc2..e2491d4 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java @@ -13,32 +13,34 @@ import org.jlab.atlis.workmap.business.session.WorkMapFacade; import org.jlab.atlis.workmap.presentation.util.WorkmapUtil; -@WebServlet(name = "CopyWorkMap", urlPatterns = {"/copy-work-map"}) +@WebServlet( + name = "CopyWorkMap", + urlPatterns = {"/copy-work-map"}) public class CopyWorkMap extends HttpServlet { - @EJB - private WorkMapFacade mapFacade; - @Inject - private WorkmapUtil workmapUtil; + @EJB private WorkMapFacade mapFacade; + @Inject private WorkmapUtil workmapUtil; - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - Date from = workmapUtil.convertValidateYearMonthDay(request, "from"); - Date to = workmapUtil.convertValidateYearMonthDay(request, "to"); + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + Date from = workmapUtil.convertValidateYearMonthDay(request, "from"); + Date to = workmapUtil.convertValidateYearMonthDay(request, "to"); - mapFacade.copy(from, to); + mapFacade.copy(from, to); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + "/view-work-map?yearMonthDay=" + format.format(to))); - } + response.sendRedirect( + response.encodeRedirectURL( + request.getContextPath() + "/view-work-map?yearMonthDay=" + format.format(to))); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java index c292cee..ae6580c 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java @@ -17,55 +17,61 @@ import org.jlab.atlis.workmap.persistence.entity.WorkMapTask; import org.jlab.atlis.workmap.presentation.util.WorkmapUtil; -@WebServlet(name = "EditWorkMap", urlPatterns = {"/edit-work-map"}) +@WebServlet( + name = "EditWorkMap", + urlPatterns = {"/edit-work-map"}) public class EditWorkMap extends HttpServlet { - - @EJB - private WorkMapFacade mapFacade; - @Inject - private WorkmapUtil workmapUtil; - - /** - * Handles the HTTP GET method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - workmapUtil.doGet(getServletContext(), request, response, true); - } - - /** - * Handles the HTTP POST method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - Date yearMonthDay = workmapUtil.convertValidateYearMonthDay(request); - WorkMap map = workmapUtil.convertAndValidateWorkMap(request, yearMonthDay); - List tasks = workmapUtil.convertAndValidateTasks(request, map); - List pss = workmapUtil.convertAndValidatePss(request, map); - - /*System.out.println("Submitted: "); - - for(WorkMapTask task: tasks) { - System.out.println(task); - }*/ - - map.setWorkMapTaskList(tasks); - map.setWorkMapPssList(pss); - - mapFacade.save(map); - - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - - response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + "/view-work-map?yearMonthDay=" + format.format(yearMonthDay))); - } + + @EJB private WorkMapFacade mapFacade; + @Inject private WorkmapUtil workmapUtil; + + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + workmapUtil.doGet(getServletContext(), request, response, true); + } + + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + Date yearMonthDay = workmapUtil.convertValidateYearMonthDay(request); + WorkMap map = workmapUtil.convertAndValidateWorkMap(request, yearMonthDay); + List tasks = workmapUtil.convertAndValidateTasks(request, map); + List pss = workmapUtil.convertAndValidatePss(request, map); + + /*System.out.println("Submitted: "); + + for(WorkMapTask task: tasks) { + System.out.println(task); + }*/ + + map.setWorkMapTaskList(tasks); + map.setWorkMapPssList(pss); + + mapFacade.save(map); + + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + + response.sendRedirect( + response.encodeRedirectURL( + request.getContextPath() + + "/view-work-map?yearMonthDay=" + + format.format(yearMonthDay))); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java index fb717ff..21198a9 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java @@ -10,60 +10,65 @@ import org.jlab.atlis.workmap.presentation.exception.WorkMapException; /** - * * @author ryans */ -@WebServlet(name = "Error", urlPatterns = {"/error"}) +@WebServlet( + name = "Error", + urlPatterns = {"/error"}) public class Error extends HttpServlet { - /** - * Handles the HTTP GET method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception"); - Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code"); - String servletName = (String) request.getAttribute("javax.servlet.error.servlet_name"); - String requestUri = (String) request.getAttribute("javax.servlet.error.request_uri"); + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception"); + Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code"); + String servletName = (String) request.getAttribute("javax.servlet.error.servlet_name"); + String requestUri = (String) request.getAttribute("javax.servlet.error.request_uri"); - String message = "An unknown error has occurred."; - - if(throwable != null) { - System.err.println("Throwable Class: " + throwable.getClass()); - - if(throwable instanceof EJBAccessException) { - message = "You are not authorized to perform the requested action."; - } - else if(throwable instanceof WorkMapException) { - message = throwable.getMessage(); - } - else { - throwable.printStackTrace(); - } - } - - System.err.println("Status Code: " + statusCode); - System.err.println("Servlet Name: " + servletName); - System.err.println("Request URI: " + requestUri); - - request.setAttribute("message", message); - getServletConfig().getServletContext().getRequestDispatcher("/WEB-INF/views/error.jsp").forward(request, response); - } + String message = "An unknown error has occurred."; + + if (throwable != null) { + System.err.println("Throwable Class: " + throwable.getClass()); - /** - * Handles the HTTP POST method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); + if (throwable instanceof EJBAccessException) { + message = "You are not authorized to perform the requested action."; + } else if (throwable instanceof WorkMapException) { + message = throwable.getMessage(); + } else { + throwable.printStackTrace(); + } } + + System.err.println("Status Code: " + statusCode); + System.err.println("Servlet Name: " + servletName); + System.err.println("Request URI: " + requestUri); + + request.setAttribute("message", message); + getServletConfig() + .getServletContext() + .getRequestDispatcher("/WEB-INF/views/error.jsp") + .forward(request, response); + } + + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + doGet(request, response); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java index 7df286a..fc03266 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java @@ -8,25 +8,29 @@ import javax.servlet.http.HttpServletResponse; /** - * * @author ryans */ -@WebServlet(name = "Logout", urlPatterns = {"/logout"}) +@WebServlet( + name = "Logout", + urlPatterns = {"/logout"}) public class Logout extends HttpServlet { - - /** - * Handles the HTTP POST method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String yearMonthDay = request.getParameter("yearMonthDay"); - request.logout(); - request.getSession().invalidate(); - response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + "/view-work-map?yearMonthDay=" + yearMonthDay)); - } + + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String yearMonthDay = request.getParameter("yearMonthDay"); + request.logout(); + request.getSession().invalidate(); + response.sendRedirect( + response.encodeRedirectURL( + request.getContextPath() + "/view-work-map?yearMonthDay=" + yearMonthDay)); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java index ee4a702..cd0ece3 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java @@ -8,28 +8,29 @@ import javax.servlet.http.HttpServletResponse; /** - * * @author ryans */ -@WebServlet(name = "SSORedirect", urlPatterns = {"/sso"}) +@WebServlet( + name = "SSORedirect", + urlPatterns = {"/sso"}) public class SSORedirect extends HttpServlet { - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String returnUrl = request.getParameter("returnUrl"); - if (returnUrl == null || returnUrl.isEmpty()) { - returnUrl = request.getContextPath(); - } - - response.sendRedirect(response.encodeRedirectURL(returnUrl)); + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String returnUrl = request.getParameter("returnUrl"); + if (returnUrl == null || returnUrl.isEmpty()) { + returnUrl = request.getContextPath(); } + + response.sendRedirect(response.encodeRedirectURL(returnUrl)); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java index e00ef8f..800393b 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java @@ -9,22 +9,24 @@ import javax.servlet.http.HttpServletResponse; import org.jlab.atlis.workmap.presentation.util.WorkmapUtil; -@WebServlet(name = "ViewWorkMap", urlPatterns = {"/view-work-map"}) +@WebServlet( + name = "ViewWorkMap", + urlPatterns = {"/view-work-map"}) public class ViewWorkMap extends HttpServlet { - - @Inject - private WorkmapUtil workmapUtil; - - /** - * Handles the HTTP GET method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - workmapUtil.doGet(getServletContext(), request, response, false); - } + + @Inject private WorkmapUtil workmapUtil; + + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + workmapUtil.doGet(getServletContext(), request, response, false); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java b/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java index 96686f1..66a8167 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java @@ -3,11 +3,10 @@ import javax.servlet.ServletException; /** - * * @author ryans */ public class WorkMapException extends ServletException { - public WorkMapException(String message) { - super(message); - } + public WorkMapException(String message) { + super(message); + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java index 8e28fa9..1a6edd1 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java @@ -14,60 +14,70 @@ import javax.servlet.http.HttpServletResponseWrapper; /** - * * @author ryans */ -@WebFilter(filterName = "CacheFilter", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST, DispatcherType.FORWARD}) +@WebFilter( + filterName = "CacheFilter", + urlPatterns = {"/*"}, + dispatcherTypes = {DispatcherType.REQUEST, DispatcherType.FORWARD}) public class CacheFilter implements Filter { - public static final long EXPIRE_MILLIS = 31536000000L; // 365 days is max expires per spec + public static final long EXPIRE_MILLIS = 31536000000L; // 365 days is max expires per spec - public static final String[] CACHEABLE_CONTENT_TYPES = new String[]{ - "text/css", "text/javascript", "application/javascript", "image/png", - "image/jpeg", "image/jpg", "image/gif", "image/icon", "image/x-icon", - "image/vnd.microsoft.icon", "image/svg+xml" - }; + public static final String[] CACHEABLE_CONTENT_TYPES = + new String[] { + "text/css", + "text/javascript", + "application/javascript", + "image/png", + "image/jpeg", + "image/jpg", + "image/gif", + "image/icon", + "image/x-icon", + "image/vnd.microsoft.icon", + "image/svg+xml" + }; - static { - Arrays.sort(CACHEABLE_CONTENT_TYPES); - } + static { + Arrays.sort(CACHEABLE_CONTENT_TYPES); + } - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) - throws IOException, ServletException { - HttpServletResponse httpResponse = (HttpServletResponse) response; + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + HttpServletResponse httpResponse = (HttpServletResponse) response; - chain.doFilter(request, new CacheControlResponse(httpResponse)); - } + chain.doFilter(request, new CacheControlResponse(httpResponse)); + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } + @Override + public void init(FilterConfig filterConfig) throws ServletException {} - @Override - public void destroy() { - } + @Override + public void destroy() {} - class CacheControlResponse extends HttpServletResponseWrapper { + class CacheControlResponse extends HttpServletResponseWrapper { - public CacheControlResponse(HttpServletResponse response) { - super(response); - } + public CacheControlResponse(HttpServletResponse response) { + super(response); + } - @Override - public void setContentType(String type) { - super.setContentType(type); + @Override + public void setContentType(String type) { + super.setContentType(type); - if (type != null && Arrays.binarySearch(CACHEABLE_CONTENT_TYPES, type) > -1) { - super.setDateHeader("Expires", System.currentTimeMillis() + EXPIRE_MILLIS); - super.setHeader("Cache-Control", null); // Remove header automatically added by SSL/TLS container module - super.setHeader("Pragma", null); // Remove header automatically added by SSL/TLS container module - } else { - super.setHeader("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1 - super.setHeader("Pragma", "no-cache"); // HTTP 1.0 - super.setDateHeader("Expires", 0); // Proxies - } - } + if (type != null && Arrays.binarySearch(CACHEABLE_CONTENT_TYPES, type) > -1) { + super.setDateHeader("Expires", System.currentTimeMillis() + EXPIRE_MILLIS); + super.setHeader( + "Cache-Control", null); // Remove header automatically added by SSL/TLS container module + super.setHeader( + "Pragma", null); // Remove header automatically added by SSL/TLS container module + } else { + super.setHeader("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1 + super.setHeader("Pragma", "no-cache"); // HTTP 1.0 + super.setDateHeader("Expires", 0); // Proxies + } } + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java index 356cac5..cd34300 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java @@ -11,26 +11,25 @@ import javax.servlet.annotation.WebFilter; /** - * * @author ryans */ -@WebFilter(filterName = "CharacterEncodingFilter", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST}) +@WebFilter( + filterName = "CharacterEncodingFilter", + urlPatterns = {"/*"}, + dispatcherTypes = {DispatcherType.REQUEST}) public class CharacterEncodingFilter implements Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) - throws IOException, ServletException { - request.setCharacterEncoding("UTF-8"); - response.setCharacterEncoding("UTF-8"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding("UTF-8"); + chain.doFilter(request, response); + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } + @Override + public void init(FilterConfig filterConfig) throws ServletException {} - @Override - public void destroy() { - } + @Override + public void destroy() {} } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java index 9f05f34..a0093d9 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java @@ -13,28 +13,29 @@ import javax.servlet.jsp.jstl.core.Config; /** - * * @author ryans */ -@WebFilter(filterName = "LocaleFilter", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST}) +@WebFilter( + filterName = "LocaleFilter", + urlPatterns = {"/*"}, + dispatcherTypes = {DispatcherType.REQUEST}) public class LocaleFilter implements Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) - throws IOException, ServletException { - // If a request does not contain the header "Accept-Language: en-US" then we see issues with date formatting. - // For example the jstl:formatDate tag requires a locale or will simply use Object.toString(). - // Also, most of the time our apps don't care about client locale - we always assume en-US as our layouts often aren't made to have dynamic date formats. - Config.set(request, Config.FMT_LOCALE, new Locale("en", "US")); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + // If a request does not contain the header "Accept-Language: en-US" then we see issues with + // date formatting. + // For example the jstl:formatDate tag requires a locale or will simply use Object.toString(). + // Also, most of the time our apps don't care about client locale - we always assume en-US as + // our layouts often aren't made to have dynamic date formats. + Config.set(request, Config.FMT_LOCALE, new Locale("en", "US")); + chain.doFilter(request, response); + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } + @Override + public void init(FilterConfig filterConfig) throws ServletException {} - @Override - public void destroy() { - } + @Override + public void destroy() {} } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java index 3f6b00b..541503f 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java @@ -1,52 +1,49 @@ package org.jlab.atlis.workmap.presentation.filter; +import java.io.IOException; +import java.util.logging.Logger; import javax.servlet.*; import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.logging.Logger; /** - * * @author ryans */ -@WebFilter(filterName = "PublicProxyFilter", urlPatterns = {"/*"}, dispatcherTypes = { - DispatcherType.REQUEST, DispatcherType.FORWARD}) +@WebFilter( + filterName = "PublicProxyFilter", + urlPatterns = {"/*"}, + dispatcherTypes = {DispatcherType.REQUEST, DispatcherType.FORWARD}) public class PublicProxyFilter implements Filter { - private static final Logger LOGGER = Logger.getLogger( - PublicProxyFilter.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PublicProxyFilter.class.getName()); - @Override - public void doFilter(ServletRequest req, ServletResponse resp, - FilterChain chain) - throws IOException, ServletException { - HttpServletRequest request = (HttpServletRequest) req; - HttpServletResponse response = (HttpServletResponse) resp; + @Override + public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) + throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest) req; + HttpServletResponse response = (HttpServletResponse) resp; - boolean publicProxy = request.getHeader("X-Public-Proxy") != null || request.getParameter("public-proxy") - != null; + boolean publicProxy = + request.getHeader("X-Public-Proxy") != null || request.getParameter("public-proxy") != null; - // You don't have a choice if proxy server sets this + // You don't have a choice if proxy server sets this - request.setAttribute("publicProxy", publicProxy); + request.setAttribute("publicProxy", publicProxy); - if (publicProxy) { - request.setAttribute("cdnContextPath", ""); - } else { - ServletContext context = request.getServletContext(); - request.setAttribute("cdnContextPath", "//" + System.getenv("CDN_SERVER")); - } - - chain.doFilter(request, response); + if (publicProxy) { + request.setAttribute("cdnContextPath", ""); + } else { + ServletContext context = request.getServletContext(); + request.setAttribute("cdnContextPath", "//" + System.getenv("CDN_SERVER")); } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void init(FilterConfig filterConfig) throws ServletException {} + + @Override + public void destroy() {} } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java b/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java index 90c3518..b6046a8 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java @@ -10,41 +10,39 @@ @WebListener public class ConfigurationParameterInit implements ServletContextListener { - private static final Logger LOGGER = Logger.getLogger( - ConfigurationParameterInit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ConfigurationParameterInit.class.getName()); - @Override - public void contextInitialized(ServletContextEvent sce) { - ServletContext context = sce.getServletContext(); + @Override + public void contextInitialized(ServletContextEvent sce) { + ServletContext context = sce.getServletContext(); - String cdnHostname = System.getenv("CDN_SERVER"); - if (cdnHostname == null || cdnHostname.trim().isEmpty()) { - // Let's use a sensible default - cdnHostname = "cdn.acc.jlab.org"; - } - - context.setInitParameter("cdnContextPath", "//" + cdnHostname); - LOGGER.log(Level.FINEST, "Setting CDN_SERVER: {0}", cdnHostname); - - String notification = System.getenv("SERVER_MESSAGE"); + String cdnHostname = System.getenv("CDN_SERVER"); + if (cdnHostname == null || cdnHostname.trim().isEmpty()) { + // Let's use a sensible default + cdnHostname = "cdn.acc.jlab.org"; + } - // If not null, but empty set to null - if (notification != null && notification.trim().isEmpty()) { - notification = null; - } + context.setInitParameter("cdnContextPath", "//" + cdnHostname); + LOGGER.log(Level.FINEST, "Setting CDN_SERVER: {0}", cdnHostname); - if (notification != null) { - context.setInitParameter("notification", notification); - } - LOGGER.log(Level.FINEST, "Setting notification: {0}", notification); + String notification = System.getenv("SERVER_MESSAGE"); - // We will just expose all environment variables! - context.setAttribute("env", System.getenv()); + // If not null, but empty set to null + if (notification != null && notification.trim().isEmpty()) { + notification = null; } - @Override - public void contextDestroyed(ServletContextEvent sce) { - // Nothing to do + if (notification != null) { + context.setInitParameter("notification", notification); } + LOGGER.log(Level.FINEST, "Setting notification: {0}", notification); + + // We will just expose all environment variables! + context.setAttribute("env", System.getenv()); + } + @Override + public void contextDestroyed(ServletContextEvent sce) { + // Nothing to do + } } diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java b/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java index 6a259ca..dcdaacd 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java @@ -32,209 +32,206 @@ import org.jlab.atlis.workmap.presentation.exception.WorkMapException; /** - * * @author ryans */ @Named @RequestScoped public class WorkmapUtil { - @Inject - private WorkMapFacade mapFacade; - @Inject - private WorkMapTaskAreaFacade taskAreaFacade; - @Inject - private WorkMapTaskTypeFacade taskTypeFacade; - @Inject - private WorkMapPssAreaFacade pssAreaFacade; - @Inject - private WorkMapPssStateFacade pssStateFacade; - @Inject - private WorkMapTaskFacade taskFacade; - @Inject - private WorkMapPssFacade pssFacade; - - public Date convertValidateYearMonthDay(HttpServletRequest request) throws WorkMapException { - return convertValidateYearMonthDay(request, "yearMonthDay"); + @Inject private WorkMapFacade mapFacade; + @Inject private WorkMapTaskAreaFacade taskAreaFacade; + @Inject private WorkMapTaskTypeFacade taskTypeFacade; + @Inject private WorkMapPssAreaFacade pssAreaFacade; + @Inject private WorkMapPssStateFacade pssStateFacade; + @Inject private WorkMapTaskFacade taskFacade; + @Inject private WorkMapPssFacade pssFacade; + + public Date convertValidateYearMonthDay(HttpServletRequest request) throws WorkMapException { + return convertValidateYearMonthDay(request, "yearMonthDay"); + } + + public Date convertValidateYearMonthDay(HttpServletRequest request, String name) + throws WorkMapException { + String yearMonthDayParam = request.getParameter(name); + + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + format.setLenient(false); + + Date yearMonthDay = null; + + if (yearMonthDayParam == null || yearMonthDayParam.isEmpty()) { + // Default is current day month and year (with zero hour/minute/sec) + yearMonthDay = TimeHelper.getCurrentYearMonthDay(); + } else { + try { + yearMonthDay = format.parse(yearMonthDayParam); + } catch (ParseException e) { + throw new WorkMapException("Day must be in the format yyyy-mm-dd"); + } } - public Date convertValidateYearMonthDay(HttpServletRequest request, String name) throws WorkMapException { - String yearMonthDayParam = request.getParameter(name); + return yearMonthDay; + } - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - format.setLenient(false); + public List convertAndValidateTasks(HttpServletRequest request, WorkMap map) { - Date yearMonthDay = null; + List tasks = new ArrayList(); - if (yearMonthDayParam == null || yearMonthDayParam.isEmpty()) { - // Default is current day month and year (with zero hour/minute/sec) - yearMonthDay = TimeHelper.getCurrentYearMonthDay(); - } else { - try { - yearMonthDay = format.parse(yearMonthDayParam); - } catch (ParseException e) { - throw new WorkMapException("Day must be in the format yyyy-mm-dd"); - } - } + List taskAreas = taskAreaFacade.findAll(); + List taskTypes = taskTypeFacade.findAll(); + Map typeMap = taskTypeFacade.createMap(taskTypes); - return yearMonthDay; - } - - public List convertAndValidateTasks(HttpServletRequest request, WorkMap map) { + for (WorkMapTaskArea area : taskAreas) { + String symbol = request.getParameter(area.getAreaName() + "-symbol"); + String text = request.getParameter(area.getAreaName() + "-text"); + String upstairs = request.getParameter(area.getAreaName() + "-upstairs"); - List tasks = new ArrayList(); + boolean upstairsBoolean = "Y".equals(upstairs); - List taskAreas = taskAreaFacade.findAll(); - List taskTypes = taskTypeFacade.findAll(); - Map typeMap = taskTypeFacade.createMap(taskTypes); + // System.out.println("symbol: " + symbol); + // System.out.println("text: " + text); + if ((symbol != null && !symbol.isEmpty()) || (text != null && !text.isEmpty())) { + WorkMapTask task = new WorkMapTask(); + task.setWorkMapTaskAreaId(area); + task.setWorkMapId(map); + task.setWorkMapTaskTypeId(typeMap.get(symbol)); + task.setMessage(text); + task.setUpstairs(upstairsBoolean); + tasks.add(task); + } + } - for (WorkMapTaskArea area : taskAreas) { - String symbol = request.getParameter(area.getAreaName() + "-symbol"); - String text = request.getParameter(area.getAreaName() + "-text"); - String upstairs = request.getParameter(area.getAreaName() + "-upstairs"); + return tasks; + } - boolean upstairsBoolean = "Y".equals(upstairs); + public WorkMap convertAndValidateWorkMap(HttpServletRequest request, Date yearMonthDay) { + WorkMap map = null; + String note = request.getParameter("note"); - //System.out.println("symbol: " + symbol); - //System.out.println("text: " + text); - if ((symbol != null && !symbol.isEmpty()) || (text != null && !text.isEmpty())) { - WorkMapTask task = new WorkMapTask(); - task.setWorkMapTaskAreaId(area); - task.setWorkMapId(map); - task.setWorkMapTaskTypeId(typeMap.get(symbol)); - task.setMessage(text); - task.setUpstairs(upstairsBoolean); - tasks.add(task); - } - } + map = mapFacade.findByYearMonthDayEager(yearMonthDay); - return tasks; + if (map == null) { + map = new WorkMap(); } - public WorkMap convertAndValidateWorkMap(HttpServletRequest request, Date yearMonthDay) { - WorkMap map = null; - String note = request.getParameter("note"); + map.setYearMonthDay(yearMonthDay); + map.setNote(note); + map.setLastModified(new Date()); - map = mapFacade.findByYearMonthDayEager(yearMonthDay); + return map; + } - if (map == null) { - map = new WorkMap(); - } + public List convertAndValidatePss(HttpServletRequest request, WorkMap map) { + List pss = new ArrayList(); - map.setYearMonthDay(yearMonthDay); - map.setNote(note); - map.setLastModified(new Date()); + List pssAreas = pssAreaFacade.findAll(); + List pssStates = pssStateFacade.findAll(); + Map stateMap = pssStateFacade.createMap(pssStates); - return map; + for (WorkMapPssArea area : pssAreas) { + String line = request.getParameter(area.getAreaName() + "-line"); + + // System.out.println("line: " + line); + if (line != null && !line.isEmpty()) { + WorkMapPss p = new WorkMapPss(); + p.setWorkMapPssAreaId(area); + p.setWorkMapId(map); + p.setWorkMapPssStateId(stateMap.get(line)); + pss.add(p); + } } - public List convertAndValidatePss(HttpServletRequest request, WorkMap map) { - List pss = new ArrayList(); + return pss; + } - List pssAreas = pssAreaFacade.findAll(); - List pssStates = pssStateFacade.findAll(); - Map stateMap = pssStateFacade.createMap(pssStates); + public void doGet( + ServletContext context, + HttpServletRequest request, + HttpServletResponse response, + boolean editable) + throws ServletException, IOException { - for (WorkMapPssArea area : pssAreas) { - String line = request.getParameter(area.getAreaName() + "-line"); + Date yearMonthDay = convertValidateYearMonthDay(request); - //System.out.println("line: " + line); - if (line != null && !line.isEmpty()) { - WorkMapPss p = new WorkMapPss(); - p.setWorkMapPssAreaId(area); - p.setWorkMapId(map); - p.setWorkMapPssStateId(stateMap.get(line)); - pss.add(p); - } - } + WorkMap map = mapFacade.findByYearMonthDayEager(yearMonthDay); - return pss; + if (map == null) { + map = new WorkMap(); + map.setYearMonthDay(yearMonthDay); } - public void doGet(ServletContext context, HttpServletRequest request, HttpServletResponse response, boolean editable) - throws ServletException, IOException { - - Date yearMonthDay = convertValidateYearMonthDay(request); - - WorkMap map = mapFacade.findByYearMonthDayEager(yearMonthDay); - - if (map == null) { - map = new WorkMap(); - map.setYearMonthDay(yearMonthDay); - } - - List tasks = map.getWorkMapTaskList(); - Map taskMap = taskFacade.createMap(tasks); - List taskAreas = taskAreaFacade.findAll(); - List taskTypes = taskTypeFacade.findAllOrdered(); - - List pss = map.getWorkMapPssList(); - Map pssMap = pssFacade.createMap(pss); - List pssAreas = pssAreaFacade.findAll(); - List pssStates = pssStateFacade.findAllOrdered(); - - Date previous = TimeHelper.getPreviousYearMonthDay(yearMonthDay); - Date next = TimeHelper.getNextYearMonthDay(yearMonthDay); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - String previousYearMonthDayURL = "view-work-map?yearMonthDay=" + format.format(previous); - String nextYearMonthDayURL = "view-work-map?yearMonthDay=" + format.format(next); - - String absContextURL = getBaseURL(request); - - request.setAttribute("absContextURL", absContextURL); - request.setAttribute("editable", editable); - request.setAttribute("yearMonthDay", yearMonthDay); - request.setAttribute("previousURL", previousYearMonthDayURL); - request.setAttribute("nextURL", nextYearMonthDayURL); - request.setAttribute("taskMap", taskMap); - request.setAttribute("taskAreas", taskAreas); - request.setAttribute("taskTypes", taskTypes); - request.setAttribute("pssMap", pssMap); - request.setAttribute("pssAreas", pssAreas); - request.setAttribute("pssStates", pssStates); - request.setAttribute("note", map.getNote()); - request.setAttribute("lastModified", map.getLastModified()); - - context.getRequestDispatcher("/WEB-INF/views/work-map.jsp").forward(request, response); + List tasks = map.getWorkMapTaskList(); + Map taskMap = taskFacade.createMap(tasks); + List taskAreas = taskAreaFacade.findAll(); + List taskTypes = taskTypeFacade.findAllOrdered(); + + List pss = map.getWorkMapPssList(); + Map pssMap = pssFacade.createMap(pss); + List pssAreas = pssAreaFacade.findAll(); + List pssStates = pssStateFacade.findAllOrdered(); + + Date previous = TimeHelper.getPreviousYearMonthDay(yearMonthDay); + Date next = TimeHelper.getNextYearMonthDay(yearMonthDay); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String previousYearMonthDayURL = "view-work-map?yearMonthDay=" + format.format(previous); + String nextYearMonthDayURL = "view-work-map?yearMonthDay=" + format.format(next); + + String absContextURL = getBaseURL(request); + + request.setAttribute("absContextURL", absContextURL); + request.setAttribute("editable", editable); + request.setAttribute("yearMonthDay", yearMonthDay); + request.setAttribute("previousURL", previousYearMonthDayURL); + request.setAttribute("nextURL", nextYearMonthDayURL); + request.setAttribute("taskMap", taskMap); + request.setAttribute("taskAreas", taskAreas); + request.setAttribute("taskTypes", taskTypes); + request.setAttribute("pssMap", pssMap); + request.setAttribute("pssAreas", pssAreas); + request.setAttribute("pssStates", pssStates); + request.setAttribute("note", map.getNote()); + request.setAttribute("lastModified", map.getLastModified()); + + context.getRequestDispatcher("/WEB-INF/views/work-map.jsp").forward(request, response); + } + + public String getBaseURL(HttpServletRequest request) { + String scheme = request.getScheme(); + + String host = System.getenv("javaProxyHost"); + + if (host == null || host.isEmpty()) { + host = request.getServerName(); } - public String getBaseURL(HttpServletRequest request) { - String scheme = request.getScheme(); - - String host = System.getenv("javaProxyHost"); + String portWithColon = null; - if (host == null || host.isEmpty()) { - host = request.getServerName(); - } + if (scheme.equals("http")) { + String port = System.getenv("javaProxyPort"); - String portWithColon = null; + if (port == null || port.isEmpty()) { + port = String.valueOf(request.getServerPort()); + } - if (scheme.equals("http")) { - String port = System.getenv("javaProxyPort"); + if (port.equals("80")) { + portWithColon = ""; + } else { + portWithColon = ":" + port; + } + } else { // https + String port = System.getenv("javaProxySecurePort"); - if (port == null || port.isEmpty()) { - port = String.valueOf(request.getServerPort()); - } + if (port == null || port.isEmpty()) { + port = String.valueOf(request.getServerPort()); + } - if (port.equals("80")) { - portWithColon = ""; - } else { - portWithColon = ":" + port; - } - } else { // https - String port = System.getenv("javaProxySecurePort"); - - if (port == null || port.isEmpty()) { - port = String.valueOf(request.getServerPort()); - } - - if (port.equals("443")) { - portWithColon = ""; - } else { - portWithColon = ":" + port; - } - } - - return scheme + "://" + host + portWithColon + request.getContextPath(); + if (port.equals("443")) { + portWithColon = ""; + } else { + portWithColon = ":" + port; + } } + + return scheme + "://" + host + portWithColon + request.getContextPath(); + } }