Skip to content
This repository was archived by the owner on Dec 15, 2018. It is now read-only.

Commit ad78da7

Browse files
authored
Adjusted Ozark regarding new ViewEngine constants (#181)
1 parent 9cb2441 commit ad78da7

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

core/src/main/java/org/mvcspec/ozark/engine/FaceletsViewEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.mvcspec.ozark.engine;
1717

1818
import javax.annotation.Priority;
19-
import javax.mvc.engine.Priorities;
19+
import javax.mvc.engine.ViewEngine;
2020
import javax.mvc.engine.ViewEngineContext;
2121
import javax.mvc.engine.ViewEngineException;
2222
import javax.servlet.ServletException;
@@ -30,7 +30,7 @@
3030
* @author Santiago Pericas-Geertsen
3131
* @see ViewEngineBase#resolveView(javax.mvc.engine.ViewEngineContext)
3232
*/
33-
@Priority(Priorities.DEFAULT)
33+
@Priority(ViewEngine.PRIORITY_DEFAULT)
3434
public class FaceletsViewEngine extends ServletViewEngine {
3535

3636
/**

core/src/main/java/org/mvcspec/ozark/engine/JspViewEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.mvcspec.ozark.engine;
1717

1818
import javax.annotation.Priority;
19-
import javax.mvc.engine.Priorities;
19+
import javax.mvc.engine.ViewEngine;
2020
import javax.mvc.engine.ViewEngineContext;
2121
import javax.mvc.engine.ViewEngineException;
2222
import javax.servlet.ServletException;
@@ -29,7 +29,7 @@
2929
* @author Santiago Pericas-Geertsen
3030
* @see ViewEngineBase#resolveView(javax.mvc.engine.ViewEngineContext)
3131
*/
32-
@Priority(Priorities.DEFAULT)
32+
@Priority(ViewEngine.PRIORITY_DEFAULT)
3333
public class JspViewEngine extends ServletViewEngine {
3434

3535
/**

core/src/main/java/org/mvcspec/ozark/engine/ViewEngineFinder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import javax.annotation.Priority;
2121
import javax.enterprise.context.ApplicationScoped;
2222
import javax.inject.Inject;
23-
import javax.mvc.engine.Priorities;
2423
import javax.mvc.engine.ViewEngine;
2524
import java.util.HashMap;
2625
import java.util.List;
@@ -85,9 +84,9 @@ public ViewEngine find(Viewable viewable) {
8584
engine = candidates.stream().max(
8685
(e1, e2) -> {
8786
final Priority p1 = getAnnotation(e1.getClass(), Priority.class);
88-
final int v1 = p1 != null ? p1.value() : Priorities.DEFAULT;
87+
final int v1 = p1 != null ? p1.value() : ViewEngine.PRIORITY_DEFAULT;
8988
final Priority p2 = getAnnotation(e2.getClass(), Priority.class);
90-
final int v2 = p2 != null ? p2.value() : Priorities.DEFAULT;
89+
final int v2 = p2 != null ? p2.value() : ViewEngine.PRIORITY_DEFAULT;
9190
return v1 - v2;
9291
});
9392
// Update cache

0 commit comments

Comments
 (0)