Jmix productionMode property does not affect Vaadin configuration #680

jmix-projects · Oct 4, 2021 · 5e54d46 · 5e54d46
1 parent c719782
commit 5e54d46
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/ui-starter/src/main/java/io/jmix/autoconfigure/ui/vaadin/JmixVaadinServletConfiguration.java b/ui-starter/src/main/java/io/jmix/autoconfigure/ui/vaadin/JmixVaadinServletConfiguration.java
@@ -21,6 +21,7 @@
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.spring.annotation.SpringUI;
 import com.vaadin.spring.server.SpringVaadinServlet;
+import io.jmix.ui.UiProperties;
 import io.jmix.ui.sys.vaadin.JmixVaadinServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,6 +90,8 @@ public class JmixVaadinServletConfiguration implements InitializingBean {
     protected ApplicationContext applicationContext;
     @Autowired
     protected VaadinServletConfigurationProperties configurationProperties;
+    @Autowired
+    protected UiProperties uiProperties;
 
     // forward the root of all @SpringUIs to the Vaadin servlet
     @Bean
@@ -282,7 +285,7 @@ protected void addInitParameters(
 
         addInitParameter(servletRegistrationBean,
                 Constants.SERVLET_PARAMETER_PRODUCTION_MODE,
-                String.valueOf(configurationProperties.isProductionMode()));
+                String.valueOf(uiProperties.isProductionMode()));
         addInitParameter(servletRegistrationBean,
                 Constants.SERVLET_PARAMETER_RESOURCE_CACHE_TIME,
                 String.valueOf(configurationProperties.getResourceCacheTime()));

diff --git a/...r/src/main/java/io/jmix/autoconfigure/ui/vaadin/VaadinServletConfigurationProperties.java b/...r/src/main/java/io/jmix/autoconfigure/ui/vaadin/VaadinServletConfigurationProperties.java
@@ -35,11 +35,6 @@ public class VaadinServletConfigurationProperties {
     // special formatting of the field javadoc - see
     // http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#configuration-metadata-annotation-processor
 
-    /**
-     * Whether Vaadin is in production mode.
-     */
-    private boolean productionMode = false;
-
     /**
      * The time resources can be cached in the browser in seconds (default one
      * hour).
@@ -72,10 +67,6 @@ public class VaadinServletConfigurationProperties {
      */
     private String urlMapping = null;
 
-    public boolean isProductionMode() {
-        return productionMode;
-    }
-
     public int getResourceCacheTime() {
         return resourceCacheTime;
     }
@@ -96,10 +87,6 @@ public String getUrlMapping() {
         return urlMapping;
     }
 
-    public void setProductionMode(boolean productionMode) {
-        this.productionMode = productionMode;
-    }
-
     public void setResourceCacheTime(int resourceCacheTime) {
         this.resourceCacheTime = resourceCacheTime;
     }

diff --git a/ui/src/main/java/io/jmix/ui/UiProperties.java b/ui/src/main/java/io/jmix/ui/UiProperties.java
@@ -32,6 +32,10 @@ public class UiProperties {
 
     boolean testMode;
     boolean performanceTestMode;
+
+    /**
+     * Whether application is in production mode
+     */
     boolean productionMode;
 
     /**
@@ -124,7 +128,7 @@ public class UiProperties {
     public UiProperties(
             boolean testMode,
             boolean performanceTestMode,
-            @DefaultValue("true") boolean productionMode,
+            @DefaultValue("false") boolean productionMode,
             @DefaultValue("TABBED") String appWindowMode,
             @DefaultValue("true") boolean compositeMenu,
             @DefaultValue("false") boolean allowAnonymousAccess,
@@ -236,6 +240,9 @@ public long getWebJarResourcesCacheTime() {
         return webJarResourcesCacheTime;
     }
 
+    /**
+     * @see #productionMode
+     */
     public boolean isProductionMode() {
         return productionMode;
     }