This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 84a08607 EMPIREDB-431: WebApplication: code cleanup.
84a08607 is described below
commit 84a086078cb803e4fbabde34f8cc5d6d12275ab3
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Oct 20 02:07:28 2024 +0200
EMPIREDB-431:
WebApplication: code cleanup.
---
.../apache/empire/jakarta/app/WebApplication.java | 45 ----------------------
.../org/apache/empire/jsf2/app/WebApplication.java | 45 ----------------------
2 files changed, 90 deletions(-)
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/WebApplication.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/WebApplication.java
index b95aafc8..c40ecf84 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/WebApplication.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/WebApplication.java
@@ -33,7 +33,6 @@ import org.apache.empire.data.DataType;
import org.apache.empire.db.DBDatabase;
import org.apache.empire.db.context.DBRollbackManager;
import org.apache.empire.db.context.DBRollbackManager.ReleaseAction;
-import org.apache.empire.db.exceptions.UserLevelException;
import org.apache.empire.exceptions.InternalException;
import org.apache.empire.exceptions.InvalidArgumentException;
import org.apache.empire.exceptions.NotSupportedException;
@@ -49,11 +48,9 @@ import org.slf4j.LoggerFactory;
import jakarta.faces.application.Application;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.application.FacesMessage.Severity;
-import jakarta.faces.application.ViewExpiredException;
import jakarta.faces.component.NamingContainer;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.ExceptionQueuedEvent;
import jakarta.faces.event.ExceptionQueuedEventContext;
@@ -306,48 +303,6 @@ public abstract class WebApplication
String contextPath =
context.getExternalContext().getRequestContextPath();
FacesUtils.redirectDirectly(context, contextPath);
}
-
- /**
- * Logs an exception as Error with additional information
- * @param message the message to log
- * @param e the underlying exception
- */
- public void logException(Logger logger, String message, Throwable e)
- {
- if (logger==null)
- logger=log;
- // View Exceptions
- if ((e instanceof ViewExpiredException)) // || (e instanceof
ViewNotFoundException)) -- MyFaces only
- { // Session expired
- logger.warn(message+": "+e.getMessage());
- return;
- }
- // Get Session Info
- String addlInfo;
- try {
- FacesContext fc = FacesContext.getCurrentInstance();
- ExternalContext ec = (fc!=null ? fc.getExternalContext() : null);
- String sessionInfo = (ec!=null ?
getExceptionSessionInfo(ec.getSessionMap()) : "[NoSession]");
- addlInfo = StringUtils.coalesce(sessionInfo, "[NoSessionInfo]");
- } catch(Exception ex) {
- addlInfo = "[Error:"+ex.getMessage()+"] ";
- }
- // Log now
- if (e instanceof UserLevelException)
- logger.info(StringUtils.concat(addlInfo,
e.getClass().getSimpleName(), ": ", e.getMessage()));
- else
- logger.error(StringUtils.concat(addlInfo, message), e);
- }
-
- /**
- * Override this to provide additional session info for an exception
- * @param sessionMap
- * @return the additional session info
- */
- protected String getExceptionSessionInfo(Map<String, Object> sessionMap)
- {
- return null;
- }
/**
* returns true if a form input element has been partially submitted
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebApplication.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebApplication.java
index 8c4dde9c..694015ec 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebApplication.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebApplication.java
@@ -29,11 +29,9 @@ import java.util.ResourceBundle;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
-import javax.faces.application.ViewExpiredException;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.event.ExceptionQueuedEvent;
import javax.faces.event.ExceptionQueuedEventContext;
@@ -46,7 +44,6 @@ import org.apache.empire.data.DataType;
import org.apache.empire.db.DBDatabase;
import org.apache.empire.db.context.DBRollbackManager;
import org.apache.empire.db.context.DBRollbackManager.ReleaseAction;
-import org.apache.empire.db.exceptions.UserLevelException;
import org.apache.empire.exceptions.InternalException;
import org.apache.empire.exceptions.InvalidArgumentException;
import org.apache.empire.exceptions.NotSupportedException;
@@ -305,48 +302,6 @@ public abstract class WebApplication
String contextPath =
context.getExternalContext().getRequestContextPath();
FacesUtils.redirectDirectly(context, contextPath);
}
-
- /**
- * Logs an exception as Error with additional information
- * @param message the message to log
- * @param e the underlying exception
- */
- public void logException(Logger logger, String message, Throwable e)
- {
- if (logger==null)
- logger=log;
- // View Exceptions
- if ((e instanceof ViewExpiredException)) // || (e instanceof
ViewNotFoundException)) -- MyFaces only
- { // Session expired
- logger.warn(message+": "+e.getMessage());
- return;
- }
- // Get Session Info
- String addlInfo;
- try {
- FacesContext fc = FacesContext.getCurrentInstance();
- ExternalContext ec = (fc!=null ? fc.getExternalContext() : null);
- String sessionInfo = (ec!=null ?
getExceptionSessionInfo(ec.getSessionMap()) : "[NoSession]");
- addlInfo = StringUtils.coalesce(sessionInfo, "[NoSessionInfo]");
- } catch(Exception ex) {
- addlInfo = "[Error:"+ex.getMessage()+"] ";
- }
- // Log now
- if (e instanceof UserLevelException)
- logger.info(StringUtils.concat(addlInfo,
e.getClass().getSimpleName(), ": ", e.getMessage()));
- else
- logger.error(StringUtils.concat(addlInfo, message), e);
- }
-
- /**
- * Override this to provide additional session info for an exception
- * @param sessionMap
- * @return the additional session info
- */
- protected String getExceptionSessionInfo(Map<String, Object> sessionMap)
- {
- return null;
- }
/**
* returns true if a form input element has been partially submitted
