Bump smoothness lib to v4.6.0

JeffersonLab · Oct 2, 2024 · c91ca7a · c91ca7a
1 parent a84a4fe
commit c91ca7a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 36 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ repositories {
 
 dependencies {
     // No matter what smoothness weblib MUST be included in WAR (https://github.com/JeffersonLab/smoothness/issues/4)
-    implementation 'org.jlab:smoothness-weblib:4.5.0'
+    implementation 'org.jlab:smoothness-weblib:4.6.0'
     //'org.apache.httpcomponents:httpclient:4.5.14',
     //'org.apache.httpcomponents:httpmime:4.5.14'
 

diff --git a/src/main/java/org/jlab/dtm/business/session/EventFacade.java b/src/main/java/org/jlab/dtm/business/session/EventFacade.java
@@ -23,7 +23,6 @@
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 import org.jlab.dtm.business.params.AllEventsParams;
-import org.jlab.dtm.business.util.UserSuperFriendlyException;
 import org.jlab.dtm.persistence.entity.Event;
 import org.jlab.dtm.persistence.entity.EventType;
 import org.jlab.dtm.persistence.entity.Incident;
@@ -34,6 +33,7 @@
 import org.jlab.dtm.persistence.enumeration.IncidentEditType;
 import org.jlab.dtm.persistence.model.Period;
 import org.jlab.smoothness.business.exception.InternalException;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
 import org.jlab.smoothness.business.exception.WebApplicationException;
 import org.jlab.smoothness.business.util.IOUtil;
 import org.jlab.smoothness.persistence.util.JPAUtil;
@@ -205,7 +205,7 @@ public void editEvent(BigInteger eventId, Date timeUp, String title, BigInteger
       Event openEvent = findOpenEvent(event.getEventType().getEventTypeId());
 
       if (openEvent != null && !event.equals(openEvent)) {
-        throw new UserSuperFriendlyException(
+        throw new UserFriendlyException(
             "An event of type " + event.getEventType().getName() + " is already open");
       }
 
@@ -271,11 +271,11 @@ public void validateEventTimeUp(Event event, Date timeUp) throws WebApplicationE
 
     // Don't allow timeUp more than 30 seconds into the future
     if (timeUp != null && timeUp.after(new Date(new Date().getTime() + 30000))) {
-      throw new UserSuperFriendlyException("Event time up cannot be in the future");
+      throw new UserFriendlyException("Event time up cannot be in the future");
     }
 
     if (latestIncidentTimeUp != null && timeUp.before(latestIncidentTimeUp)) {
-      throw new UserSuperFriendlyException(
+      throw new UserFriendlyException(
           "Event time up ("
               + formatter.format(timeUp)
               + ") must not be before latest incident time up ("
@@ -286,8 +286,7 @@ public void validateEventTimeUp(Event event, Date timeUp) throws WebApplicationE
     Date latestIncidentTimeDown = computeLatestIncidentTimeDown(event.getIncidentList());
 
     if (latestIncidentTimeDown != null && timeUp.before(latestIncidentTimeDown)) {
-      throw new UserSuperFriendlyException(
-          "Event time up must not be before latest incident time down");
+      throw new UserFriendlyException("Event time up must not be before latest incident time down");
     }
   }
 

diff --git a/src/main/java/org/jlab/dtm/business/session/TrendReportFacade.java b/src/main/java/org/jlab/dtm/business/session/TrendReportFacade.java
@@ -12,7 +12,6 @@
 import org.jlab.dtm.business.service.FsdTripService;
 import org.jlab.dtm.business.util.DtmDateIterator;
 import org.jlab.dtm.business.util.DtmTimeUtil;
-import org.jlab.dtm.business.util.UserSuperFriendlyException;
 import org.jlab.dtm.persistence.entity.Category;
 import org.jlab.dtm.persistence.entity.EventType;
 import org.jlab.dtm.persistence.enumeration.AccMachineState;
@@ -33,7 +32,7 @@ public class TrendReportFacade {
 
   @PermitAll
   public List<TrendRecord> find(TrendReportParams params)
-      throws SQLException, UserSuperFriendlyException {
+      throws SQLException, UserFriendlyException {
     List<TrendRecord> recordList = new ArrayList<>();
 
     String size = params.getSize();
@@ -82,7 +81,7 @@ public List<TrendRecord> find(TrendReportParams params)
       }
 
       if (bins.size() > 12) {
-        throw new UserSuperFriendlyException(
+        throw new UserFriendlyException(
             bins.size()
                 + " bins requested, but number must be no more than 12, select larger bin size or smaller date range");
       }

diff --git a/src/main/java/org/jlab/dtm/business/util/UserSuperFriendlyException.java b/src/main/java/org/jlab/dtm/business/util/UserSuperFriendlyException.java
diff --git a/src/main/java/org/jlab/dtm/presentation/controller/ajax/EditEvent.java b/src/main/java/org/jlab/dtm/presentation/controller/ajax/EditEvent.java
@@ -15,9 +15,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.dtm.business.session.EventFacade;
-import org.jlab.dtm.business.util.UserSuperFriendlyException;
 import org.jlab.dtm.persistence.util.DtmSqlUtil;
 import org.jlab.dtm.presentation.util.DtmParamConverter;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -55,7 +55,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     } catch (EJBAccessException e) {
       logger.log(Level.WARNING, "Unable to edit event time up due to access exception");
       errorReason = "Not Authorized";
-    } catch (UserSuperFriendlyException e) {
+    } catch (UserFriendlyException e) {
       logger.log(Level.FINE, "Unable to edit event time up: {1}", e.getMessage());
       errorReason = e.getUserMessage();
     } catch (Exception e) {

diff --git a/src/main/java/org/jlab/dtm/presentation/controller/ajax/IncidentAction.java b/src/main/java/org/jlab/dtm/presentation/controller/ajax/IncidentAction.java
@@ -15,11 +15,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.dtm.business.session.IncidentFacade;
-import org.jlab.dtm.business.util.UserSuperFriendlyException;
 import org.jlab.dtm.persistence.entity.Event;
 import org.jlab.dtm.persistence.entity.Incident;
 import org.jlab.dtm.persistence.util.DtmSqlUtil;
 import org.jlab.dtm.presentation.util.DtmParamConverter;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -131,7 +131,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
           "Unable to perform incident action ({0}): {1}",
           new Object[] {action, e.getMessage()});
       errorReason = "Number Format Unacceptable";
-    } catch (UserSuperFriendlyException e) {
+    } catch (UserFriendlyException e) {
       LOGGER.log(
           Level.FINE,
           "Unable to perform incident action ({0}): {1}",

diff --git a/src/main/java/org/jlab/dtm/presentation/controller/data/Trend.java b/src/main/java/org/jlab/dtm/presentation/controller/data/Trend.java
@@ -20,9 +20,9 @@
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.dtm.business.params.TrendReportParams;
 import org.jlab.dtm.business.session.TrendReportFacade;
-import org.jlab.dtm.business.util.UserSuperFriendlyException;
 import org.jlab.dtm.persistence.model.TrendRecord;
 import org.jlab.dtm.presentation.params.TrendReportUrlParamHandler;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
 
 /**
  * @author ryans
@@ -68,7 +68,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     try {
       recordList = trendReportFacade.find(params);
-    } catch (UserSuperFriendlyException e) {
+    } catch (UserFriendlyException e) {
       errorReason = e.getUserMessage();
     } catch (SQLException e) {
       errorReason = "Internal Error";