Merge pull request #22 from groupdocs-viewer/fix-config-hostaddress

added hostAddress config into application configuration

Author: koleslena

README.md

@@ -90,7 +90,7 @@ Use [docker](https://www.docker.com/) image.
 ```bash
 mkdir DocumentSamples
 mkdir Licenses
-docker run -p 8080:8080 -v `pwd`/DocumentSamples:/home/groupdocs/app/DocumentSamples -v `pwd`/Licenses:/home/groupdocs/app/Licenses groupdocs/viewer-for-java-spring
+docker run -p 8080:8080 --env application.hostAddress=localhost -v `pwd`/DocumentSamples:/home/groupdocs/app/DocumentSamples -v `pwd`/Licenses:/home/groupdocs/app/Licenses groupdocs/viewer-for-java-spring
 ## Open http://localhost:8080/viewer/ in your favorite browser.
 ```
 

configuration.yml

@@ -14,7 +14,9 @@ server:
 application:
   # License path
   # Absolute or relative path to GroupDocs license file
-  licensePath: 
+  licensePath:
+  # Host name or ip for server instance
+  hostAddress:
 
 ################################################
 # Common configurations

src/main/java/com/groupdocs/ui/config/ApplicationConfiguration.java

@@ -1,25 +1,49 @@
 package com.groupdocs.ui.config;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.PostConstruct;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 import static com.groupdocs.ui.config.DefaultDirectories.defaultLicenseDirectory;
 import static com.groupdocs.ui.config.DefaultDirectories.relativePathToAbsolute;
 
 @Component
 public class ApplicationConfiguration {
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationConfiguration.class);
 
+    @Value("${application.hostAddress}")
+    private String hostAddress;
     @Value("${application.licensePath}")
     private String licensePath;
 
     @PostConstruct
     public void init() {
+        if (StringUtils.isEmpty(hostAddress)) {
+            try {
+                hostAddress = InetAddress.getLocalHost().getHostAddress();
+            } catch (UnknownHostException e) {
+                logger.error("Can not get host address ", e);
+                hostAddress = "localhost";
+            }
+        }
         this.licensePath = StringUtils.isEmpty(this.licensePath) ? defaultLicenseDirectory() : relativePathToAbsolute(this.licensePath);
     }
 
+    public String getHostAddress() {
+        return hostAddress;
+    }
+
+    public void setHostAddress(String hostAddress) {
+        this.hostAddress = hostAddress;
+    }
+
     public String getLicensePath() {
         return licensePath;
     }
@@ -32,6 +56,7 @@ public void setLicensePath(String licensePath) {
     public String toString() {
         return "ApplicationConfiguration{" +
                 "licensePath='" + licensePath + '\'' +
+                ", hostAddress='" + hostAddress + '\'' +
                 '}';
     }
 }

src/main/java/com/groupdocs/ui/config/ServerConfiguration.java

@@ -5,29 +5,14 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 @Component
 public class ServerConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(ServerConfiguration.class);
 
     private Integer httpPort;
-    private String hostAddress;
     @Value("#{servletContext.contextPath}")
     private String applicationContextPath;
 
-    @PostConstruct
-    public void init() {
-        try {
-            hostAddress = InetAddress.getLocalHost().getHostAddress();
-        } catch (UnknownHostException e) {
-            logger.error("Can not get host address ", e);
-            hostAddress = "localhost";
-        }
-    }
-
     public Integer getHttpPort() {
         return httpPort;
     }
@@ -36,14 +21,6 @@ public void setHttpPort(Integer httpPort) {
         this.httpPort = httpPort;
     }
 
-    public String getHostAddress() {
-        return hostAddress;
-    }
-
-    public void setHostAddress(String hostAddress) {
-        this.hostAddress = hostAddress;
-    }
-
     public String getApplicationContextPath() {
         return applicationContextPath;
     }
@@ -56,7 +33,6 @@ public void setApplicationContextPath(String applicationContextPath) {
     public String toString() {
         return "ServerConfiguration{" +
                 "httpPort=" + httpPort +
-                ", hostAddress='" + hostAddress + '\'' +
                 ", applicationContextPath='" + applicationContextPath + '\'' +
                 '}';
     }

src/main/resources/defaultConfiguration.yml

@@ -14,7 +14,9 @@ server:
 application:
   # License path
   # Absolute or relative path to GroupDocs license file
-  licensePath: 
+  licensePath:
+  # Host name or ip for server instance
+  hostAddress:
 
 ################################################
 # Common configurations

src/main/resources/templates/viewer.html

@@ -19,7 +19,7 @@
     /*<![CDATA[*/
     $('#element').viewer({
         /*[+
-        applicationPath: 'http://' + [[${globalConfiguration.server.hostAddress}]] + ':' + [[${globalConfiguration.server.httpPort}]] + [[${globalConfiguration.server.applicationContextPath}]] + '/viewer',
+        applicationPath: 'http://' + [[${globalConfiguration.application.hostAddress}]] + ':' + [[${globalConfiguration.server.httpPort}]] + [[${globalConfiguration.server.applicationContextPath}]] + '/viewer',
         +]*/
         defaultDocument: /*[[${viewerConfiguration.defaultDocument}]]*/'',
         htmlMode: /*[[${viewerConfiguration.htmlMode}]]*/'',