Implementation of ViewEngineContext#getLocale() (#184)

Author: chkal

core/src/main/java/org/mvcspec/ozark/core/ViewableWriter.java

@@ -163,7 +163,7 @@ public void writeTo(Viewable viewable, Class<?> aClass, Type type, Annotation[]
 
             // Process view using selected engine
             engine.processView(new ViewEngineContextImpl(viewable.getView(), models, request, responseWrapper,
-                    headers, responseStream, mediaType, uriInfo, resourceInfo, config));
+                    headers, responseStream, mediaType, uriInfo, resourceInfo, config, mvc.getLocale()));
 
             // Fire AfterProcessView event
             if (OzarkCdiExtension.isEventObserved(AfterProcessViewEvent.class)) {

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

@@ -23,6 +23,7 @@
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
 import java.io.OutputStream;
+import java.util.Locale;
 
 /**
  * Implementation of {@link javax.mvc.engine.ViewEngineContext}. Provides all the information
@@ -52,6 +53,8 @@ public class ViewEngineContextImpl implements ViewEngineContext {
 
     private final Configuration configuration;
 
+    private final Locale locale;
+
     /**
      * Constructor for view engine contexts.
      *
@@ -65,11 +68,12 @@ public class ViewEngineContextImpl implements ViewEngineContext {
      * @param uriInfo URI info about the request.
      * @param resourceInfo Resource matched info.
      * @param configuration the configuration.
+     * @param locale the request locale
      */
     public ViewEngineContextImpl(String view, Models models, Object request, Object response,
                                  MultivaluedMap<String, Object> responseHeaders, OutputStream outputStream,
                                  MediaType mediaType, UriInfo uriInfo, ResourceInfo resourceInfo,
-                                 Configuration configuration) {
+                                 Configuration configuration, Locale locale) {
         this.view = view;
         this.models = models;
         this.request = request;
@@ -80,6 +84,7 @@ public ViewEngineContextImpl(String view, Models models, Object request, Object
         this.uriInfo = uriInfo;
         this.resourceInfo = resourceInfo;
         this.configuration = configuration;
+        this.locale = locale;
     }
 
     @Override
@@ -92,6 +97,11 @@ public Models getModels() {
         return models;
     }
 
+    @Override
+    public Locale getLocale() {
+        return locale;
+    }
+
     @Override
     public <T> T getRequest(Class<T> type) {
         return type.cast(request);

core/src/test/java/org/mvcspec/ozark/core/ViewableWriterTest.java

@@ -16,6 +16,7 @@
 package org.mvcspec.ozark.core;
 
 import org.easymock.EasyMock;
+import org.mvcspec.ozark.MvcContextImpl;
 import org.mvcspec.ozark.engine.ViewEngineFinder;
 import org.junit.Test;
 
@@ -77,6 +78,10 @@ public void testGetSize() {
     public void testWriteTo() throws Exception {
         ViewableWriter writer = new ViewableWriter();
 
+        Field mvcField = writer.getClass().getDeclaredField("mvc");
+        mvcField.setAccessible(true);
+        mvcField.set(writer, new MvcContextImpl());
+        
         ViewEngineFinder finder = EasyMock.createStrictMock(ViewEngineFinder.class);
         Field finderField = writer.getClass().getDeclaredField("engineFinder");
         finderField.setAccessible(true);

core/src/test/java/org/mvcspec/ozark/engine/ViewEngineContextImplTest.java

@@ -39,7 +39,7 @@ public class ViewEngineContextImplTest {
      */
     @Test
     public void testGetView() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl("view", null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl("view", null, null, null, null, null, null, null, null, null, null);
         assertEquals("view", context.getView());
     }
 
@@ -48,9 +48,9 @@ public void testGetView() {
      */
     @Test
     public void testGetModels() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null, null);
         assertNull(context.getModels());
-        context = new ViewEngineContextImpl(null, new ModelsImpl(), null, null, null, null, null, null, null, null);
+        context = new ViewEngineContextImpl(null, new ModelsImpl(), null, null, null, null, null, null, null, null, null);
         assertNotNull(context.getModels());
     }
 
@@ -59,11 +59,11 @@ public void testGetModels() {
      */
     @Test
     public void testGetRequest() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null, null);
         assertNull(context.getRequest(Object.class));
         HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
         replay(request);
-        context = new ViewEngineContextImpl(null, null, request, null, null, null, null, null, null, null);
+        context = new ViewEngineContextImpl(null, null, request, null, null, null, null, null, null, null, null);
         assertNotNull(context.getRequest(Object.class));
         verify(request);
     }
@@ -73,11 +73,11 @@ public void testGetRequest() {
      */
     @Test
     public void testGetResponse() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null, null);
         assertNull(context.getResponse(Object.class));
         HttpServletResponse response = EasyMock.createMock(HttpServletResponse.class);
         replay(response);
-        context = new ViewEngineContextImpl(null, null, null, response, null, null, null, null, null, null);
+        context = new ViewEngineContextImpl(null, null, null, response, null, null, null, null, null, null, null);
         assertNotNull(context.getResponse(Object.class));
         verify(response);
     }
@@ -87,11 +87,11 @@ public void testGetResponse() {
      */
     @Test
     public void testGetUriInfo() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null, null);
         assertNull(context.getUriInfo());
         UriInfo uriInfo = EasyMock.createMock(UriInfo.class);
         replay(uriInfo);
-        context = new ViewEngineContextImpl(null, null, null, null, null, null, null, uriInfo, null, null);
+        context = new ViewEngineContextImpl(null, null, null, null, null, null, null, uriInfo, null, null, null);
         assertNotNull(context.getUriInfo());
         verify(uriInfo);
     }
@@ -101,11 +101,11 @@ public void testGetUriInfo() {
      */
     @Test
     public void testGetResourceInfo() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null, null);
         assertNull(context.getResourceInfo());
         ResourceInfo resourceInfo = EasyMock.createMock(ResourceInfo.class);
         replay(resourceInfo);
-        context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, resourceInfo, null);
+        context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, resourceInfo, null, null);
         assertNotNull(context.getResourceInfo());
         verify(resourceInfo);
     }
@@ -115,11 +115,11 @@ public void testGetResourceInfo() {
      */
     @Test
     public void testGetConfiguration() {
-        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null);
+        ViewEngineContextImpl context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, null, null);
         assertNull(context.getConfiguration());
         Configuration config = EasyMock.createMock(Configuration.class);
         replay(config);
-        context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, config);
+        context = new ViewEngineContextImpl(null, null, null, null, null, null, null, null, null, config, null);
         assertNotNull(context.getConfiguration());
         verify(config);
     }