Updated Ozark regarding new ViewEngine constants

chkal · chkal · commit ac4ad9c95958 · 2018-08-28T16:57:37.000+02:00
diff --git a/core/src/main/java/org/mvcspec/ozark/engine/FaceletsViewEngine.java b/core/src/main/java/org/mvcspec/ozark/engine/FaceletsViewEngine.java
@@ -30,7 +30,7 @@
  * @author Santiago Pericas-Geertsen
  * @see ViewEngineBase#resolveView(javax.mvc.engine.ViewEngineContext)
  */
-@Priority(ViewEngine.PRIORITY_DEFAULT)
+@Priority(ViewEngine.PRIORITY_BUILTIN)
 public class FaceletsViewEngine extends ServletViewEngine {
 
     /**
diff --git a/core/src/main/java/org/mvcspec/ozark/engine/JspViewEngine.java b/core/src/main/java/org/mvcspec/ozark/engine/JspViewEngine.java
@@ -29,7 +29,7 @@
  * @author Santiago Pericas-Geertsen
  * @see ViewEngineBase#resolveView(javax.mvc.engine.ViewEngineContext)
  */
-@Priority(ViewEngine.PRIORITY_DEFAULT)
+@Priority(ViewEngine.PRIORITY_BUILTIN)
 public class JspViewEngine extends ServletViewEngine {
 
     /**
diff --git a/core/src/main/java/org/mvcspec/ozark/engine/ViewEngineFinder.java b/core/src/main/java/org/mvcspec/ozark/engine/ViewEngineFinder.java
@@ -84,9 +84,9 @@ public ViewEngine find(Viewable viewable) {
                 engine = candidates.stream().max(
                         (e1, e2) -> {
                             final Priority p1 = getAnnotation(e1.getClass(), Priority.class);
-                            final int v1 = p1 != null ? p1.value() : ViewEngine.PRIORITY_DEFAULT;
+                            final int v1 = p1 != null ? p1.value() : ViewEngine.PRIORITY_APPLICATION;
                             final Priority p2 = getAnnotation(e2.getClass(), Priority.class);
-                            final int v2 = p2 != null ? p2.value() : ViewEngine.PRIORITY_DEFAULT;
+                            final int v2 = p2 != null ? p2.value() : ViewEngine.PRIORITY_APPLICATION;
                             return v1 - v2;
                         });
                 // Update cache
diff --git a/ext/asciidoc/src/main/java/org/mvcspec/ozark/ext/asciidoc/AsciiDocViewEngine.java b/ext/asciidoc/src/main/java/org/mvcspec/ozark/ext/asciidoc/AsciiDocViewEngine.java
@@ -20,8 +20,10 @@
 import org.asciidoctor.Options;
 import org.mvcspec.ozark.engine.ViewEngineBase;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.ServletContext;
@@ -40,6 +42,7 @@
  * @author Ricardo Arguello
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class AsciiDocViewEngine extends ViewEngineBase {
 
     private final Asciidoctor asciidoctor;
diff --git a/ext/freemarker/src/main/java/org/mvcspec/ozark/ext/freemarker/FreemarkerViewEngine.java b/ext/freemarker/src/main/java/org/mvcspec/ozark/ext/freemarker/FreemarkerViewEngine.java
@@ -21,8 +21,10 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.http.HttpServletRequest;
@@ -39,6 +41,7 @@
  * @author Santiago Pericas-Geertsen
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class FreemarkerViewEngine extends ViewEngineBase {
 
     @Inject
diff --git a/ext/groovy/src/main/java/org/mvcspec/ozark/ext/groovy/GroovyViewEngine.java b/ext/groovy/src/main/java/org/mvcspec/ozark/ext/groovy/GroovyViewEngine.java
@@ -26,8 +26,10 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.ServletContext;
@@ -45,6 +47,7 @@
  * @author Daniel Dias
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class GroovyViewEngine extends ViewEngineBase {
 
     @Inject
diff --git a/ext/handlebars/src/main/java/org/mvcspec/ozark/ext/handlebars/HandlebarsViewEngine.java b/ext/handlebars/src/main/java/org/mvcspec/ozark/ext/handlebars/HandlebarsViewEngine.java
@@ -20,8 +20,10 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.ServletContext;
@@ -43,6 +45,7 @@
  * @author Rahman Usta
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class HandlebarsViewEngine extends ViewEngineBase {
 
     @Inject
diff --git a/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/JadeViewEngine.java b/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/JadeViewEngine.java
@@ -21,8 +21,10 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.http.HttpServletRequest;
@@ -41,6 +43,7 @@
  * @see <a href="https://github.com/neuland/jade4j">Jade4J</a>
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class JadeViewEngine extends ViewEngineBase {
 
     @Inject
diff --git a/ext/jetbrick/src/main/java/org/mvcspec/ozark/ext/jetbrick/JetbrickViewEngine.java b/ext/jetbrick/src/main/java/org/mvcspec/ozark/ext/jetbrick/JetbrickViewEngine.java
@@ -22,8 +22,10 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.ServletContext;
@@ -39,6 +41,7 @@
  * @author Daniel Dias
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class JetbrickViewEngine extends ViewEngineBase {
 
     private JetEngine jetEngine;
diff --git a/ext/jsr223/src/main/java/org/mvcspec/ozark/ext/jsr223/Jsr223ViewEngine.java b/ext/jsr223/src/main/java/org/mvcspec/ozark/ext/jsr223/Jsr223ViewEngine.java
@@ -23,8 +23,10 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.script.Bindings;
@@ -39,6 +41,7 @@
  * @author Manfred Riem (manfred.riem@oracle.com)
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class Jsr223ViewEngine extends ViewEngineBase {
 
     /**
diff --git a/ext/jtwig/src/main/java/org/mvcspec/ozark/ext/jtwig/JtwigViewEngine.java b/ext/jtwig/src/main/java/org/mvcspec/ozark/ext/jtwig/JtwigViewEngine.java
@@ -20,7 +20,9 @@
 import java.util.Map;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.ServletException;
@@ -34,6 +36,7 @@
  * @author Daniel Dias
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class JtwigViewEngine extends ViewEngineBase {
 
     private JtwigRenderer jtwigRenderer;
diff --git a/ext/mustache/src/main/java/org/mvcspec/ozark/ext/mustache/MustacheViewEngine.java b/ext/mustache/src/main/java/org/mvcspec/ozark/ext/mustache/MustacheViewEngine.java
@@ -20,8 +20,10 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.http.HttpServletRequest;
@@ -38,6 +40,7 @@
  * @author Rodrigo Turini
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class MustacheViewEngine extends ViewEngineBase {
 
     @Inject
diff --git a/ext/pebble/src/main/java/org/mvcspec/ozark/ext/pebble/PebbleViewEngine.java b/ext/pebble/src/main/java/org/mvcspec/ozark/ext/pebble/PebbleViewEngine.java
@@ -20,7 +20,9 @@
 import com.mitchellbosecke.pebble.template.PebbleTemplate;
 import org.mvcspec.ozark.engine.ViewEngineBase;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import java.io.IOException;
@@ -38,6 +40,7 @@
  * @see <a href="http://www.mitchellbosecke.com/pebble/home">Pebble</a>
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class PebbleViewEngine extends ViewEngineBase {
 
   private PebbleEngine pebbleEngine;
diff --git a/ext/stringtemplate/src/main/java/org/mvcspec/ozark/ext/stringtemplate/StringTemplateViewEngine.java b/ext/stringtemplate/src/main/java/org/mvcspec/ozark/ext/stringtemplate/StringTemplateViewEngine.java
@@ -18,6 +18,7 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 import org.stringtemplate.v4.*;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.mvc.engine.*;
@@ -36,6 +37,7 @@
  * @author Rodrigo Turini
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class StringTemplateViewEngine extends ViewEngineBase {
 
 	@Inject
diff --git a/ext/thymeleaf/src/main/java/org/mvcspec/ozark/ext/thymeleaf/ThymeleafViewEngine.java b/ext/thymeleaf/src/main/java/org/mvcspec/ozark/ext/thymeleaf/ThymeleafViewEngine.java
@@ -19,9 +19,11 @@
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 import org.thymeleaf.TemplateEngine;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.ServletContext;
@@ -38,6 +40,7 @@
  * @author Gregor Tudan
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class ThymeleafViewEngine extends ViewEngineBase {
 
     @Inject
diff --git a/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/VelocityViewEngine.java b/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/VelocityViewEngine.java
@@ -21,8 +21,10 @@
 import org.mvcspec.ozark.engine.ViewEngineBase;
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 
+import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.mvc.engine.ViewEngine;
 import javax.mvc.engine.ViewEngineContext;
 import javax.mvc.engine.ViewEngineException;
 import javax.servlet.http.HttpServletRequest;
@@ -39,6 +41,7 @@
  * @author Rodrigo Turini
  */
 @ApplicationScoped
+@Priority(ViewEngine.PRIORITY_FRAMEWORK)
 public class VelocityViewEngine extends ViewEngineBase {
 
     @Inject
