You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by mb...@apache.org on 2021/07/04 22:08:00 UTC
[roller] 05/09: Exception handling can be simplified since velocity
is now throwing subtypes of VelocityException.
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 89ec086fc031c082f345dd7548bac76afda4aba7
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Tue May 18 02:24:49 2021 +0200
Exception handling can be simplified since velocity is now throwing subtypes of VelocityException.
---
.../ui/rendering/velocity/VelocityRenderer.java | 55 +++-------------------
1 file changed, 7 insertions(+), 48 deletions(-)
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
index e348a84..3ea45ba 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
@@ -32,8 +32,6 @@ import org.apache.roller.weblogger.ui.rendering.mobile.MobileDeviceRepository;
import org.apache.roller.weblogger.ui.rendering.model.UtilitiesModel;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
@@ -42,11 +40,11 @@ import org.apache.velocity.exception.VelocityException;
*/
public class VelocityRenderer implements Renderer {
- private static Log log = LogFactory.getLog(VelocityRenderer.class);
+ private static final Log log = LogFactory.getLog(VelocityRenderer.class);
// the original template we are supposed to render
- private Template renderTemplate = null;
- private MobileDeviceRepository.DeviceType deviceType = null;
+ private final Template renderTemplate;
+ private final MobileDeviceRepository.DeviceType deviceType;
// the velocity templates
private org.apache.velocity.Template velocityTemplate = null;
@@ -77,34 +75,13 @@ public class VelocityRenderer implements Renderer {
// failed
throw ex;
- } catch (ParseErrorException ex) {
- // in the case of a parsing error we want to render an
- // error page instead so the user knows what was wrong
- velocityException = ex;
-
- // need to lookup error page template
- velocityTemplate = RollerVelocity.getTemplate("error-page.vm",
- deviceType);
-
- } catch (MethodInvocationException ex) {
-
- // in the case of a invocation error we want to render an
- // error page instead so the user knows what was wrong
- velocityException = ex;
-
- // need to lookup error page template
- velocityTemplate = RollerVelocity.getTemplate("error-page.vm",
- deviceType);
-
} catch (VelocityException ex) {
-
- // in the case of a parsing error including a macro we want to
- // render an error page instead so the user knows what was wrong
+ // in the case of a velocity error we want to render an
+ // error page instead so the user knows what was wrong
velocityException = ex;
// need to lookup error page template
- velocityTemplate = RollerVelocity.getTemplate("error-page.vm",
- deviceType);
+ velocityTemplate = RollerVelocity.getTemplate("error-page.vm", deviceType);
} catch (Exception ex) {
// some kind of generic/unknown exception, dump it to the logs
@@ -172,27 +149,9 @@ public class VelocityRenderer implements Renderer {
log.debug("Rendered [" + renderTemplate.getId() + "] in "
+ renderTime + " secs");
- } catch (ParseErrorException ex) {
-
- // in the case of a parsing error including a page we want to render
- // an error on the page instead so the user knows what was wrong
- velocityException = ex;
-
- // need to lookup parse error template
- renderException(model, out, "error-parse.vm");
-
- } catch (MethodInvocationException ex) {
-
- // in the case of a parsing error including a page we want to render
- // an error on the page instead so the user knows what was wrong
- velocityException = ex;
-
- // need to lookup parse error template
- renderException(model, out, "error-parse.vm");
-
} catch (VelocityException ex) {
- // in the case of a parsing error including a macro we want to
+ // in the case of a velocity error including a page we want to
// render an error page instead so the user knows what was wrong
velocityException = ex;