From e7357c2d12c26129176df010dbe44476fdf99ce1 Mon Sep 17 00:00:00 2001 From: ryans Date: Mon, 30 Sep 2024 13:31:34 -0400 Subject: [PATCH] Google Java format --- .gitattributes | 5 +- build.gradle | 7 + .../cnm/business/session/AbstractFacade.java | 146 +++--- .../business/session/ElementCodeFacade.java | 29 +- .../business/session/ExcelCodeListFacade.java | 130 ++--- .../business/session/LocatorCodeFacade.java | 79 +-- .../business/session/SectorCodeFacade.java | 340 +++++++------ .../business/session/SystemCodeFacade.java | 193 ++++--- .../business/session/TranslatorService.java | 80 ++- .../cnm/business/session/TypeCodeFacade.java | 478 +++++++++--------- .../cnm/persistence/entity/ElementCode.java | 204 ++++---- .../cnm/persistence/entity/LocatorCode.java | 234 ++++----- .../cnm/persistence/entity/SectorCode.java | 226 +++++---- .../cnm/persistence/entity/SystemCode.java | 197 ++++---- .../jlab/cnm/persistence/entity/TypeCode.java | 256 +++++----- .../cnm/presentation/controller/Overview.java | 32 +- .../presentation/controller/Translate.java | 49 +- .../presentation/controller/Translator.java | 32 +- .../controller/ajax/AddSector.java | 80 ++- .../controller/ajax/AddSystem.java | 78 ++- .../presentation/controller/ajax/AddType.java | 82 ++- .../controller/ajax/EditAttributes.java | 79 ++- .../controller/ajax/EditSector.java | 82 ++- .../controller/ajax/EditSystem.java | 80 ++- .../controller/ajax/EditType.java | 84 ++- .../ajax/FilterTypeGroupingBySystem.java | 75 ++- .../controller/ajax/RemoveSector.java | 70 ++- .../controller/ajax/RemoveSystem.java | 70 ++- .../controller/ajax/RemoveType.java | 72 ++- .../controller/codes/ElementController.java | 47 +- .../controller/codes/LocatorController.java | 45 +- .../controller/codes/SectorController.java | 98 ++-- .../controller/codes/SystemController.java | 47 +- .../controller/codes/TypeController.java | 148 +++--- .../controller/export/ExcelCodeList.java | 67 ++- .../controller/export/HtmlCodeList.java | 75 ++- .../controller/export/HtmlOverview.java | 43 +- .../controller/generator/StepFive.java | 102 ++-- .../controller/generator/StepFour.java | 98 ++-- .../controller/generator/StepOne.java | 49 +- .../controller/generator/StepThree.java | 93 ++-- .../controller/generator/StepTwo.java | 77 +-- 42 files changed, 2278 insertions(+), 2280 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9257333..8a24478 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 diff --git a/build.gradle b/build.gradle index 250cfa7..9298c5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'war' + id "com.diffplug.spotless" version "6.25.0" } description = 'CEBAF Nomenclature Manager app' group 'org.jlab' @@ -40,3 +41,9 @@ war { } } } + +spotless { + java { + googleJavaFormat() + } +} \ No newline at end of file diff --git a/src/main/java/org/jlab/cnm/business/session/AbstractFacade.java b/src/main/java/org/jlab/cnm/business/session/AbstractFacade.java index 4b436be..9bff5e1 100644 --- a/src/main/java/org/jlab/cnm/business/session/AbstractFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/AbstractFacade.java @@ -15,97 +15,95 @@ import javax.persistence.criteria.Root; /** - * * @author ryans */ public abstract class AbstractFacade { - @Resource - private SessionContext context; - - private final Class entityClass; + @Resource private SessionContext context; - public AbstractFacade(Class entityClass) { - this.entityClass = entityClass; - } + private final Class entityClass; - protected abstract EntityManager getEntityManager(); + public AbstractFacade(Class entityClass) { + this.entityClass = entityClass; + } - protected void create(T entity) { - getEntityManager().persist(entity); - } + protected abstract EntityManager getEntityManager(); - protected void edit(T entity) { - getEntityManager().merge(entity); - } + protected void create(T entity) { + getEntityManager().persist(entity); + } - protected void remove(T entity) { - getEntityManager().remove(getEntityManager().merge(entity)); - } + protected void edit(T entity) { + getEntityManager().merge(entity); + } - protected T find(Object id) { - return getEntityManager().find(entityClass, id); - } + protected void remove(T entity) { + getEntityManager().remove(getEntityManager().merge(entity)); + } - protected List findAll() { - CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(entityClass); - cq.select(cq.from(entityClass)); - return getEntityManager().createQuery(cq).getResultList(); - } + protected T find(Object id) { + return getEntityManager().find(entityClass, id); + } + + protected List findAll() { + CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(entityClass); + cq.select(cq.from(entityClass)); + return getEntityManager().createQuery(cq).getResultList(); + } - protected List findAll(OrderDirective... directives) { - CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(entityClass); - Root root = cq.from(entityClass); - cq.select(root); - List orders = new ArrayList(); - for (OrderDirective ob : directives) { - Order o; - - Path p = root.get(ob.field); - - if (ob.asc) { - o = cb.asc(p); - } else { - o = cb.desc(p); - } - - orders.add(o); - } - cq.orderBy(orders); - return getEntityManager().createQuery(cq).getResultList(); + protected List findAll(OrderDirective... directives) { + CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(entityClass); + Root root = cq.from(entityClass); + cq.select(root); + List orders = new ArrayList(); + for (OrderDirective ob : directives) { + Order o; + + Path p = root.get(ob.field); + + if (ob.asc) { + o = cb.asc(p); + } else { + o = cb.desc(p); + } + + orders.add(o); } + cq.orderBy(orders); + return getEntityManager().createQuery(cq).getResultList(); + } - public static class OrderDirective { + public static class OrderDirective { - private final String field; - private final boolean asc; + private final String field; + private final boolean asc; - public OrderDirective(String field) { - this(field, true); - } + public OrderDirective(String field) { + this(field, true); + } - public OrderDirective(String field, boolean asc) { - this.field = field; - this.asc = asc; - } + public OrderDirective(String field, boolean asc) { + this.field = field; + this.asc = asc; + } - public String getField() { - return field; - } + public String getField() { + return field; + } - public boolean isAsc() { - return asc; - } + public boolean isAsc() { + return asc; + } + } + + @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) + protected String checkAuthenticated() { + String username = context.getCallerPrincipal().getName(); + if (username == null || username.isEmpty() || username.equalsIgnoreCase("ANONYMOUS")) { + throw new EJBAccessException("You must be authenticated to perform the requested operation"); + } else { + username = username.split(":")[2]; } - - @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) - protected String checkAuthenticated() { - String username = context.getCallerPrincipal().getName(); - if (username == null || username.isEmpty() || username.equalsIgnoreCase("ANONYMOUS")) { - throw new EJBAccessException("You must be authenticated to perform the requested operation"); - } else { - username = username.split(":")[2]; - } - return username; - } + return username; + } } diff --git a/src/main/java/org/jlab/cnm/business/session/ElementCodeFacade.java b/src/main/java/org/jlab/cnm/business/session/ElementCodeFacade.java index 3f180c4..bf4e302 100644 --- a/src/main/java/org/jlab/cnm/business/session/ElementCodeFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/ElementCodeFacade.java @@ -7,25 +7,24 @@ import org.jlab.cnm.persistence.entity.ElementCode; /** - * * @author ryans */ @Stateless public class ElementCodeFacade extends AbstractFacade { - @PersistenceContext(unitName = "webappPU") - private EntityManager em; + @PersistenceContext(unitName = "webappPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public ElementCodeFacade() { - super(ElementCode.class); - } - - @Override - public List findAll() { - return super.findAll(new OrderDirective("zzCode")); - } + public ElementCodeFacade() { + super(ElementCode.class); + } + + @Override + public List findAll() { + return super.findAll(new OrderDirective("zzCode")); + } } diff --git a/src/main/java/org/jlab/cnm/business/session/ExcelCodeListFacade.java b/src/main/java/org/jlab/cnm/business/session/ExcelCodeListFacade.java index 8bccbfb..d5fd7f1 100644 --- a/src/main/java/org/jlab/cnm/business/session/ExcelCodeListFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/ExcelCodeListFacade.java @@ -14,75 +14,77 @@ import org.jlab.cnm.persistence.entity.TypeCode; /** - * * @author ryans */ @Stateless public class ExcelCodeListFacade { - @PermitAll - public void export(OutputStream out, List systemList, List typeList, List sectorList) throws IOException { - Workbook wb = new XSSFWorkbook(); - - - // START Sheet 1 - Sheet sheet1 = wb.createSheet("System Codes"); - - int rownum = 0; - - for (SystemCode code : systemList) { - Row row = sheet1.createRow(rownum++); - - row.createCell(0).setCellValue(String.valueOf(code.getSCode())); - row.createCell(1).setCellValue(code.getDescription()); - } - - sheet1.autoSizeColumn(0); - sheet1.autoSizeColumn(1); - - // END Sheet 1 - // START Sheet 2 - - Sheet sheet2 = wb.createSheet("Type Codes"); - - rownum = 0; - - for(TypeCode code: typeList) { - Row row = sheet2.createRow(rownum++); - - row.createCell(0).setCellValue(String.valueOf(code.getSystemCode().getSCode())); - row.createCell(1).setCellValue(code.getVvCode()); - row.createCell(2).setCellValue(code.getDescription()); - row.createCell(3).setCellValue(code.getGrouping()); - } - - sheet2.autoSizeColumn(0); - sheet2.autoSizeColumn(1); - sheet2.autoSizeColumn(2); - sheet2.autoSizeColumn(3); - - // END Sheet 2 - // START Sheet 3 - - Sheet sheet3 = wb.createSheet("Sector Codes"); - - rownum = 0; - - for (SectorCode code : sectorList) { - Row row = sheet3.createRow(rownum++); - - row.createCell(0).setCellValue(code.getXxCode()); - row.createCell(1).setCellValue(code.getDescription()); - row.createCell(2).setCellValue(code.getGrouping()); - } - - sheet3.autoSizeColumn(0); - sheet3.autoSizeColumn(1); - sheet3.autoSizeColumn(2); - - // END Sheet 3 - - wb.write(out); + @PermitAll + public void export( + OutputStream out, + List systemList, + List typeList, + List sectorList) + throws IOException { + Workbook wb = new XSSFWorkbook(); + + // START Sheet 1 + Sheet sheet1 = wb.createSheet("System Codes"); + + int rownum = 0; + + for (SystemCode code : systemList) { + Row row = sheet1.createRow(rownum++); + + row.createCell(0).setCellValue(String.valueOf(code.getSCode())); + row.createCell(1).setCellValue(code.getDescription()); + } + + sheet1.autoSizeColumn(0); + sheet1.autoSizeColumn(1); + + // END Sheet 1 + // START Sheet 2 + + Sheet sheet2 = wb.createSheet("Type Codes"); + + rownum = 0; + + for (TypeCode code : typeList) { + Row row = sheet2.createRow(rownum++); + + row.createCell(0).setCellValue(String.valueOf(code.getSystemCode().getSCode())); + row.createCell(1).setCellValue(code.getVvCode()); + row.createCell(2).setCellValue(code.getDescription()); + row.createCell(3).setCellValue(code.getGrouping()); + } + + sheet2.autoSizeColumn(0); + sheet2.autoSizeColumn(1); + sheet2.autoSizeColumn(2); + sheet2.autoSizeColumn(3); + + // END Sheet 2 + // START Sheet 3 + + Sheet sheet3 = wb.createSheet("Sector Codes"); + + rownum = 0; + + for (SectorCode code : sectorList) { + Row row = sheet3.createRow(rownum++); + + row.createCell(0).setCellValue(code.getXxCode()); + row.createCell(1).setCellValue(code.getDescription()); + row.createCell(2).setCellValue(code.getGrouping()); } + sheet3.autoSizeColumn(0); + sheet3.autoSizeColumn(1); + sheet3.autoSizeColumn(2); + + // END Sheet 3 + + wb.write(out); + } } diff --git a/src/main/java/org/jlab/cnm/business/session/LocatorCodeFacade.java b/src/main/java/org/jlab/cnm/business/session/LocatorCodeFacade.java index a6dfa95..0cef9b2 100644 --- a/src/main/java/org/jlab/cnm/business/session/LocatorCodeFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/LocatorCodeFacade.java @@ -10,50 +10,53 @@ import org.jlab.cnm.persistence.entity.SectorCode; /** - * * @author ryans */ @Stateless public class LocatorCodeFacade extends AbstractFacade { - @PersistenceContext(unitName = "webappPU") - private EntityManager em; + @PersistenceContext(unitName = "webappPU") + private EntityManager em; - @Override - protected EntityManager getEntityManager() { - return em; - } + @Override + protected EntityManager getEntityManager() { + return em; + } - public LocatorCodeFacade() { - super(LocatorCode.class); - } - - @Override - public List findAll() { - return super.findAll(new OrderDirective("yyCode")); - } - - @PermitAll - public LocatorCode findByCode(String code) { - TypedQuery q = em.createQuery("select l from LocatorCode l where l.yyCode = :code", LocatorCode.class); - - q.setParameter("code", code); - - List resultList = q.getResultList(); - LocatorCode result = null; - - if(resultList != null && !resultList.isEmpty()) { - result = resultList.get(0); - } - - return result; - } + public LocatorCodeFacade() { + super(LocatorCode.class); + } + + @Override + public List findAll() { + return super.findAll(new OrderDirective("yyCode")); + } + + @PermitAll + public LocatorCode findByCode(String code) { + TypedQuery q = + em.createQuery("select l from LocatorCode l where l.yyCode = :code", LocatorCode.class); + + q.setParameter("code", code); - @PermitAll - public List findBySector(SectorCode sector) { - TypedQuery q = em.createQuery("select l from LocatorCode l where l.sectorCode.sectorCodeId = :sectorCodeId", LocatorCode.class); - - q.setParameter("sectorCodeId", sector.getSectorCodeId()); - - return q.getResultList(); + List resultList = q.getResultList(); + LocatorCode result = null; + + if (resultList != null && !resultList.isEmpty()) { + result = resultList.get(0); } + + return result; + } + + @PermitAll + public List findBySector(SectorCode sector) { + TypedQuery q = + em.createQuery( + "select l from LocatorCode l where l.sectorCode.sectorCodeId = :sectorCodeId", + LocatorCode.class); + + q.setParameter("sectorCodeId", sector.getSectorCodeId()); + + return q.getResultList(); + } } diff --git a/src/main/java/org/jlab/cnm/business/session/SectorCodeFacade.java b/src/main/java/org/jlab/cnm/business/session/SectorCodeFacade.java index 20bb468..861ba78 100644 --- a/src/main/java/org/jlab/cnm/business/session/SectorCodeFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/SectorCodeFacade.java @@ -24,188 +24,196 @@ import org.jlab.smoothness.business.util.ExceptionUtil; /** - * * @author ryans */ @Stateless public class SectorCodeFacade extends AbstractFacade { - private static final Logger logger = Logger.getLogger(SectorCodeFacade.class.getName()); - - @PersistenceContext(unitName = "webappPU") - private EntityManager em; - - @Override - protected EntityManager getEntityManager() { - return em; + private static final Logger logger = Logger.getLogger(SectorCodeFacade.class.getName()); + + @PersistenceContext(unitName = "webappPU") + private EntityManager em; + + @Override + protected EntityManager getEntityManager() { + return em; + } + + public SectorCodeFacade() { + super(SectorCode.class); + } + + @PermitAll + public SectorCode findByCode(String code) { + TypedQuery q = + em.createQuery("select s from SectorCode s where s.xxCode = :code", SectorCode.class); + + q.setParameter("code", code); + + List resultList = q.getResultList(); + SectorCode result = null; + + if (resultList != null && !resultList.isEmpty()) { + result = resultList.get(0); } - public SectorCodeFacade() { - super(SectorCode.class); - } - - @PermitAll - public SectorCode findByCode(String code) { - TypedQuery q = em.createQuery("select s from SectorCode s where s.xxCode = :code", SectorCode.class); - - q.setParameter("code", code); - - List resultList = q.getResultList(); - SectorCode result = null; - - if(resultList != null && !resultList.isEmpty()) { - result = resultList.get(0); - } - - return result; + return result; + } + + @RolesAllowed("cnm-admin") + public void addSector(String code, String description, String grouping) + throws UserFriendlyException { + if (code == null || code.trim().isEmpty()) { + throw new UserFriendlyException("System code must not be empty"); } - @RolesAllowed("cnm-admin") - public void addSector(String code, String description, String grouping) throws UserFriendlyException { - if (code == null || code.trim().isEmpty()) { - throw new UserFriendlyException("System code must not be empty"); - } - - if (description == null || description.trim().isEmpty()) { - throw new UserFriendlyException("Description must not be empty"); - } - - if(grouping != null && grouping.trim().isEmpty()) { - grouping = null; - } - - SectorCode sector = new SectorCode(); - - sector.setXxCode(code); - sector.setDescription(description); - sector.setGrouping(grouping); - - try { - em.persist(sector); - em.flush(); // Required to trigger exceptions - } catch (RuntimeException e) { - String message = getSectorFlushMessage(code, e); - throw new UserFriendlyException(message, e); - } + if (description == null || description.trim().isEmpty()) { + throw new UserFriendlyException("Description must not be empty"); } - - private String getSectorFlushMessage(String code, RuntimeException e) { - String message; - Throwable rootCause = ExceptionUtil.getRootCause(e); - if (rootCause instanceof SQLException) { - SQLException dbException = (SQLException) rootCause; - if (dbException.getMessage().contains("SECTOR_CODE_AK1")) { - message = "Sector code " + code + " already exists"; - } else if (dbException.getMessage().contains("SECTOR_CODE_CK1")) { - message = "Sector code " + code + " is not a pair of uppercase letters or numbers"; - } else { - message = "Database error"; - } - } else { - message = "Internal error"; - logger.log(Level.WARNING, message, e); - } - - return message; - } - - @RolesAllowed("cnm-admin") - public void removeSector(String code) { - SectorCode sector = findByCode(code); - - em.remove(sector); + + if (grouping != null && grouping.trim().isEmpty()) { + grouping = null; } - @RolesAllowed("cnm-admin") - public void editSector(BigInteger id, String code, String description, String grouping) throws UserFriendlyException { - SectorCode sector = find(id); - - if(grouping != null && grouping.trim().isEmpty()) { - grouping = null; - } - - try { - sector.setXxCode(code); - sector.setDescription(description); - sector.setGrouping(grouping); - em.flush(); // Required to trigger exceptions - } catch(RuntimeException e) { - String message = getSectorFlushMessage(code, e); - throw new UserFriendlyException(message, e); - } + SectorCode sector = new SectorCode(); + + sector.setXxCode(code); + sector.setDescription(description); + sector.setGrouping(grouping); + + try { + em.persist(sector); + em.flush(); // Required to trigger exceptions + } catch (RuntimeException e) { + String message = getSectorFlushMessage(code, e); + throw new UserFriendlyException(message, e); + } + } + + private String getSectorFlushMessage(String code, RuntimeException e) { + String message; + Throwable rootCause = ExceptionUtil.getRootCause(e); + if (rootCause instanceof SQLException) { + SQLException dbException = (SQLException) rootCause; + if (dbException.getMessage().contains("SECTOR_CODE_AK1")) { + message = "Sector code " + code + " already exists"; + } else if (dbException.getMessage().contains("SECTOR_CODE_CK1")) { + message = "Sector code " + code + " is not a pair of uppercase letters or numbers"; + } else { + message = "Database error"; + } + } else { + message = "Internal error"; + logger.log(Level.WARNING, message, e); } - @PermitAll - public List filterList(String xxCode, String grouping, int offset, int max) { - CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(SectorCode.class); - Root root = cq.from(SectorCode.class); - cq.select(root); - - List filters = new ArrayList<>(); - - if (xxCode != null && !xxCode.trim().isEmpty()) { - filters.add(cb.like(cb.upper(root.get("xxCode")), xxCode.toUpperCase())); - } - - if (grouping != null && !grouping.trim().isEmpty()) { - filters.add(cb.equal(root.get("grouping"), grouping)); - } - - if (!filters.isEmpty()) { - cq.where(cb.and(filters.toArray(new Predicate[]{}))); - } - - List orders = new ArrayList<>(); - Path p0 = root.get("grouping"); - Order o0 = cb.asc(p0); - orders.add(o0); - Path p1 = root.get("xxCode"); - Order o1 = cb.asc(p1); - orders.add(o1); - cq.orderBy(orders); - return getEntityManager().createQuery(cq).setFirstResult(offset).setMaxResults(max).getResultList(); + return message; + } + + @RolesAllowed("cnm-admin") + public void removeSector(String code) { + SectorCode sector = findByCode(code); + + em.remove(sector); + } + + @RolesAllowed("cnm-admin") + public void editSector(BigInteger id, String code, String description, String grouping) + throws UserFriendlyException { + SectorCode sector = find(id); + + if (grouping != null && grouping.trim().isEmpty()) { + grouping = null; } - @PermitAll - public long countList(String xxCode, String grouping) { - CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(SectorCode.class); - - List filters = new ArrayList<>(); - - if (xxCode != null && !xxCode.trim().isEmpty()) { - filters.add(cb.like(cb.upper(root.get("xxCode")), xxCode.toUpperCase())); - } - - if (grouping != null && !grouping.trim().isEmpty()) { - filters.add(cb.equal(root.get("grouping"), grouping)); - } - - if (!filters.isEmpty()) { - cq.where(cb.and(filters.toArray(new Predicate[]{}))); - } - - cq.select(cb.count(root)); - TypedQuery q = getEntityManager().createQuery(cq); - return q.getSingleResult(); + try { + sector.setXxCode(code); + sector.setDescription(description); + sector.setGrouping(grouping); + em.flush(); // Required to trigger exceptions + } catch (RuntimeException e) { + String message = getSectorFlushMessage(code, e); + throw new UserFriendlyException(message, e); } + } + + @PermitAll + public List filterList(String xxCode, String grouping, int offset, int max) { + CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(SectorCode.class); + Root root = cq.from(SectorCode.class); + cq.select(root); + + List filters = new ArrayList<>(); - @SuppressWarnings("unchecked") - @PermitAll - public List findGroupingList() { - Query q = em.createNativeQuery("select distinct grouping from sector_code where grouping is not null order by grouping asc"); - - List resultList = q.getResultList(); - - List groupingList = new ArrayList<>(); - - if(resultList != null) { - for(Object row: resultList) { - groupingList.add((String)row); - } - } - - return groupingList; + if (xxCode != null && !xxCode.trim().isEmpty()) { + filters.add(cb.like(cb.upper(root.get("xxCode")), xxCode.toUpperCase())); } + + if (grouping != null && !grouping.trim().isEmpty()) { + filters.add(cb.equal(root.get("grouping"), grouping)); + } + + if (!filters.isEmpty()) { + cq.where(cb.and(filters.toArray(new Predicate[] {}))); + } + + List orders = new ArrayList<>(); + Path p0 = root.get("grouping"); + Order o0 = cb.asc(p0); + orders.add(o0); + Path p1 = root.get("xxCode"); + Order o1 = cb.asc(p1); + orders.add(o1); + cq.orderBy(orders); + return getEntityManager() + .createQuery(cq) + .setFirstResult(offset) + .setMaxResults(max) + .getResultList(); + } + + @PermitAll + public long countList(String xxCode, String grouping) { + CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(Long.class); + Root root = cq.from(SectorCode.class); + + List filters = new ArrayList<>(); + + if (xxCode != null && !xxCode.trim().isEmpty()) { + filters.add(cb.like(cb.upper(root.get("xxCode")), xxCode.toUpperCase())); + } + + if (grouping != null && !grouping.trim().isEmpty()) { + filters.add(cb.equal(root.get("grouping"), grouping)); + } + + if (!filters.isEmpty()) { + cq.where(cb.and(filters.toArray(new Predicate[] {}))); + } + + cq.select(cb.count(root)); + TypedQuery q = getEntityManager().createQuery(cq); + return q.getSingleResult(); + } + + @SuppressWarnings("unchecked") + @PermitAll + public List findGroupingList() { + Query q = + em.createNativeQuery( + "select distinct grouping from sector_code where grouping is not null order by grouping asc"); + + List resultList = q.getResultList(); + + List groupingList = new ArrayList<>(); + + if (resultList != null) { + for (Object row : resultList) { + groupingList.add((String) row); + } + } + + return groupingList; + } } diff --git a/src/main/java/org/jlab/cnm/business/session/SystemCodeFacade.java b/src/main/java/org/jlab/cnm/business/session/SystemCodeFacade.java index c891627..352b46c 100644 --- a/src/main/java/org/jlab/cnm/business/session/SystemCodeFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/SystemCodeFacade.java @@ -17,126 +17,123 @@ import org.jlab.smoothness.business.util.ExceptionUtil; /** - * * @author ryans */ @Stateless public class SystemCodeFacade extends AbstractFacade { - private static final Logger logger = Logger.getLogger(SystemCodeFacade.class.getName()); - - @PersistenceContext(unitName = "webappPU") - private EntityManager em; + private static final Logger logger = Logger.getLogger(SystemCodeFacade.class.getName()); - @Override - protected EntityManager getEntityManager() { - return em; - } + @PersistenceContext(unitName = "webappPU") + private EntityManager em; - public SystemCodeFacade() { - super(SystemCode.class); - } + @Override + protected EntityManager getEntityManager() { + return em; + } - @Override - @PermitAll - public List findAll() { - return super.findAll(new OrderDirective("sCode")); - } + public SystemCodeFacade() { + super(SystemCode.class); + } - @PermitAll - public SystemCode findByCode(Character systemCode) { - TypedQuery q - = em.createQuery("select s from SystemCode s where s.sCode = :code", - SystemCode.class); + @Override + @PermitAll + public List findAll() { + return super.findAll(new OrderDirective("sCode")); + } - q.setParameter("code", systemCode); + @PermitAll + public SystemCode findByCode(Character systemCode) { + TypedQuery q = + em.createQuery("select s from SystemCode s where s.sCode = :code", SystemCode.class); - List resultList = q.getResultList(); + q.setParameter("code", systemCode); - SystemCode system = null; + List resultList = q.getResultList(); - if (resultList != null && !resultList.isEmpty()) { - system = resultList.get(0); - } + SystemCode system = null; - return system; + if (resultList != null && !resultList.isEmpty()) { + system = resultList.get(0); } - /** - * - * - * @param code The Code - * @param description The description - * @throws EJBAccessException Explicitly documented here as Servlet should probably catch - * insufficient authentication or authorization - * @throws RuntimeException Explicitly documented here as Servlets should probably catch this - * one just in case to avoid ugly errors to users - * @throws UserFriendlyException Something was done that the user should see and can likely - * correct - */ - @RolesAllowed("cnm-admin") - public void addSystem(Character code, String description) throws EJBAccessException, - RuntimeException, UserFriendlyException { - if (code == null) { - throw new UserFriendlyException("System code must not be empty"); - } - - if (description == null || description.trim().isEmpty()) { - throw new UserFriendlyException("Description must not be empty"); - } - - SystemCode system = new SystemCode(); - - system.setSCode(code); - system.setDescription(description); - - try { - em.persist(system); - em.flush(); // Required to trigger exceptions - } catch (RuntimeException e) { - String message = getSystemFlushMessage(code, e); - throw new UserFriendlyException(message, e); - } + return system; + } + + /** + * @param code The Code + * @param description The description + * @throws EJBAccessException Explicitly documented here as Servlet should probably catch + * insufficient authentication or authorization + * @throws RuntimeException Explicitly documented here as Servlets should probably catch this one + * just in case to avoid ugly errors to users + * @throws UserFriendlyException Something was done that the user should see and can likely + * correct + */ + @RolesAllowed("cnm-admin") + public void addSystem(Character code, String description) + throws EJBAccessException, RuntimeException, UserFriendlyException { + if (code == null) { + throw new UserFriendlyException("System code must not be empty"); } - private String getSystemFlushMessage(Character code, RuntimeException e) { - String message; - Throwable rootCause = ExceptionUtil.getRootCause(e); - if (rootCause instanceof SQLException) { - SQLException dbException = (SQLException) rootCause; - if (dbException.getMessage().contains("SYSTEM_CODE_AK1")) { - message = "System code " + code + " already exists"; - } else if (dbException.getMessage().contains("SYSTEM_CODE_CK1")) { - message = "System code " + code + " is not a single uppercase letter"; - } else { - message = "Database error"; - } - } else { - message = "Internal error"; - logger.log(Level.WARNING, message, e); - } - - return message; + if (description == null || description.trim().isEmpty()) { + throw new UserFriendlyException("Description must not be empty"); } - @RolesAllowed("cnm-admin") - public void removeSystem(Character code) { - SystemCode system = findByCode(code); + SystemCode system = new SystemCode(); - em.remove(system); + system.setSCode(code); + system.setDescription(description); + + try { + em.persist(system); + em.flush(); // Required to trigger exceptions + } catch (RuntimeException e) { + String message = getSystemFlushMessage(code, e); + throw new UserFriendlyException(message, e); + } + } + + private String getSystemFlushMessage(Character code, RuntimeException e) { + String message; + Throwable rootCause = ExceptionUtil.getRootCause(e); + if (rootCause instanceof SQLException) { + SQLException dbException = (SQLException) rootCause; + if (dbException.getMessage().contains("SYSTEM_CODE_AK1")) { + message = "System code " + code + " already exists"; + } else if (dbException.getMessage().contains("SYSTEM_CODE_CK1")) { + message = "System code " + code + " is not a single uppercase letter"; + } else { + message = "Database error"; + } + } else { + message = "Internal error"; + logger.log(Level.WARNING, message, e); } - @RolesAllowed("cnm-admin") - public void editSystem(BigInteger id, Character code, String description) throws UserFriendlyException { - SystemCode system = find(id); - - try { - system.setSCode(code); - system.setDescription(description); - em.flush(); // Required to trigger exceptions - } catch(RuntimeException e) { - String message = getSystemFlushMessage(code, e); - throw new UserFriendlyException(message, e); - } + return message; + } + + @RolesAllowed("cnm-admin") + public void removeSystem(Character code) { + SystemCode system = findByCode(code); + + em.remove(system); + } + + @RolesAllowed("cnm-admin") + public void editSystem(BigInteger id, Character code, String description) + throws UserFriendlyException { + SystemCode system = find(id); + + try { + system.setSCode(code); + system.setDescription(description); + em.flush(); // Required to trigger exceptions + } catch (RuntimeException e) { + String message = getSystemFlushMessage(code, e); + throw new UserFriendlyException(message, e); } + } } diff --git a/src/main/java/org/jlab/cnm/business/session/TranslatorService.java b/src/main/java/org/jlab/cnm/business/session/TranslatorService.java index 2cd3621..a7b4e12 100644 --- a/src/main/java/org/jlab/cnm/business/session/TranslatorService.java +++ b/src/main/java/org/jlab/cnm/business/session/TranslatorService.java @@ -8,73 +8,69 @@ import org.jlab.cnm.persistence.entity.TypeCode; /** - * * @author ryans */ @Stateless public class TranslatorService { - @EJB - SystemCodeFacade systemFacade; + @EJB SystemCodeFacade systemFacade; - @EJB - TypeCodeFacade typeFacade; + @EJB TypeCodeFacade typeFacade; - @EJB - SectorCodeFacade sectorFacade; + @EJB SectorCodeFacade sectorFacade; - @PermitAll - public String translate(String query) { - String meaning = "Unknown"; + @PermitAll + public String translate(String query) { + String meaning = "Unknown"; - if (query != null && !query.isEmpty()) { - query = query.toUpperCase(); + if (query != null && !query.isEmpty()) { + query = query.toUpperCase(); - Character sCode = query.charAt(0); + Character sCode = query.charAt(0); - SystemCode system = systemFacade.findByCode(sCode); + SystemCode system = systemFacade.findByCode(sCode); - String systemDescription = "Unknown System"; + String systemDescription = "Unknown System"; - if (system != null) { - systemDescription = system.getDescription(); - } + if (system != null) { + systemDescription = system.getDescription(); + } - meaning = systemDescription; + meaning = systemDescription; - if (query.length() >= 3) { - String typeCode = query.substring(1, 3); + if (query.length() >= 3) { + String typeCode = query.substring(1, 3); - TypeCode type = null; + TypeCode type = null; - if (system != null) { - type = typeFacade.findByCode(system.getSCode(), typeCode); - } - - String typeDescription = "Unknown Type"; + if (system != null) { + type = typeFacade.findByCode(system.getSCode(), typeCode); + } - if (type != null) { - typeDescription = type.getDescription(); - } + String typeDescription = "Unknown Type"; - meaning = meaning + " + " + typeDescription; - } + if (type != null) { + typeDescription = type.getDescription(); + } - if (query.length() >= 5) { - String sectorCode = query.substring(3, 5); + meaning = meaning + " + " + typeDescription; + } - SectorCode sector = sectorFacade.findByCode(sectorCode); + if (query.length() >= 5) { + String sectorCode = query.substring(3, 5); - String sectorDescription = "Unknown Sector"; + SectorCode sector = sectorFacade.findByCode(sectorCode); - if (sector != null) { - sectorDescription = sector.getDescription(); - } + String sectorDescription = "Unknown Sector"; - meaning = meaning + " + " + sectorDescription; - } + if (sector != null) { + sectorDescription = sector.getDescription(); } - return meaning; + meaning = meaning + " + " + sectorDescription; + } } + + return meaning; + } } diff --git a/src/main/java/org/jlab/cnm/business/session/TypeCodeFacade.java b/src/main/java/org/jlab/cnm/business/session/TypeCodeFacade.java index f64a2f8..a8eb353 100644 --- a/src/main/java/org/jlab/cnm/business/session/TypeCodeFacade.java +++ b/src/main/java/org/jlab/cnm/business/session/TypeCodeFacade.java @@ -27,251 +27,265 @@ import org.jlab.smoothness.business.util.ExceptionUtil; /** - * * @author ryans */ @Stateless public class TypeCodeFacade extends AbstractFacade { - private static final Logger logger = Logger.getLogger(TypeCodeFacade.class.getName()); - - @PersistenceContext(unitName = "webappPU") - private EntityManager em; - - @EJB - SystemCodeFacade systemFacade; - - @Override - protected EntityManager getEntityManager() { - return em; + private static final Logger logger = Logger.getLogger(TypeCodeFacade.class.getName()); + + @PersistenceContext(unitName = "webappPU") + private EntityManager em; + + @EJB SystemCodeFacade systemFacade; + + @Override + protected EntityManager getEntityManager() { + return em; + } + + public TypeCodeFacade() { + super(TypeCode.class); + } + + @PermitAll + public List filterList( + Character sCode, String vvCode, String grouping, int offset, int max) { + CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(TypeCode.class); + Root root = cq.from(TypeCode.class); + Join system = root.join("systemCode"); + cq.select(root); + + List filters = new ArrayList<>(); + + if (sCode != null) { + filters.add(cb.equal(system.get("sCode"), sCode)); } - public TypeCodeFacade() { - super(TypeCode.class); + if (vvCode != null && !vvCode.trim().isEmpty()) { + filters.add(cb.like(cb.upper(root.get("vvCode")), vvCode.toUpperCase())); } - - @PermitAll - public List filterList(Character sCode, String vvCode, String grouping, int offset, int max) { - CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(TypeCode.class); - Root root = cq.from(TypeCode.class); - Join system = root.join("systemCode"); - cq.select(root); - - List filters = new ArrayList<>(); - - if (sCode != null) { - filters.add(cb.equal(system.get("sCode"), sCode)); - } - - if(vvCode != null && !vvCode.trim().isEmpty()) { - filters.add(cb.like(cb.upper(root.get("vvCode")), vvCode.toUpperCase())); - } - - if (grouping != null && !grouping.trim().isEmpty()) { - filters.add(cb.equal(root.get("grouping"), grouping)); - } - - if (!filters.isEmpty()) { - cq.where(cb.and(filters.toArray(new Predicate[]{}))); - } - - List orders = new ArrayList<>(); - Path p0 = system.get("sCode"); - Order o0 = cb.asc(p0); - orders.add(o0); - Path p1 = root.get("grouping"); - Order o1 = cb.asc(p1); - orders.add(o1); - Path p2 = root.get("vvCode"); - Order o2 = cb.asc(p2); - orders.add(o2); - cq.orderBy(orders); - return getEntityManager().createQuery(cq).setFirstResult(offset).setMaxResults(max).getResultList(); - } - - @PermitAll - public long countList(Character sCode, String vvCode, String grouping) { - CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(TypeCode.class); - Join system = root.join("systemCode"); - - List filters = new ArrayList<>(); - - if (sCode != null) { - filters.add(cb.equal(system.get("sCode"), sCode)); - } - - if(vvCode != null && !vvCode.trim().isEmpty()) { - filters.add(cb.like(cb.upper(root.get("vvCode")), vvCode.toUpperCase())); - } - - if (grouping != null && !grouping.trim().isEmpty()) { - filters.add(cb.equal(root.get("grouping"), grouping)); - } - - if (!filters.isEmpty()) { - cq.where(cb.and(filters.toArray(new Predicate[]{}))); - } - - cq.select(cb.count(root)); - TypedQuery q = getEntityManager().createQuery(cq); - return q.getSingleResult(); - } - - @PermitAll - public List findBySystem(SystemCode system) { - TypedQuery q = em.createQuery("select t from TypeCode t where t.systemCode.systemCodeId = :systemCodeId", TypeCode.class); - - q.setParameter("systemCodeId", system.getSystemCodeId()); - - return q.getResultList(); + + if (grouping != null && !grouping.trim().isEmpty()) { + filters.add(cb.equal(root.get("grouping"), grouping)); } - @PermitAll - public TypeCode findByCode(Character systemCode, String typeCode) { - TypedQuery q = em.createQuery("select t from TypeCode t where t.systemCode.sCode = :systemCode and t.vvCode = :typeCode", TypeCode.class); - - q.setParameter("systemCode", systemCode); - q.setParameter("typeCode", typeCode); - - List resultList = q.getResultList(); - TypeCode result = null; - - if(resultList != null && !resultList.isEmpty()) { - result = resultList.get(0); - } - - return result; + if (!filters.isEmpty()) { + cq.where(cb.and(filters.toArray(new Predicate[] {}))); } - @RolesAllowed("cnm-admin") - public void addType(Character scode, String vvcode, String description, String grouping) throws UserFriendlyException { - if (scode == null) { - throw new UserFriendlyException("System code must not be empty"); - } - - if (vvcode == null || vvcode.trim().isEmpty()) { - throw new UserFriendlyException("Type code must not be empty"); - } - - if (description == null || description.trim().isEmpty()) { - throw new UserFriendlyException("Description must not be empty"); - } - - TypeCode type = new TypeCode(); - - SystemCode system = systemFacade.findByCode(scode); - - if(system == null) { - throw new UserFriendlyException("System code " + scode + " does not exist"); - } - - if(grouping != null && grouping.trim().isEmpty()) { - grouping = null; - } - - type.setSystemCode(system); - type.setVvCode(vvcode); - type.setDescription(description); - type.setGrouping(grouping); - - try { - em.persist(type); - em.flush(); // Required to trigger exceptions - } catch (RuntimeException e) { - String message = getTypeFlushMessage(scode, vvcode, e); - throw new UserFriendlyException(message, e); - } + List orders = new ArrayList<>(); + Path p0 = system.get("sCode"); + Order o0 = cb.asc(p0); + orders.add(o0); + Path p1 = root.get("grouping"); + Order o1 = cb.asc(p1); + orders.add(o1); + Path p2 = root.get("vvCode"); + Order o2 = cb.asc(p2); + orders.add(o2); + cq.orderBy(orders); + return getEntityManager() + .createQuery(cq) + .setFirstResult(offset) + .setMaxResults(max) + .getResultList(); + } + + @PermitAll + public long countList(Character sCode, String vvCode, String grouping) { + CriteriaBuilder cb = getEntityManager().getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(Long.class); + Root root = cq.from(TypeCode.class); + Join system = root.join("systemCode"); + + List filters = new ArrayList<>(); + + if (sCode != null) { + filters.add(cb.equal(system.get("sCode"), sCode)); + } + + if (vvCode != null && !vvCode.trim().isEmpty()) { + filters.add(cb.like(cb.upper(root.get("vvCode")), vvCode.toUpperCase())); } - - private String getTypeFlushMessage(Character scode, String vvcode, RuntimeException e) { - String message; - Throwable rootCause = ExceptionUtil.getRootCause(e); - if (rootCause instanceof SQLException) { - SQLException dbException = (SQLException) rootCause; - if (dbException.getMessage().contains("TYPE_CODE_AK1")) { - message = "Type code " + scode + vvcode + " already exists"; - } else if (dbException.getMessage().contains("TYPE_CODE_CK1")) { - message = "Type code " + vvcode + " is not a pair of uppercase letters or numbers"; - } else { - message = "Database error"; - } - } else { - message = "Internal error"; - logger.log(Level.WARNING, message, e); - } - return message; - } - - @RolesAllowed("cnm-admin") - public void removeType(Character scode, String vvcode) { - TypeCode type = this.findByCode(scode, vvcode); - - em.remove(type); + + if (grouping != null && !grouping.trim().isEmpty()) { + filters.add(cb.equal(root.get("grouping"), grouping)); } - @RolesAllowed("cnm-admin") - public void editType(BigInteger id, Character scode, String vvcode, String description, String grouping) throws UserFriendlyException { - TypeCode type = find(id); - SystemCode system = systemFacade.findByCode(scode); - - if(system == null) { - throw new UserFriendlyException("System code " + scode + " does not exist"); - } - - if(grouping != null && grouping.trim().isEmpty()) { - grouping = null; - } - - try { - type.setSystemCode(system); - type.setVvCode(vvcode); - type.setDescription(description); - type.setGrouping(grouping); - em.flush(); // Required to trigger exceptions - } catch(RuntimeException e) { - String message = getTypeFlushMessage(scode, vvcode, e); - throw new UserFriendlyException(message, e); - } + if (!filters.isEmpty()) { + cq.where(cb.and(filters.toArray(new Predicate[] {}))); } - - @RolesAllowed("cnm-admin") - public void editAttributes(BigInteger id, String jsonAttributes) throws UserFriendlyException { - TypeCode type = find(id); - - if(type == null) { - throw new UserFriendlyException("Type with ID " + id + " not found"); - } - - type.setJsonAttributes(jsonAttributes); - } - - @PermitAll - @SuppressWarnings("unchecked") - public List findGroupingList(Character sCode) { - String sql = "select distinct grouping from type_code where grouping is not null order by grouping asc"; - - if(sCode != null) { - sql = "select distinct grouping from type_code t left join system_code s on (t.system_code_id = s.system_code_id) where s.s_code = ? and grouping is not null order by grouping asc"; - } - - Query q = em.createNativeQuery(sql); - - if(sCode != null) { - q.setParameter(1, sCode); - } - - List resultList = q.getResultList(); - - List groupingList = new ArrayList<>(); - - if(resultList != null) { - for(Object row: resultList) { - groupingList.add((String)row); - } - } - - return groupingList; - } + + cq.select(cb.count(root)); + TypedQuery q = getEntityManager().createQuery(cq); + return q.getSingleResult(); + } + + @PermitAll + public List findBySystem(SystemCode system) { + TypedQuery q = + em.createQuery( + "select t from TypeCode t where t.systemCode.systemCodeId = :systemCodeId", + TypeCode.class); + + q.setParameter("systemCodeId", system.getSystemCodeId()); + + return q.getResultList(); + } + + @PermitAll + public TypeCode findByCode(Character systemCode, String typeCode) { + TypedQuery q = + em.createQuery( + "select t from TypeCode t where t.systemCode.sCode = :systemCode and t.vvCode = :typeCode", + TypeCode.class); + + q.setParameter("systemCode", systemCode); + q.setParameter("typeCode", typeCode); + + List resultList = q.getResultList(); + TypeCode result = null; + + if (resultList != null && !resultList.isEmpty()) { + result = resultList.get(0); + } + + return result; + } + + @RolesAllowed("cnm-admin") + public void addType(Character scode, String vvcode, String description, String grouping) + throws UserFriendlyException { + if (scode == null) { + throw new UserFriendlyException("System code must not be empty"); + } + + if (vvcode == null || vvcode.trim().isEmpty()) { + throw new UserFriendlyException("Type code must not be empty"); + } + + if (description == null || description.trim().isEmpty()) { + throw new UserFriendlyException("Description must not be empty"); + } + + TypeCode type = new TypeCode(); + + SystemCode system = systemFacade.findByCode(scode); + + if (system == null) { + throw new UserFriendlyException("System code " + scode + " does not exist"); + } + + if (grouping != null && grouping.trim().isEmpty()) { + grouping = null; + } + + type.setSystemCode(system); + type.setVvCode(vvcode); + type.setDescription(description); + type.setGrouping(grouping); + + try { + em.persist(type); + em.flush(); // Required to trigger exceptions + } catch (RuntimeException e) { + String message = getTypeFlushMessage(scode, vvcode, e); + throw new UserFriendlyException(message, e); + } + } + + private String getTypeFlushMessage(Character scode, String vvcode, RuntimeException e) { + String message; + Throwable rootCause = ExceptionUtil.getRootCause(e); + if (rootCause instanceof SQLException) { + SQLException dbException = (SQLException) rootCause; + if (dbException.getMessage().contains("TYPE_CODE_AK1")) { + message = "Type code " + scode + vvcode + " already exists"; + } else if (dbException.getMessage().contains("TYPE_CODE_CK1")) { + message = "Type code " + vvcode + " is not a pair of uppercase letters or numbers"; + } else { + message = "Database error"; + } + } else { + message = "Internal error"; + logger.log(Level.WARNING, message, e); + } + return message; + } + + @RolesAllowed("cnm-admin") + public void removeType(Character scode, String vvcode) { + TypeCode type = this.findByCode(scode, vvcode); + + em.remove(type); + } + + @RolesAllowed("cnm-admin") + public void editType( + BigInteger id, Character scode, String vvcode, String description, String grouping) + throws UserFriendlyException { + TypeCode type = find(id); + SystemCode system = systemFacade.findByCode(scode); + + if (system == null) { + throw new UserFriendlyException("System code " + scode + " does not exist"); + } + + if (grouping != null && grouping.trim().isEmpty()) { + grouping = null; + } + + try { + type.setSystemCode(system); + type.setVvCode(vvcode); + type.setDescription(description); + type.setGrouping(grouping); + em.flush(); // Required to trigger exceptions + } catch (RuntimeException e) { + String message = getTypeFlushMessage(scode, vvcode, e); + throw new UserFriendlyException(message, e); + } + } + + @RolesAllowed("cnm-admin") + public void editAttributes(BigInteger id, String jsonAttributes) throws UserFriendlyException { + TypeCode type = find(id); + + if (type == null) { + throw new UserFriendlyException("Type with ID " + id + " not found"); + } + + type.setJsonAttributes(jsonAttributes); + } + + @PermitAll + @SuppressWarnings("unchecked") + public List findGroupingList(Character sCode) { + String sql = + "select distinct grouping from type_code where grouping is not null order by grouping asc"; + + if (sCode != null) { + sql = + "select distinct grouping from type_code t left join system_code s on (t.system_code_id = s.system_code_id) where s.s_code = ? and grouping is not null order by grouping asc"; + } + + Query q = em.createNativeQuery(sql); + + if (sCode != null) { + q.setParameter(1, sCode); + } + + List resultList = q.getResultList(); + + List groupingList = new ArrayList<>(); + + if (resultList != null) { + for (Object row : resultList) { + groupingList.add((String) row); + } + } + + return groupingList; + } } diff --git a/src/main/java/org/jlab/cnm/persistence/entity/ElementCode.java b/src/main/java/org/jlab/cnm/persistence/entity/ElementCode.java index dc330ba..9830128 100644 --- a/src/main/java/org/jlab/cnm/persistence/entity/ElementCode.java +++ b/src/main/java/org/jlab/cnm/persistence/entity/ElementCode.java @@ -14,110 +14,112 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity @Table(name = "ELEMENT_CODE", schema = "CNM_OWNER") -@NamedQueries({ - @NamedQuery(name = "ElementCode.findAll", query = "SELECT e FROM ElementCode e")}) +@NamedQueries({@NamedQuery(name = "ElementCode.findAll", query = "SELECT e FROM ElementCode e")}) public class ElementCode implements Serializable { - private static final long serialVersionUID = 1L; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 2) - @Column(name = "ZZ_CODE", nullable = false, length = 2) - private String zzCode; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @Basic(optional = false) - @NotNull - @Column(name = "ELEMENT_CODE_ID", nullable = false, precision = 22, scale = 0) - private BigDecimal elementCodeId; - @Size(max = 512) - @Column(length = 512) - private String description; - @Basic(optional = true) - @Size(min = 1, max = 24) - @Column(nullable = true, length = 24) - private String state; - @Column(name = "PROPOSED_BY") - private BigInteger proposedBy; - - public ElementCode() { - } - - public ElementCode(BigDecimal elementCodeId) { - this.elementCodeId = elementCodeId; - } - - public ElementCode(BigDecimal elementCodeId, String zzCode, String state) { - this.elementCodeId = elementCodeId; - this.zzCode = zzCode; - this.state = state; - } - - public String getZzCode() { - return zzCode; - } - - public void setZzCode(String zzCode) { - this.zzCode = zzCode; - } - - public BigDecimal getElementCodeId() { - return elementCodeId; - } - - public void setElementCodeId(BigDecimal elementCodeId) { - this.elementCodeId = elementCodeId; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public BigInteger getProposedBy() { - return proposedBy; - } - - public void setProposedBy(BigInteger proposedBy) { - this.proposedBy = proposedBy; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (elementCodeId != null ? elementCodeId.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 ElementCode)) { - return false; - } - ElementCode other = (ElementCode) object; - return (this.elementCodeId != null || other.elementCodeId == null) && - (this.elementCodeId == null || this.elementCodeId.equals(other.elementCodeId)); - } - - @Override - public String toString() { - return "org.jlab.cnm.persistence.entity.ElementCode[ elementCodeId=" + elementCodeId + " ]"; - } - + private static final long serialVersionUID = 1L; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2) + @Column(name = "ZZ_CODE", nullable = false, length = 2) + private String zzCode; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @Basic(optional = false) + @NotNull + @Column(name = "ELEMENT_CODE_ID", nullable = false, precision = 22, scale = 0) + private BigDecimal elementCodeId; + + @Size(max = 512) + @Column(length = 512) + private String description; + + @Basic(optional = true) + @Size(min = 1, max = 24) + @Column(nullable = true, length = 24) + private String state; + + @Column(name = "PROPOSED_BY") + private BigInteger proposedBy; + + public ElementCode() {} + + public ElementCode(BigDecimal elementCodeId) { + this.elementCodeId = elementCodeId; + } + + public ElementCode(BigDecimal elementCodeId, String zzCode, String state) { + this.elementCodeId = elementCodeId; + this.zzCode = zzCode; + this.state = state; + } + + public String getZzCode() { + return zzCode; + } + + public void setZzCode(String zzCode) { + this.zzCode = zzCode; + } + + public BigDecimal getElementCodeId() { + return elementCodeId; + } + + public void setElementCodeId(BigDecimal elementCodeId) { + this.elementCodeId = elementCodeId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public BigInteger getProposedBy() { + return proposedBy; + } + + public void setProposedBy(BigInteger proposedBy) { + this.proposedBy = proposedBy; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (elementCodeId != null ? elementCodeId.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 ElementCode)) { + return false; + } + ElementCode other = (ElementCode) object; + return (this.elementCodeId != null || other.elementCodeId == null) + && (this.elementCodeId == null || this.elementCodeId.equals(other.elementCodeId)); + } + + @Override + public String toString() { + return "org.jlab.cnm.persistence.entity.ElementCode[ elementCodeId=" + elementCodeId + " ]"; + } } diff --git a/src/main/java/org/jlab/cnm/persistence/entity/LocatorCode.java b/src/main/java/org/jlab/cnm/persistence/entity/LocatorCode.java index 0c44252..cc7af3d 100644 --- a/src/main/java/org/jlab/cnm/persistence/entity/LocatorCode.java +++ b/src/main/java/org/jlab/cnm/persistence/entity/LocatorCode.java @@ -17,123 +17,127 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "LOCATOR_CODE", schema = "CNM_OWNER", uniqueConstraints - = { - @UniqueConstraint(columnNames = {"SECTOR_CODE_ID", "YY_CODE"})}) -@NamedQueries({ - @NamedQuery(name = "LocatorCode.findAll", query = "SELECT l FROM LocatorCode l")}) +@Table( + name = "LOCATOR_CODE", + schema = "CNM_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"SECTOR_CODE_ID", "YY_CODE"})}) +@NamedQueries({@NamedQuery(name = "LocatorCode.findAll", query = "SELECT l FROM LocatorCode l")}) public class LocatorCode implements Serializable { - private static final long serialVersionUID = 1L; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 2) - @Column(name = "YY_CODE", nullable = false, length = 2) - private String yyCode; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Id - @Basic(optional = false) - @NotNull - @Column(name = "LOCATOR_CODE_ID", nullable = false, precision = 22, scale = 0) - private BigDecimal locatorCodeId; - @Size(max = 512) - @Column(length = 512) - private String description; - @Basic(optional = true) - @Size(min = 1, max = 24) - @Column(nullable = true, length = 24) - private String state; - @Column(name = "PROPOSED_BY") - private BigInteger proposedBy; - @JoinColumn(name = "SECTOR_CODE_ID", referencedColumnName = "SECTOR_CODE_ID", nullable = false) - @ManyToOne(optional = false) - private SectorCode sectorCode; - - public LocatorCode() { - } - - public LocatorCode(BigDecimal locatorCodeId) { - this.locatorCodeId = locatorCodeId; - } - - public LocatorCode(BigDecimal locatorCodeId, String yyCode, String state) { - this.locatorCodeId = locatorCodeId; - this.yyCode = yyCode; - this.state = state; - } - - public String getYyCode() { - return yyCode; - } - - public void setYyCode(String yyCode) { - this.yyCode = yyCode; - } - - public BigDecimal getLocatorCodeId() { - return locatorCodeId; - } - - public void setLocatorCodeId(BigDecimal locatorCodeId) { - this.locatorCodeId = locatorCodeId; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public BigInteger getProposedBy() { - return proposedBy; - } - - public void setProposedBy(BigInteger proposedBy) { - this.proposedBy = proposedBy; - } - - public SectorCode getSectorCode() { - return sectorCode; - } - - public void setSectorCode(SectorCode sectorCode) { - this.sectorCode = sectorCode; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (locatorCodeId != null ? locatorCodeId.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 LocatorCode)) { - return false; - } - LocatorCode other = (LocatorCode) object; - return (this.locatorCodeId != null || other.locatorCodeId == null) && - (this.locatorCodeId == null || this.locatorCodeId.equals(other.locatorCodeId)); - } - - @Override - public String toString() { - return "org.jlab.cnm.persistence.entity.LocatorCode[ locatorCodeId=" + locatorCodeId + " ]"; - } - + private static final long serialVersionUID = 1L; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2) + @Column(name = "YY_CODE", nullable = false, length = 2) + private String yyCode; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these + // annotations to enforce field validation + @Id + @Basic(optional = false) + @NotNull + @Column(name = "LOCATOR_CODE_ID", nullable = false, precision = 22, scale = 0) + private BigDecimal locatorCodeId; + + @Size(max = 512) + @Column(length = 512) + private String description; + + @Basic(optional = true) + @Size(min = 1, max = 24) + @Column(nullable = true, length = 24) + private String state; + + @Column(name = "PROPOSED_BY") + private BigInteger proposedBy; + + @JoinColumn(name = "SECTOR_CODE_ID", referencedColumnName = "SECTOR_CODE_ID", nullable = false) + @ManyToOne(optional = false) + private SectorCode sectorCode; + + public LocatorCode() {} + + public LocatorCode(BigDecimal locatorCodeId) { + this.locatorCodeId = locatorCodeId; + } + + public LocatorCode(BigDecimal locatorCodeId, String yyCode, String state) { + this.locatorCodeId = locatorCodeId; + this.yyCode = yyCode; + this.state = state; + } + + public String getYyCode() { + return yyCode; + } + + public void setYyCode(String yyCode) { + this.yyCode = yyCode; + } + + public BigDecimal getLocatorCodeId() { + return locatorCodeId; + } + + public void setLocatorCodeId(BigDecimal locatorCodeId) { + this.locatorCodeId = locatorCodeId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public BigInteger getProposedBy() { + return proposedBy; + } + + public void setProposedBy(BigInteger proposedBy) { + this.proposedBy = proposedBy; + } + + public SectorCode getSectorCode() { + return sectorCode; + } + + public void setSectorCode(SectorCode sectorCode) { + this.sectorCode = sectorCode; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (locatorCodeId != null ? locatorCodeId.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 LocatorCode)) { + return false; + } + LocatorCode other = (LocatorCode) object; + return (this.locatorCodeId != null || other.locatorCodeId == null) + && (this.locatorCodeId == null || this.locatorCodeId.equals(other.locatorCodeId)); + } + + @Override + public String toString() { + return "org.jlab.cnm.persistence.entity.LocatorCode[ locatorCodeId=" + locatorCodeId + " ]"; + } } diff --git a/src/main/java/org/jlab/cnm/persistence/entity/SectorCode.java b/src/main/java/org/jlab/cnm/persistence/entity/SectorCode.java index 869b3d2..90c6e24 100644 --- a/src/main/java/org/jlab/cnm/persistence/entity/SectorCode.java +++ b/src/main/java/org/jlab/cnm/persistence/entity/SectorCode.java @@ -19,120 +19,124 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity @Table(name = "SECTOR_CODE", schema = "CNM_OWNER") -@NamedQueries({ - @NamedQuery(name = "SectorCode.findAll", query = "SELECT s FROM SectorCode s")}) +@NamedQueries({@NamedQuery(name = "SectorCode.findAll", query = "SELECT s FROM SectorCode s")}) public class SectorCode implements Serializable { - private static final long serialVersionUID = 1L; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 2) - @Column(name = "XX_CODE", nullable = false, length = 2) - private String xxCode; - @Size(max = 512) - @Column(length = 512) - private String description; - @Id - @SequenceGenerator(name = "SectorId", sequenceName = "SECTOR_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SectorId") - @Basic(optional = false) - @NotNull - @Column(name = "SECTOR_CODE_ID", nullable = false, precision = 22, scale = 0) - private BigInteger sectorCodeId; - @Basic(optional = true) - @Size(min = 1, max = 16) - @Column(nullable = true, length = 16) - private String grouping; - @Basic(optional = true) - @Size(min = 1, max = 24) - @Column(nullable = true, length = 24) - private String state; - @Column(name = "PROPOSED_BY") - private BigInteger proposedBy; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "sectorCode") - private List locatorCodeList; - - public String getXxCode() { - return xxCode; - } - - public void setXxCode(String xxCode) { - this.xxCode = xxCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public BigInteger getSectorCodeId() { - return sectorCodeId; - } - - public void setSectorCodeId(BigInteger sectorCodeId) { - this.sectorCodeId = sectorCodeId; - } - - public String getGrouping() { - return grouping; - } - - public void setGrouping(String grouping) { - this.grouping = grouping; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public BigInteger getProposedBy() { - return proposedBy; - } - - public void setProposedBy(BigInteger proposedBy) { - this.proposedBy = proposedBy; - } - - public List getLocatorCodeList() { - return locatorCodeList; - } - - public void setLocatorCodeList(List locatorCodeList) { - this.locatorCodeList = locatorCodeList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (sectorCodeId != null ? sectorCodeId.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 SectorCode)) { - return false; - } - SectorCode other = (SectorCode) object; - return (this.sectorCodeId != null || other.sectorCodeId == null) && - (this.sectorCodeId == null || this.sectorCodeId.equals(other.sectorCodeId)); - } - - @Override - public String toString() { - return "org.jlab.cnm.persistence.entity.SectorCode[ sectorCodeId=" + sectorCodeId + " ]"; - } - + private static final long serialVersionUID = 1L; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2) + @Column(name = "XX_CODE", nullable = false, length = 2) + private String xxCode; + + @Size(max = 512) + @Column(length = 512) + private String description; + + @Id + @SequenceGenerator(name = "SectorId", sequenceName = "SECTOR_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SectorId") + @Basic(optional = false) + @NotNull + @Column(name = "SECTOR_CODE_ID", nullable = false, precision = 22, scale = 0) + private BigInteger sectorCodeId; + + @Basic(optional = true) + @Size(min = 1, max = 16) + @Column(nullable = true, length = 16) + private String grouping; + + @Basic(optional = true) + @Size(min = 1, max = 24) + @Column(nullable = true, length = 24) + private String state; + + @Column(name = "PROPOSED_BY") + private BigInteger proposedBy; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "sectorCode") + private List locatorCodeList; + + public String getXxCode() { + return xxCode; + } + + public void setXxCode(String xxCode) { + this.xxCode = xxCode; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public BigInteger getSectorCodeId() { + return sectorCodeId; + } + + public void setSectorCodeId(BigInteger sectorCodeId) { + this.sectorCodeId = sectorCodeId; + } + + public String getGrouping() { + return grouping; + } + + public void setGrouping(String grouping) { + this.grouping = grouping; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public BigInteger getProposedBy() { + return proposedBy; + } + + public void setProposedBy(BigInteger proposedBy) { + this.proposedBy = proposedBy; + } + + public List getLocatorCodeList() { + return locatorCodeList; + } + + public void setLocatorCodeList(List locatorCodeList) { + this.locatorCodeList = locatorCodeList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (sectorCodeId != null ? sectorCodeId.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 SectorCode)) { + return false; + } + SectorCode other = (SectorCode) object; + return (this.sectorCodeId != null || other.sectorCodeId == null) + && (this.sectorCodeId == null || this.sectorCodeId.equals(other.sectorCodeId)); + } + + @Override + public String toString() { + return "org.jlab.cnm.persistence.entity.SectorCode[ sectorCodeId=" + sectorCodeId + " ]"; + } } diff --git a/src/main/java/org/jlab/cnm/persistence/entity/SystemCode.java b/src/main/java/org/jlab/cnm/persistence/entity/SystemCode.java index 04da63b..d7ce585 100644 --- a/src/main/java/org/jlab/cnm/persistence/entity/SystemCode.java +++ b/src/main/java/org/jlab/cnm/persistence/entity/SystemCode.java @@ -19,107 +19,110 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity @Table(name = "SYSTEM_CODE", schema = "CNM_OWNER") -@NamedQueries({ - @NamedQuery(name = "SystemCode.findAll", query = "SELECT s FROM SystemCode s")}) +@NamedQueries({@NamedQuery(name = "SystemCode.findAll", query = "SELECT s FROM SystemCode s")}) public class SystemCode implements Serializable { - private static final long serialVersionUID = 1L; - @Basic(optional = false) - @NotNull - @Column(name = "S_CODE", nullable = false) - private char sCode; - @Size(max = 512) - @Column(length = 512) - private String description; - @Id - @SequenceGenerator(name = "SystemId", sequenceName = "SYSTEM_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SystemId") - @Basic(optional = false) - @NotNull - @Column(name = "SYSTEM_CODE_ID", nullable = false, precision = 22, scale = 0) - private BigInteger systemCodeId; - @Basic(optional = true) - @Size(min = 1, max = 24) - @Column(nullable = true, length = 24) - private String state; - @Column(name = "PROPOSED_BY") - private BigInteger proposedBy; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "systemCode") - private List typeCodeList; - - public char getSCode() { - return sCode; + private static final long serialVersionUID = 1L; + + @Basic(optional = false) + @NotNull + @Column(name = "S_CODE", nullable = false) + private char sCode; + + @Size(max = 512) + @Column(length = 512) + private String description; + + @Id + @SequenceGenerator(name = "SystemId", sequenceName = "SYSTEM_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SystemId") + @Basic(optional = false) + @NotNull + @Column(name = "SYSTEM_CODE_ID", nullable = false, precision = 22, scale = 0) + private BigInteger systemCodeId; + + @Basic(optional = true) + @Size(min = 1, max = 24) + @Column(nullable = true, length = 24) + private String state; + + @Column(name = "PROPOSED_BY") + private BigInteger proposedBy; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "systemCode") + private List typeCodeList; + + public char getSCode() { + return sCode; + } + + public void setSCode(char sCode) { + this.sCode = sCode; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public BigInteger getSystemCodeId() { + return systemCodeId; + } + + public void setSystemCodeId(BigInteger systemCodeId) { + this.systemCodeId = systemCodeId; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public BigInteger getProposedBy() { + return proposedBy; + } + + public void setProposedBy(BigInteger proposedBy) { + this.proposedBy = proposedBy; + } + + public List getTypeCodeList() { + return typeCodeList; + } + + public void setTypeCodeList(List typeCodeList) { + this.typeCodeList = typeCodeList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (systemCodeId != null ? systemCodeId.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 SystemCode)) { + return false; } - - public void setSCode(char sCode) { - this.sCode = sCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public BigInteger getSystemCodeId() { - return systemCodeId; - } - - public void setSystemCodeId(BigInteger systemCodeId) { - this.systemCodeId = systemCodeId; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public BigInteger getProposedBy() { - return proposedBy; - } - - public void setProposedBy(BigInteger proposedBy) { - this.proposedBy = proposedBy; - } - - public List getTypeCodeList() { - return typeCodeList; - } - - public void setTypeCodeList(List typeCodeList) { - this.typeCodeList = typeCodeList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (systemCodeId != null ? systemCodeId.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 SystemCode)) { - return false; - } - SystemCode other = (SystemCode) object; - return (this.systemCodeId != null || other.systemCodeId == null) && - (this.systemCodeId == null || this.systemCodeId.equals(other.systemCodeId)); - } - - @Override - public String toString() { - return "org.jlab.cnm.persistence.entity.SystemCode[ systemCodeId=" + systemCodeId + " ]"; - } - + SystemCode other = (SystemCode) object; + return (this.systemCodeId != null || other.systemCodeId == null) + && (this.systemCodeId == null || this.systemCodeId.equals(other.systemCodeId)); + } + + @Override + public String toString() { + return "org.jlab.cnm.persistence.entity.SystemCode[ systemCodeId=" + systemCodeId + " ]"; + } } diff --git a/src/main/java/org/jlab/cnm/persistence/entity/TypeCode.java b/src/main/java/org/jlab/cnm/persistence/entity/TypeCode.java index 6b47a8f..b4e9b90 100644 --- a/src/main/java/org/jlab/cnm/persistence/entity/TypeCode.java +++ b/src/main/java/org/jlab/cnm/persistence/entity/TypeCode.java @@ -20,133 +20,139 @@ import javax.validation.constraints.Size; /** - * * @author ryans */ @Entity -@Table(name = "TYPE_CODE", schema = "CNM_OWNER", uniqueConstraints - = { - @UniqueConstraint(columnNames = {"SYSTEM_CODE_ID", "VV_CODE"})}) -@NamedQueries({ - @NamedQuery(name = "TypeCode.findAll", query = "SELECT t FROM TypeCode t")}) +@Table( + name = "TYPE_CODE", + schema = "CNM_OWNER", + uniqueConstraints = {@UniqueConstraint(columnNames = {"SYSTEM_CODE_ID", "VV_CODE"})}) +@NamedQueries({@NamedQuery(name = "TypeCode.findAll", query = "SELECT t FROM TypeCode t")}) public class TypeCode implements Serializable { - private static final long serialVersionUID = 1L; - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 2) - @Column(name = "VV_CODE", nullable = false, length = 2) - private String vvCode; - @Size(max = 512) - @Column(length = 512) - private String description; - @Id - @SequenceGenerator(name = "TypeId", sequenceName = "TYPE_ID", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TypeId") - @Basic(optional = false) - @NotNull - @Column(name = "TYPE_CODE_ID", nullable = false, precision = 22, scale = 0) - private BigInteger typeCodeId; - @Basic(optional = true) - @Size(min = 1, max = 16) - @Column(nullable = true, length = 16) - private String grouping; - @Size(max = 20) - @Column(length = 20) - private String state; - @Lob - @Column(name="JSON_ATTRIBUTES") - private String jsonAttributes; - @Column(name = "PROPOSED_BY") - private BigInteger proposedBy; - @JoinColumn(name = "SYSTEM_CODE_ID", referencedColumnName = "SYSTEM_CODE_ID", nullable = false) - @ManyToOne(optional = false) - private SystemCode systemCode; - - public String getVvCode() { - return vvCode; - } - - public void setVvCode(String vvCode) { - this.vvCode = vvCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public BigInteger getTypeCodeId() { - return typeCodeId; - } - - public void setTypeCodeId(BigInteger typeCodeId) { - this.typeCodeId = typeCodeId; - } - - public String getGrouping() { - return grouping; - } - - public void setGrouping(String grouping) { - this.grouping = grouping; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getJsonAttributes() { - return jsonAttributes; - } - - public void setJsonAttributes(String jsonAttributes) { - this.jsonAttributes = jsonAttributes; - } - - public BigInteger getProposedBy() { - return proposedBy; - } - - public void setProposedBy(BigInteger proposedBy) { - this.proposedBy = proposedBy; - } - - public SystemCode getSystemCode() { - return systemCode; - } - - public void setSystemCode(SystemCode systemCode) { - this.systemCode = systemCode; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (typeCodeId != null ? typeCodeId.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 TypeCode)) { - return false; - } - TypeCode other = (TypeCode) object; - return (this.typeCodeId != null || other.typeCodeId == null) && - (this.typeCodeId == null || this.typeCodeId.equals(other.typeCodeId)); - } - - @Override - public String toString() { - return "org.jlab.cnm.persistence.entity.TypeCode[ typeCodeId=" + typeCodeId + " ]"; - } - + private static final long serialVersionUID = 1L; + + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2) + @Column(name = "VV_CODE", nullable = false, length = 2) + private String vvCode; + + @Size(max = 512) + @Column(length = 512) + private String description; + + @Id + @SequenceGenerator(name = "TypeId", sequenceName = "TYPE_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TypeId") + @Basic(optional = false) + @NotNull + @Column(name = "TYPE_CODE_ID", nullable = false, precision = 22, scale = 0) + private BigInteger typeCodeId; + + @Basic(optional = true) + @Size(min = 1, max = 16) + @Column(nullable = true, length = 16) + private String grouping; + + @Size(max = 20) + @Column(length = 20) + private String state; + + @Lob + @Column(name = "JSON_ATTRIBUTES") + private String jsonAttributes; + + @Column(name = "PROPOSED_BY") + private BigInteger proposedBy; + + @JoinColumn(name = "SYSTEM_CODE_ID", referencedColumnName = "SYSTEM_CODE_ID", nullable = false) + @ManyToOne(optional = false) + private SystemCode systemCode; + + public String getVvCode() { + return vvCode; + } + + public void setVvCode(String vvCode) { + this.vvCode = vvCode; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public BigInteger getTypeCodeId() { + return typeCodeId; + } + + public void setTypeCodeId(BigInteger typeCodeId) { + this.typeCodeId = typeCodeId; + } + + public String getGrouping() { + return grouping; + } + + public void setGrouping(String grouping) { + this.grouping = grouping; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getJsonAttributes() { + return jsonAttributes; + } + + public void setJsonAttributes(String jsonAttributes) { + this.jsonAttributes = jsonAttributes; + } + + public BigInteger getProposedBy() { + return proposedBy; + } + + public void setProposedBy(BigInteger proposedBy) { + this.proposedBy = proposedBy; + } + + public SystemCode getSystemCode() { + return systemCode; + } + + public void setSystemCode(SystemCode systemCode) { + this.systemCode = systemCode; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (typeCodeId != null ? typeCodeId.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 TypeCode)) { + return false; + } + TypeCode other = (TypeCode) object; + return (this.typeCodeId != null || other.typeCodeId == null) + && (this.typeCodeId == null || this.typeCodeId.equals(other.typeCodeId)); + } + + @Override + public String toString() { + return "org.jlab.cnm.persistence.entity.TypeCode[ typeCodeId=" + typeCodeId + " ]"; + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/Overview.java b/src/main/java/org/jlab/cnm/presentation/controller/Overview.java index 4f102f1..e6a1b27 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/Overview.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/Overview.java @@ -8,24 +8,24 @@ import javax.servlet.http.HttpServletResponse; /** - * * @author ryans */ -@WebServlet(name = "Overview", urlPatterns = {"/overview"}) +@WebServlet( + name = "Overview", + urlPatterns = {"/overview"}) public class Overview 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 { - request.getRequestDispatcher("/WEB-INF/views/overview.jsp").forward(request, response); - } + /** + * 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 { + request.getRequestDispatcher("/WEB-INF/views/overview.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/Translate.java b/src/main/java/org/jlab/cnm/presentation/controller/Translate.java index fb4d49d..6844623 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/Translate.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/Translate.java @@ -15,35 +15,32 @@ import org.jlab.smoothness.business.util.ObjectUtil; /** - * * @author ryans */ -@WebServlet(name = "Translate", urlPatterns = {"/translate"}) +@WebServlet( + name = "Translate", + urlPatterns = {"/translate"}) public class Translate extends HttpServlet { - private static final Logger logger = Logger.getLogger( - Translate.class.getName()); - - @EJB - TranslatorService translator; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - String query = request.getParameter("q"); - - String meaning = translator.translate(query); - - response.setContentType("application/json"); - - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("meaning", ObjectUtil.coalesce(meaning, "")); - gen.writeEnd(); - } - } + private static final Logger logger = Logger.getLogger(Translate.class.getName()); + + @EJB TranslatorService translator; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + String query = request.getParameter("q"); + String meaning = translator.translate(query); + + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("meaning", ObjectUtil.coalesce(meaning, "")); + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/Translator.java b/src/main/java/org/jlab/cnm/presentation/controller/Translator.java index 5bd4235..c3c8a48 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/Translator.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/Translator.java @@ -8,24 +8,24 @@ import javax.servlet.http.HttpServletResponse; /** - * * @author ryans */ -@WebServlet(name = "Translator", urlPatterns = {"/translator"}) +@WebServlet( + name = "Translator", + urlPatterns = {"/translator"}) public class Translator 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 { - request.getRequestDispatcher("/WEB-INF/views/translator.jsp").forward(request, response); - } + /** + * 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 { + request.getRequestDispatcher("/WEB-INF/views/translator.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSector.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSector.java index 94c539a..c9ba398 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSector.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSector.java @@ -17,54 +17,52 @@ import org.jlab.smoothness.business.exception.UserFriendlyException; /** - * * @author ryans */ -@WebServlet(name = "AddSector", urlPatterns = {"/ajax/add-sector"}) +@WebServlet( + name = "AddSector", + urlPatterns = {"/ajax/add-sector"}) public class AddSector extends HttpServlet { - private static final Logger logger = Logger.getLogger(AddSector.class.getName()); + private static final Logger logger = Logger.getLogger(AddSector.class.getName()); - @EJB - SectorCodeFacade sectorFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB SectorCodeFacade sectorFacade; - String code = request.getParameter("code"); - String description = request.getParameter("description"); - String grouping = request.getParameter("grouping"); - - String stat = "ok"; - String error = null; - - try { - sectorFacade.addSector(code, description, grouping); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to add Sector: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to add Sector: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to add Sector"; - logger.log(Level.SEVERE, "Unable to add Sector", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + String code = request.getParameter("code"); + String description = request.getParameter("description"); + String grouping = request.getParameter("grouping"); + + String stat = "ok"; + String error = null; + + try { + sectorFacade.addSector(code, description, grouping); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to add Sector: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to add Sector: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to add Sector"; + logger.log(Level.SEVERE, "Unable to add Sector", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSystem.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSystem.java index bbe64a8..5703e48 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSystem.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddSystem.java @@ -18,53 +18,51 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "AddSystem", urlPatterns = {"/ajax/add-system"}) +@WebServlet( + name = "AddSystem", + urlPatterns = {"/ajax/add-system"}) public class AddSystem extends HttpServlet { - private static final Logger logger = Logger.getLogger(AddSystem.class.getName()); + private static final Logger logger = Logger.getLogger(AddSystem.class.getName()); - @EJB - SystemCodeFacade systemFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB SystemCodeFacade systemFacade; - Character code = ParamConverter.convertCharacter(request, "code"); - String description = request.getParameter("description"); - - String stat = "ok"; - String error = null; - - try { - systemFacade.addSystem(code, description); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to add System: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to add System: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to add System"; - logger.log(Level.SEVERE, "Unable to add System", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + Character code = ParamConverter.convertCharacter(request, "code"); + String description = request.getParameter("description"); + + String stat = "ok"; + String error = null; + + try { + systemFacade.addSystem(code, description); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to add System: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to add System: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to add System"; + logger.log(Level.SEVERE, "Unable to add System", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddType.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddType.java index b2026df..3055522 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddType.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/AddType.java @@ -18,55 +18,53 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "AddType", urlPatterns = {"/ajax/add-type"}) +@WebServlet( + name = "AddType", + urlPatterns = {"/ajax/add-type"}) public class AddType extends HttpServlet { - private static final Logger logger = Logger.getLogger(AddType.class.getName()); + private static final Logger logger = Logger.getLogger(AddType.class.getName()); - @EJB - TypeCodeFacade typeFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB TypeCodeFacade typeFacade; - Character scode = ParamConverter.convertCharacter(request, "scode"); - String vvcode = request.getParameter("vvcode"); - String description = request.getParameter("description"); - String grouping = request.getParameter("grouping"); - - String stat = "ok"; - String error = null; - - try { - typeFacade.addType(scode, vvcode, description, grouping); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to add Type: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to add Type: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to add Type"; - logger.log(Level.SEVERE, "Unable to add Type", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + Character scode = ParamConverter.convertCharacter(request, "scode"); + String vvcode = request.getParameter("vvcode"); + String description = request.getParameter("description"); + String grouping = request.getParameter("grouping"); + + String stat = "ok"; + String error = null; + + try { + typeFacade.addType(scode, vvcode, description, grouping); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to add Type: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to add Type: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to add Type"; + logger.log(Level.SEVERE, "Unable to add Type", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditAttributes.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditAttributes.java index bc11dbe..6dd2b10 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditAttributes.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditAttributes.java @@ -19,53 +19,52 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "EditAttributes", urlPatterns = {"/ajax/edit-attributes"}) +@WebServlet( + name = "EditAttributes", + urlPatterns = {"/ajax/edit-attributes"}) public class EditAttributes extends HttpServlet { - private static final Logger logger = Logger.getLogger(EditAttributes.class.getName()); + private static final Logger logger = Logger.getLogger(EditAttributes.class.getName()); - @EJB - TypeCodeFacade typeFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB TypeCodeFacade typeFacade; - BigInteger id = ParamConverter.convertBigInteger(request, "id"); - String jsonAttributes = request.getParameter("attributes"); - - String stat = "ok"; - String error = null; - - try { - typeFacade.editAttributes(id, jsonAttributes); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to edit attributes: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to edit attributes: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to edit attributes"; - logger.log(Level.SEVERE, "Unable to edit attributes", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + BigInteger id = ParamConverter.convertBigInteger(request, "id"); + String jsonAttributes = request.getParameter("attributes"); + + String stat = "ok"; + String error = null; + + try { + typeFacade.editAttributes(id, jsonAttributes); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to edit attributes: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = + "Unable to edit attributes: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to edit attributes"; + logger.log(Level.SEVERE, "Unable to edit attributes", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSector.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSector.java index c8e2439..1419158 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSector.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSector.java @@ -19,55 +19,53 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "EditSector", urlPatterns = {"/ajax/edit-sector"}) +@WebServlet( + name = "EditSector", + urlPatterns = {"/ajax/edit-sector"}) public class EditSector extends HttpServlet { - private static final Logger logger = Logger.getLogger(EditSector.class.getName()); + private static final Logger logger = Logger.getLogger(EditSector.class.getName()); - @EJB - SectorCodeFacade sectorFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB SectorCodeFacade sectorFacade; - BigInteger id = ParamConverter.convertBigInteger(request, "id"); - String code = request.getParameter("code"); - String description = request.getParameter("description"); - String grouping = request.getParameter("grouping"); - - String stat = "ok"; - String error = null; - - try { - sectorFacade.editSector(id, code, description, grouping); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to edit Sector: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to edit Sector: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to edit Sector"; - logger.log(Level.SEVERE, "Unable to edit Sector", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + BigInteger id = ParamConverter.convertBigInteger(request, "id"); + String code = request.getParameter("code"); + String description = request.getParameter("description"); + String grouping = request.getParameter("grouping"); + + String stat = "ok"; + String error = null; + + try { + sectorFacade.editSector(id, code, description, grouping); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to edit Sector: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to edit Sector: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to edit Sector"; + logger.log(Level.SEVERE, "Unable to edit Sector", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSystem.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSystem.java index 3f1f6cf..34eb219 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSystem.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditSystem.java @@ -19,54 +19,52 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "EditSystem", urlPatterns = {"/ajax/edit-system"}) +@WebServlet( + name = "EditSystem", + urlPatterns = {"/ajax/edit-system"}) public class EditSystem extends HttpServlet { - private static final Logger logger = Logger.getLogger(EditSystem.class.getName()); + private static final Logger logger = Logger.getLogger(EditSystem.class.getName()); - @EJB - SystemCodeFacade systemFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB SystemCodeFacade systemFacade; - BigInteger id = ParamConverter.convertBigInteger(request, "id"); - Character code = ParamConverter.convertCharacter(request, "code"); - String description = request.getParameter("description"); - - String stat = "ok"; - String error = null; - - try { - systemFacade.editSystem(id, code, description); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to edit System: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to edit System: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to edit System"; - logger.log(Level.SEVERE, "Unable to edit System", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + BigInteger id = ParamConverter.convertBigInteger(request, "id"); + Character code = ParamConverter.convertCharacter(request, "code"); + String description = request.getParameter("description"); + + String stat = "ok"; + String error = null; + + try { + systemFacade.editSystem(id, code, description); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to edit System: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to edit System: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to edit System"; + logger.log(Level.SEVERE, "Unable to edit System", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditType.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditType.java index dd1d8ce..13ccd41 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditType.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/EditType.java @@ -19,56 +19,54 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "EditType", urlPatterns = {"/ajax/edit-type"}) +@WebServlet( + name = "EditType", + urlPatterns = {"/ajax/edit-type"}) public class EditType extends HttpServlet { - private static final Logger logger = Logger.getLogger(EditType.class.getName()); + private static final Logger logger = Logger.getLogger(EditType.class.getName()); - @EJB - TypeCodeFacade typeFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB TypeCodeFacade typeFacade; - BigInteger id = ParamConverter.convertBigInteger(request, "id"); - Character scode = ParamConverter.convertCharacter(request, "scode"); - String vvcode = request.getParameter("vvcode"); - String description = request.getParameter("description"); - String grouping = request.getParameter("grouping"); - - String stat = "ok"; - String error = null; - - try { - typeFacade.editType(id, scode, vvcode, description, grouping); - } catch(UserFriendlyException e) { - stat = "fail"; - error = "Unable to edit Type: " + e.getMessage(); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to edit Type: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to edit Type"; - logger.log(Level.SEVERE, "Unable to edit Type", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + BigInteger id = ParamConverter.convertBigInteger(request, "id"); + Character scode = ParamConverter.convertCharacter(request, "scode"); + String vvcode = request.getParameter("vvcode"); + String description = request.getParameter("description"); + String grouping = request.getParameter("grouping"); + + String stat = "ok"; + String error = null; + + try { + typeFacade.editType(id, scode, vvcode, description, grouping); + } catch (UserFriendlyException e) { + stat = "fail"; + error = "Unable to edit Type: " + e.getMessage(); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to edit Type: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to edit Type"; + logger.log(Level.SEVERE, "Unable to edit Type", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/FilterTypeGroupingBySystem.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/FilterTypeGroupingBySystem.java index e0f27c6..c19a8cd 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/FilterTypeGroupingBySystem.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/FilterTypeGroupingBySystem.java @@ -17,60 +17,53 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "FilterTypeGroupingBySystem", urlPatterns = { - "/ajax/filter-type-grouping-by-system"}) +@WebServlet( + name = "FilterTypeGroupingBySystem", + urlPatterns = {"/ajax/filter-type-grouping-by-system"}) public class FilterTypeGroupingBySystem extends HttpServlet { - private static final Logger logger - = Logger.getLogger(FilterTypeGroupingBySystem.class.getName()); + private static final Logger logger = Logger.getLogger(FilterTypeGroupingBySystem.class.getName()); - @EJB - TypeCodeFacade typeFacade; + @EJB TypeCodeFacade typeFacade; - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - Character code = ParamConverter.convertCharacter(request, "code"); + Character code = ParamConverter.convertCharacter(request, "code"); - String stat = "ok"; - String error = null; + String stat = "ok"; + String error = null; - List groupingList = null; + List groupingList = null; - try { - groupingList = typeFacade.findGroupingList(code); - } catch (RuntimeException e) { - stat = "fail"; - error = "Unable to filter grouping list"; - logger.log(Level.SEVERE, "Unable to filter grouping list", e); - } + try { + groupingList = typeFacade.findGroupingList(code); + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to filter grouping list"; + logger.log(Level.SEVERE, "Unable to filter grouping list", e); + } - response.setContentType("application/json"); + response.setContentType("application/json"); - OutputStream out = response.getOutputStream(); + OutputStream out = response.getOutputStream(); - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if (error != null) { - gen.write("error", error); - } - if (groupingList != null) { - gen.writeStartArray("options"); - for (String grouping : groupingList) { - gen.writeStartObject() - .write("name", grouping) - .write("value", grouping) - .writeEnd(); - } - gen.writeEnd(); - } - gen.writeEnd(); + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + if (groupingList != null) { + gen.writeStartArray("options"); + for (String grouping : groupingList) { + gen.writeStartObject().write("name", grouping).write("value", grouping).writeEnd(); } + gen.writeEnd(); + } + gen.writeEnd(); } - + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSector.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSector.java index 246a8e1..abae41a 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSector.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSector.java @@ -16,49 +16,47 @@ import org.jlab.cnm.business.session.SectorCodeFacade; /** - * * @author ryans */ -@WebServlet(name = "RemoveSector", urlPatterns = {"/ajax/remove-sector"}) +@WebServlet( + name = "RemoveSector", + urlPatterns = {"/ajax/remove-sector"}) public class RemoveSector extends HttpServlet { - private static final Logger logger = Logger.getLogger(RemoveSector.class.getName()); + private static final Logger logger = Logger.getLogger(RemoveSector.class.getName()); - @EJB - SectorCodeFacade sectorFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB SectorCodeFacade sectorFacade; - String code = request.getParameter("code"); - - String stat = "ok"; - String error = null; - - try { - sectorFacade.removeSector(code); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to remove Sector: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to remove Sector"; - logger.log(Level.SEVERE, "Unable to remove Sector", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + String code = request.getParameter("code"); + + String stat = "ok"; + String error = null; + + try { + sectorFacade.removeSector(code); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to remove Sector: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to remove Sector"; + logger.log(Level.SEVERE, "Unable to remove Sector", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSystem.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSystem.java index 577db2f..8faedd3 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSystem.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveSystem.java @@ -17,49 +17,47 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "RemoveSystem", urlPatterns = {"/ajax/remove-system"}) +@WebServlet( + name = "RemoveSystem", + urlPatterns = {"/ajax/remove-system"}) public class RemoveSystem extends HttpServlet { - private static final Logger logger = Logger.getLogger(RemoveSystem.class.getName()); + private static final Logger logger = Logger.getLogger(RemoveSystem.class.getName()); - @EJB - SystemCodeFacade systemFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB SystemCodeFacade systemFacade; - Character code = ParamConverter.convertCharacter(request, "code"); - - String stat = "ok"; - String error = null; - - try { - systemFacade.removeSystem(code); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to remove System: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to remove System"; - logger.log(Level.SEVERE, "Unable to remove System", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + Character code = ParamConverter.convertCharacter(request, "code"); + + String stat = "ok"; + String error = null; + + try { + systemFacade.removeSystem(code); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to remove System: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to remove System"; + logger.log(Level.SEVERE, "Unable to remove System", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveType.java b/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveType.java index 8220002..ba8760c 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveType.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/ajax/RemoveType.java @@ -17,50 +17,48 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "RemoveType", urlPatterns = {"/ajax/remove-type"}) +@WebServlet( + name = "RemoveType", + urlPatterns = {"/ajax/remove-type"}) public class RemoveType extends HttpServlet { - private static final Logger logger = Logger.getLogger(RemoveType.class.getName()); + private static final Logger logger = Logger.getLogger(RemoveType.class.getName()); - @EJB - TypeCodeFacade typeFacade; - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + @EJB TypeCodeFacade typeFacade; - Character scode = ParamConverter.convertCharacter(request, "scode"); - String vvcode = request.getParameter("vvcode"); - - String stat = "ok"; - String error = null; - - try { - typeFacade.removeType(scode, vvcode); - } catch (EJBAccessException e) { - stat = "fail"; - error = "Unable to remove Type: Not authenticated / authorized (do you need to re-login?)"; - } catch(RuntimeException e) { - stat = "fail"; - error = "Unable to remove Type"; - logger.log(Level.SEVERE, "Unable to remove Type", e); - } - - response.setContentType("application/json"); + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - OutputStream out = response.getOutputStream(); - - try (JsonGenerator gen = Json.createGenerator(out)) { - gen.writeStartObject() - .write("stat", stat); - if(error != null) { - gen.write("error", error); - } - gen.writeEnd(); - } + Character scode = ParamConverter.convertCharacter(request, "scode"); + String vvcode = request.getParameter("vvcode"); + + String stat = "ok"; + String error = null; + + try { + typeFacade.removeType(scode, vvcode); + } catch (EJBAccessException e) { + stat = "fail"; + error = "Unable to remove Type: Not authenticated / authorized (do you need to re-login?)"; + } catch (RuntimeException e) { + stat = "fail"; + error = "Unable to remove Type"; + logger.log(Level.SEVERE, "Unable to remove Type", e); } + response.setContentType("application/json"); + + OutputStream out = response.getOutputStream(); + + try (JsonGenerator gen = Json.createGenerator(out)) { + gen.writeStartObject().write("stat", stat); + if (error != null) { + gen.write("error", error); + } + gen.writeEnd(); + } + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/codes/ElementController.java b/src/main/java/org/jlab/cnm/presentation/controller/codes/ElementController.java index a46c1eb..d0b326d 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/codes/ElementController.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/codes/ElementController.java @@ -12,32 +12,31 @@ import org.jlab.cnm.persistence.entity.ElementCode; /** - * * @author ryans */ -@WebServlet(name = "ElementController", urlPatterns = {"/codes/element"}) +@WebServlet( + name = "ElementController", + urlPatterns = {"/codes/element"}) public class ElementController extends HttpServlet { - @EJB - ElementCodeFacade elementFacade; - - /** - * 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 { - - List elementList = elementFacade.findAll(); - - request.setAttribute("elementList", elementList); - - request.getRequestDispatcher("/WEB-INF/views/codes/element.jsp").forward(request, response); - } + @EJB ElementCodeFacade elementFacade; + + /** + * 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 { + + List elementList = elementFacade.findAll(); + + request.setAttribute("elementList", elementList); + + request.getRequestDispatcher("/WEB-INF/views/codes/element.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/codes/LocatorController.java b/src/main/java/org/jlab/cnm/presentation/controller/codes/LocatorController.java index 0f58afa..48a089a 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/codes/LocatorController.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/codes/LocatorController.java @@ -12,31 +12,30 @@ import org.jlab.cnm.persistence.entity.LocatorCode; /** - * * @author ryans */ -@WebServlet(name = "LocatorController", urlPatterns = {"/codes/locator"}) +@WebServlet( + name = "LocatorController", + urlPatterns = {"/codes/locator"}) public class LocatorController extends HttpServlet { - @EJB - LocatorCodeFacade locatorFacade; - - /** - * 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 { - List locatorList = locatorFacade.findAll(); - - request.setAttribute("locatorList", locatorList); - - request.getRequestDispatcher("/WEB-INF/views/codes/locator.jsp").forward(request, response); - } + @EJB LocatorCodeFacade locatorFacade; + + /** + * 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 { + List locatorList = locatorFacade.findAll(); + + request.setAttribute("locatorList", locatorList); + + request.getRequestDispatcher("/WEB-INF/views/codes/locator.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/codes/SectorController.java b/src/main/java/org/jlab/cnm/presentation/controller/codes/SectorController.java index 12785b3..250d992 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/codes/SectorController.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/codes/SectorController.java @@ -11,62 +11,60 @@ import javax.servlet.http.HttpServletResponse; import org.jlab.cnm.business.session.SectorCodeFacade; import org.jlab.cnm.persistence.entity.SectorCode; -import org.jlab.smoothness.presentation.util.ParamConverter; import org.jlab.smoothness.presentation.util.ParamUtil; /** - * * @author ryans */ -@WebServlet(name = "SectorController", urlPatterns = {"/codes/sector"}) +@WebServlet( + name = "SectorController", + urlPatterns = {"/codes/sector"}) public class SectorController extends HttpServlet { - @EJB - SectorCodeFacade sectorFacade; - - /** - * 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 { - - int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0); - int max = ParamUtil.convertAndValidateNonNegativeInt(request, "max", Integer.MAX_VALUE); - String xxCode = request.getParameter("sector"); - String grouping = request.getParameter("grouping"); - - List sectorList = sectorFacade.filterList(xxCode, grouping, offset, max); - long totalRecords = sectorFacade.countList(xxCode, grouping); - - request.setAttribute("sectorList", sectorList); - - List groupingList = sectorFacade.findGroupingList(); - - request.setAttribute("groupingList", groupingList); - - DecimalFormat formatter = new DecimalFormat("###,###"); - - String selectionMessage = "All Sector Codes "; - - if(xxCode != null && !xxCode.trim().isEmpty()) { - selectionMessage = xxCode + " Sector Codes "; - } - - if(grouping != null && !grouping.trim().isEmpty()) { - selectionMessage = selectionMessage + "[" + grouping + "] "; - } - - selectionMessage = selectionMessage + "{" + formatter.format(totalRecords) + "}"; - - request.setAttribute("selectionMessage", selectionMessage); - - request.getRequestDispatcher("/WEB-INF/views/codes/sector.jsp").forward(request, response); + @EJB SectorCodeFacade sectorFacade; + + /** + * 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 { + + int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0); + int max = ParamUtil.convertAndValidateNonNegativeInt(request, "max", Integer.MAX_VALUE); + String xxCode = request.getParameter("sector"); + String grouping = request.getParameter("grouping"); + + List sectorList = sectorFacade.filterList(xxCode, grouping, offset, max); + long totalRecords = sectorFacade.countList(xxCode, grouping); + + request.setAttribute("sectorList", sectorList); + + List groupingList = sectorFacade.findGroupingList(); + + request.setAttribute("groupingList", groupingList); + + DecimalFormat formatter = new DecimalFormat("###,###"); + + String selectionMessage = "All Sector Codes "; + + if (xxCode != null && !xxCode.trim().isEmpty()) { + selectionMessage = xxCode + " Sector Codes "; + } + + if (grouping != null && !grouping.trim().isEmpty()) { + selectionMessage = selectionMessage + "[" + grouping + "] "; } + + selectionMessage = selectionMessage + "{" + formatter.format(totalRecords) + "}"; + + request.setAttribute("selectionMessage", selectionMessage); + + request.getRequestDispatcher("/WEB-INF/views/codes/sector.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/codes/SystemController.java b/src/main/java/org/jlab/cnm/presentation/controller/codes/SystemController.java index afbc811..affcf39 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/codes/SystemController.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/codes/SystemController.java @@ -12,32 +12,31 @@ import org.jlab.cnm.persistence.entity.SystemCode; /** - * * @author ryans */ -@WebServlet(name = "SystemController", urlPatterns = {"/codes/system"}) +@WebServlet( + name = "SystemController", + urlPatterns = {"/codes/system"}) public class SystemController extends HttpServlet { - @EJB - SystemCodeFacade systemFacade; - - /** - * 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 { - - List systemList = systemFacade.findAll(); - - request.setAttribute("systemList", systemList); - - request.getRequestDispatcher("/WEB-INF/views/codes/system.jsp").forward(request, response); - } + @EJB SystemCodeFacade systemFacade; + + /** + * 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 { + + List systemList = systemFacade.findAll(); + + request.setAttribute("systemList", systemList); + + request.getRequestDispatcher("/WEB-INF/views/codes/system.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/codes/TypeController.java b/src/main/java/org/jlab/cnm/presentation/controller/codes/TypeController.java index c282415..c51f930 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/codes/TypeController.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/codes/TypeController.java @@ -17,84 +17,82 @@ import org.jlab.smoothness.presentation.util.ParamUtil; /** - * * @author ryans */ -@WebServlet(name = "TypeController", urlPatterns = {"/codes/type"}) +@WebServlet( + name = "TypeController", + urlPatterns = {"/codes/type"}) public class TypeController extends HttpServlet { - @EJB - TypeCodeFacade typeFacade; - - @EJB - SystemCodeFacade systemFacade; - - /** - * 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 { - - int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0); - int max = ParamUtil.convertAndValidateNonNegativeInt(request, "max", Integer.MAX_VALUE); - Character sCode = ParamConverter.convertCharacter(request, "system"); - String vvCode = request.getParameter("type"); - String grouping = request.getParameter("grouping"); - - List typeList = typeFacade.filterList(sCode, vvCode, grouping, offset, max); - long totalRecords = typeFacade.countList(sCode, vvCode, grouping); - - List groupingList = typeFacade.findGroupingList(sCode); - - request.setAttribute("groupingList", groupingList); - - DecimalFormat formatter = new DecimalFormat("###,###"); - - String selectionMessage = "All Type Codes "; - - String typeStr = ""; - - if(vvCode != null) { - typeStr = vvCode; - } - - String systemStr = ""; - - if(sCode != null) { - SystemCode system = systemFacade.findByCode(sCode); - - systemStr = "Unknown System"; - - if(system != null) { - systemStr = system.getDescription(); - } - } - - if(typeStr != null || sCode != null) { - selectionMessage = systemStr + " " + typeStr + " Type Codes "; - } - - if(grouping != null && !grouping.trim().isEmpty()) { - selectionMessage = selectionMessage + "[" + grouping + "] "; - } - - selectionMessage = selectionMessage + "{" + formatter.format(totalRecords) + "}"; - - request.setAttribute("selectionMessage", selectionMessage); - - request.setAttribute("typeList", typeList); - - List systemList = systemFacade.findAll(); - - request.setAttribute("systemList", systemList); - - request.getRequestDispatcher("/WEB-INF/views/codes/type.jsp").forward(request, response); + @EJB TypeCodeFacade typeFacade; + + @EJB SystemCodeFacade systemFacade; + + /** + * 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 { + + int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0); + int max = ParamUtil.convertAndValidateNonNegativeInt(request, "max", Integer.MAX_VALUE); + Character sCode = ParamConverter.convertCharacter(request, "system"); + String vvCode = request.getParameter("type"); + String grouping = request.getParameter("grouping"); + + List typeList = typeFacade.filterList(sCode, vvCode, grouping, offset, max); + long totalRecords = typeFacade.countList(sCode, vvCode, grouping); + + List groupingList = typeFacade.findGroupingList(sCode); + + request.setAttribute("groupingList", groupingList); + + DecimalFormat formatter = new DecimalFormat("###,###"); + + String selectionMessage = "All Type Codes "; + + String typeStr = ""; + + if (vvCode != null) { + typeStr = vvCode; } + + String systemStr = ""; + + if (sCode != null) { + SystemCode system = systemFacade.findByCode(sCode); + + systemStr = "Unknown System"; + + if (system != null) { + systemStr = system.getDescription(); + } + } + + if (typeStr != null || sCode != null) { + selectionMessage = systemStr + " " + typeStr + " Type Codes "; + } + + if (grouping != null && !grouping.trim().isEmpty()) { + selectionMessage = selectionMessage + "[" + grouping + "] "; + } + + selectionMessage = selectionMessage + "{" + formatter.format(totalRecords) + "}"; + + request.setAttribute("selectionMessage", selectionMessage); + + request.setAttribute("typeList", typeList); + + List systemList = systemFacade.findAll(); + + request.setAttribute("systemList", systemList); + + request.getRequestDispatcher("/WEB-INF/views/codes/type.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/export/ExcelCodeList.java b/src/main/java/org/jlab/cnm/presentation/controller/export/ExcelCodeList.java index 87e5248..09c5ac4 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/export/ExcelCodeList.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/export/ExcelCodeList.java @@ -17,43 +17,40 @@ import org.jlab.cnm.persistence.entity.TypeCode; /** - * * @author ryans */ -@WebServlet(name = "ExcelCodeList", urlPatterns = {"/export/cnd.xlsx"}) +@WebServlet( + name = "ExcelCodeList", + urlPatterns = {"/export/cnd.xlsx"}) public class ExcelCodeList extends HttpServlet { - @EJB - ExcelCodeListFacade excelFacade; - - @EJB - SystemCodeFacade systemFacade; - - @EJB - TypeCodeFacade typeFacade; - - @EJB - SectorCodeFacade sectorFacade; - - /** - * 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 { - - List systemList = systemFacade.findAll(); - List typeList = typeFacade.filterList(null, null, null, 0, Integer.MAX_VALUE); - List sectorList = sectorFacade.filterList(null, null, 0, Integer.MAX_VALUE); - - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setHeader("content-disposition", "attachment;filename=\"cnd.xlsx\""); - - excelFacade.export(response.getOutputStream(), systemList, typeList, sectorList); - } + @EJB ExcelCodeListFacade excelFacade; + + @EJB SystemCodeFacade systemFacade; + + @EJB TypeCodeFacade typeFacade; + + @EJB SectorCodeFacade sectorFacade; + + /** + * 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 { + + List systemList = systemFacade.findAll(); + List typeList = typeFacade.filterList(null, null, null, 0, Integer.MAX_VALUE); + List sectorList = sectorFacade.filterList(null, null, 0, Integer.MAX_VALUE); + + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("content-disposition", "attachment;filename=\"cnd.xlsx\""); + + excelFacade.export(response.getOutputStream(), systemList, typeList, sectorList); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlCodeList.java b/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlCodeList.java index 71c4ad2..3046771 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlCodeList.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlCodeList.java @@ -8,7 +8,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jlab.cnm.business.session.ExcelCodeListFacade; import org.jlab.cnm.business.session.SectorCodeFacade; import org.jlab.cnm.business.session.SystemCodeFacade; import org.jlab.cnm.business.session.TypeCodeFacade; @@ -17,46 +16,44 @@ import org.jlab.cnm.persistence.entity.TypeCode; /** - * * @author ryans */ -@WebServlet(name = "HtmlCodeList", urlPatterns = {"/export/cnd.html"}) +@WebServlet( + name = "HtmlCodeList", + urlPatterns = {"/export/cnd.html"}) public class HtmlCodeList extends HttpServlet { - - @EJB - SystemCodeFacade systemFacade; - - @EJB - TypeCodeFacade typeFacade; - - @EJB - SectorCodeFacade sectorFacade; - - /** - * 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 { - - List systemList = systemFacade.findAll(); - List typeList = typeFacade.filterList(null, null, null, 0, Integer.MAX_VALUE); - List sectorList = sectorFacade.filterList(null, null, 0, Integer.MAX_VALUE); - - request.setAttribute("systemList", systemList); - request.setAttribute("typeList", typeList); - request.setAttribute("sectorList", sectorList); - - if(request.getParameter("attachment") != null) { - response.setContentType("text/html;charset=UTF-8"); - response.setHeader("content-disposition", "attachment;filename=\"cnd.html\""); - } - - request.getRequestDispatcher("/WEB-INF/views/html-export.jsp").forward(request, response); + + @EJB SystemCodeFacade systemFacade; + + @EJB TypeCodeFacade typeFacade; + + @EJB SectorCodeFacade sectorFacade; + + /** + * 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 { + + List systemList = systemFacade.findAll(); + List typeList = typeFacade.filterList(null, null, null, 0, Integer.MAX_VALUE); + List sectorList = sectorFacade.filterList(null, null, 0, Integer.MAX_VALUE); + + request.setAttribute("systemList", systemList); + request.setAttribute("typeList", typeList); + request.setAttribute("sectorList", sectorList); + + if (request.getParameter("attachment") != null) { + response.setContentType("text/html;charset=UTF-8"); + response.setHeader("content-disposition", "attachment;filename=\"cnd.html\""); } + + request.getRequestDispatcher("/WEB-INF/views/html-export.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlOverview.java b/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlOverview.java index 2e5a11d..deb928e 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlOverview.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/export/HtmlOverview.java @@ -8,29 +8,30 @@ import javax.servlet.http.HttpServletResponse; /** - * * @author ryans */ -@WebServlet(name = "HtmlOverview", urlPatterns = {"/export/overview.html"}) +@WebServlet( + name = "HtmlOverview", + urlPatterns = {"/export/overview.html"}) public class HtmlOverview 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 { - - if(request.getParameter("attachment") != null) { - response.setContentType("text/html;charset=UTF-8"); - response.setHeader("content-disposition", "attachment;filename=\"overview.html\""); - } - - request.getRequestDispatcher("/WEB-INF/views/overview-export.jsp").forward(request, response); + + /** + * 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 { + + if (request.getParameter("attachment") != null) { + response.setContentType("text/html;charset=UTF-8"); + response.setHeader("content-disposition", "attachment;filename=\"overview.html\""); } + + request.getRequestDispatcher("/WEB-INF/views/overview-export.jsp").forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFive.java b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFive.java index 94bd259..c18dba5 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFive.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFive.java @@ -18,60 +18,58 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "StepFive", urlPatterns = {"/generator/step-five"}) +@WebServlet( + name = "StepFive", + urlPatterns = {"/generator/step-five"}) public class StepFive extends HttpServlet { - @EJB - SystemCodeFacade systemFacade; - - @EJB - TypeCodeFacade typeFacade; - - @EJB - SectorCodeFacade sectorFacade; - - @EJB - LocatorCodeFacade locatorFacade; - - /** - * 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 { - Character systemCode = ParamConverter.convertCharacter(request, "system"); - - SystemCode system = systemFacade.findByCode(systemCode); - - request.setAttribute("system", system); - - String typeCode = request.getParameter("type"); - - TypeCode type = typeFacade.findByCode(system.getSCode(), typeCode); - - request.setAttribute("type", type); - - String sectorCode = request.getParameter("sector"); - - SectorCode sector = sectorFacade.findByCode(sectorCode); - - request.setAttribute("sector", sector); - - String locatorCode = request.getParameter("locator"); - - LocatorCode locator = locatorFacade.findByCode(locatorCode); - - request.setAttribute("locator", locator); - - request.getRequestDispatcher("/WEB-INF/views/generator/step-five.jsp").forward(request, response); - } + @EJB SystemCodeFacade systemFacade; + + @EJB TypeCodeFacade typeFacade; + + @EJB SectorCodeFacade sectorFacade; + + @EJB LocatorCodeFacade locatorFacade; + + /** + * 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 { + Character systemCode = ParamConverter.convertCharacter(request, "system"); + + SystemCode system = systemFacade.findByCode(systemCode); + + request.setAttribute("system", system); + + String typeCode = request.getParameter("type"); + + TypeCode type = typeFacade.findByCode(system.getSCode(), typeCode); + + request.setAttribute("type", type); + + String sectorCode = request.getParameter("sector"); + + SectorCode sector = sectorFacade.findByCode(sectorCode); + + request.setAttribute("sector", sector); + + String locatorCode = request.getParameter("locator"); + + LocatorCode locator = locatorFacade.findByCode(locatorCode); + + request.setAttribute("locator", locator); + + request + .getRequestDispatcher("/WEB-INF/views/generator/step-five.jsp") + .forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFour.java b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFour.java index aaf5861..5e5243a 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFour.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepFour.java @@ -19,58 +19,56 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "StepFour", urlPatterns = {"/generator/step-four"}) +@WebServlet( + name = "StepFour", + urlPatterns = {"/generator/step-four"}) public class StepFour extends HttpServlet { - @EJB - SystemCodeFacade systemFacade; - - @EJB - TypeCodeFacade typeFacade; - - @EJB - SectorCodeFacade sectorFacade; - - @EJB - LocatorCodeFacade locatorFacade; - - /** - * 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 { - Character systemCode = ParamConverter.convertCharacter(request, "system"); - - SystemCode system = systemFacade.findByCode(systemCode); - - request.setAttribute("system", system); - - String typeCode = request.getParameter("type"); - - TypeCode type = typeFacade.findByCode(system.getSCode(), typeCode); - - request.setAttribute("type", type); - - String sectorCode = request.getParameter("sector"); - - SectorCode sector = sectorFacade.findByCode(sectorCode); - - request.setAttribute("sector", sector); - - List locatorList = locatorFacade.findBySector(sector); - - request.setAttribute("locatorList", locatorList); - - request.getRequestDispatcher("/WEB-INF/views/generator/step-four.jsp").forward(request, response); - } + @EJB SystemCodeFacade systemFacade; + + @EJB TypeCodeFacade typeFacade; + + @EJB SectorCodeFacade sectorFacade; + + @EJB LocatorCodeFacade locatorFacade; + + /** + * 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 { + Character systemCode = ParamConverter.convertCharacter(request, "system"); + + SystemCode system = systemFacade.findByCode(systemCode); + + request.setAttribute("system", system); + + String typeCode = request.getParameter("type"); + + TypeCode type = typeFacade.findByCode(system.getSCode(), typeCode); + + request.setAttribute("type", type); + + String sectorCode = request.getParameter("sector"); + + SectorCode sector = sectorFacade.findByCode(sectorCode); + + request.setAttribute("sector", sector); + + List locatorList = locatorFacade.findBySector(sector); + + request.setAttribute("locatorList", locatorList); + + request + .getRequestDispatcher("/WEB-INF/views/generator/step-four.jsp") + .forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepOne.java b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepOne.java index c73f856..0e4c974 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepOne.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepOne.java @@ -12,32 +12,33 @@ import org.jlab.cnm.persistence.entity.SystemCode; /** - * * @author ryans */ -@WebServlet(name = "StepOne", urlPatterns = {"/generator/step-one"}) +@WebServlet( + name = "StepOne", + urlPatterns = {"/generator/step-one"}) public class StepOne extends HttpServlet { - @EJB - SystemCodeFacade systemFacade; - - /** - * 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 { - - List systemList = systemFacade.findAll(); - - request.setAttribute("systemList", systemList); - - request.getRequestDispatcher("/WEB-INF/views/generator/step-one.jsp").forward(request, response); - } + @EJB SystemCodeFacade systemFacade; + + /** + * 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 { + + List systemList = systemFacade.findAll(); + + request.setAttribute("systemList", systemList); + + request + .getRequestDispatcher("/WEB-INF/views/generator/step-one.jsp") + .forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepThree.java b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepThree.java index 9563911..2dec8d8 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepThree.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepThree.java @@ -17,55 +17,54 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "StepThree", urlPatterns = {"/generator/step-three"}) +@WebServlet( + name = "StepThree", + urlPatterns = {"/generator/step-three"}) public class StepThree extends HttpServlet { - @EJB - SystemCodeFacade systemFacade; - - @EJB - TypeCodeFacade typeFacade; - - @EJB - SectorCodeFacade sectorFacade; - - /** - * 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 { - Character systemCode = ParamConverter.convertCharacter(request, "system"); - - SystemCode system = systemFacade.findByCode(systemCode); - - request.setAttribute("system", system); - - String typeCode = request.getParameter("type"); - - TypeCode type = typeFacade.findByCode(system.getSCode(), typeCode); - - request.setAttribute("type", type); - - String grouping = request.getParameter("grouping"); - - List sectorList = sectorFacade.filterList(null, grouping, 0, Integer.MAX_VALUE); - - request.setAttribute("sectorList", sectorList); - - List groupingList = sectorFacade.findGroupingList(); - - request.setAttribute("groupingList", groupingList); - - request.getRequestDispatcher("/WEB-INF/views/generator/step-three.jsp").forward(request, response); - } + @EJB SystemCodeFacade systemFacade; + + @EJB TypeCodeFacade typeFacade; + + @EJB SectorCodeFacade sectorFacade; + + /** + * 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 { + Character systemCode = ParamConverter.convertCharacter(request, "system"); + + SystemCode system = systemFacade.findByCode(systemCode); + + request.setAttribute("system", system); + + String typeCode = request.getParameter("type"); + + TypeCode type = typeFacade.findByCode(system.getSCode(), typeCode); + + request.setAttribute("type", type); + + String grouping = request.getParameter("grouping"); + + List sectorList = sectorFacade.filterList(null, grouping, 0, Integer.MAX_VALUE); + + request.setAttribute("sectorList", sectorList); + + List groupingList = sectorFacade.findGroupingList(); + + request.setAttribute("groupingList", groupingList); + + request + .getRequestDispatcher("/WEB-INF/views/generator/step-three.jsp") + .forward(request, response); + } } diff --git a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepTwo.java b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepTwo.java index ab4d58f..d4211bd 100644 --- a/src/main/java/org/jlab/cnm/presentation/controller/generator/StepTwo.java +++ b/src/main/java/org/jlab/cnm/presentation/controller/generator/StepTwo.java @@ -15,46 +15,47 @@ import org.jlab.smoothness.presentation.util.ParamConverter; /** - * * @author ryans */ -@WebServlet(name = "StepTwo", urlPatterns = {"/generator/step-two"}) +@WebServlet( + name = "StepTwo", + urlPatterns = {"/generator/step-two"}) public class StepTwo extends HttpServlet { - @EJB - SystemCodeFacade systemFacade; - - @EJB - TypeCodeFacade typeFacade; - - /** - * 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 { - - Character systemCode = ParamConverter.convertCharacter(request, "system"); - String grouping = request.getParameter("grouping"); - - SystemCode system = systemFacade.findByCode(systemCode); - - request.setAttribute("system", system); - - List typeList = typeFacade.filterList(systemCode, null, grouping, 0, Integer.MAX_VALUE); - - request.setAttribute("typeList", typeList); - - List groupingList = typeFacade.findGroupingList(systemCode); - - request.setAttribute("groupingList", groupingList); - - request.getRequestDispatcher("/WEB-INF/views/generator/step-two.jsp").forward(request, response); - } + @EJB SystemCodeFacade systemFacade; + + @EJB TypeCodeFacade typeFacade; + + /** + * 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 { + + Character systemCode = ParamConverter.convertCharacter(request, "system"); + String grouping = request.getParameter("grouping"); + + SystemCode system = systemFacade.findByCode(systemCode); + + request.setAttribute("system", system); + + List typeList = + typeFacade.filterList(systemCode, null, grouping, 0, Integer.MAX_VALUE); + + request.setAttribute("typeList", typeList); + + List groupingList = typeFacade.findGroupingList(systemCode); + + request.setAttribute("groupingList", groupingList); + + request + .getRequestDispatcher("/WEB-INF/views/generator/step-two.jsp") + .forward(request, response); + } }