From 9cec9827863fd581b7fd4150308a31fc12a1b637 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 4 Apr 2017 14:55:17 +0000
Subject: [PATCH] Code review

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/resource-registry-handlers@146560 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../handler/resourceregistry/Constants.java   | 11 ++----
 .../resourceregistry/EServiceManager.java     | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java
index 83a6d37..f74e6df 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java
@@ -5,24 +5,18 @@ import org.gcube.informationsystem.model.entity.resource.HostingNode;
 
 /**
  * Library-wide constants.
- * 
- * 
- * @author Fabio Simeoni
- *
+ * @author Luca Frosini
+ * @author Lucio Lelii
  */
 public class Constants {
 
-	
 	public static final String HOSTING_NODE_PROPERTY = HostingNode.NAME;
 	
-	
 	/**
 	 * The configuration name of {@link EServiceManager} and {@link HostingNodeManager}.
 	 */
 	public static final String RESOURCE_MANAGEMENT = "resource-management";
 	
-	
-	
 	/**
 	 * The name of the context property that contains the EService Resource.
 	 */
@@ -31,4 +25,5 @@ public class Constants {
 	public static final long default_container_publication_frequency_in_seconds = 60;
 	
 	public static final int application_republish_frequency_in_minutes = 20;
+	
 }
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
index 0d0ae8f..79f93fd 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
@@ -597,6 +597,24 @@ public class EServiceManager extends ApplicationLifecycleHandler {
 
 	}
 
+	private static String getBaseAddress(ApplicationContext context){
+		ApplicationConfiguration configuration = context.configuration();
+		ContainerConfiguration container = context.container().configuration();
+		String baseAddress;
+		if (configuration.proxied()){
+			String protocol = container.proxyAddress().secure()? "https://": "http://";
+			int port = container.proxyAddress().port();
+
+			baseAddress=String.format("%s%s:%d%s", protocol , container.proxyAddress().hostname(), port, context.application().getContextPath());
+		} else {
+			String protocol = configuration.secure()? "https://": "http://";
+			int port = configuration.secure()?container.securePort(): container.port();
+
+			baseAddress=String.format("%s%s:%d%s", protocol , container.hostname(), port, context.application().getContextPath());
+		}
+		return baseAddress;
+	}
+	
 	private EService instantiateEService() {
 		logger.info("Creating EService for {}", applicationContext.name());
 
@@ -618,21 +636,7 @@ public class EServiceManager extends ApplicationLifecycleHandler {
 				eService, softwareFacet, null);
 		eService.addFacet(isIdentifiedBy);
 
-		ApplicationConfiguration configuration = applicationContext.configuration();
-		ContainerConfiguration container = applicationContext.container().configuration();
-		
-		String baseAddress;
-		if (configuration.proxied()){
-			String protocol = container.proxyAddress().secure()? "https://": "http://";
-			int port = container.proxyAddress().port();
-			baseAddress=String.format("%s%s:%d%s", protocol , container.proxyAddress().hostname(), port,applicationContext.application().getContextPath());
-		} else {
-			String protocol = configuration.secure()? "https://": "http://";
-			int port = configuration.secure()?container.securePort(): container.port();
-			baseAddress=String.format("%s%s:%d%s", protocol , container.hostname(), port,applicationContext.application().getContextPath());
-		}
-				
-		
+		String baseAddress = EServiceManager.getBaseAddress(applicationContext);
 		for (ServletRegistration servlet : applicationContext.application()
 				.getServletRegistrations().values()) {
 			if (!servletExcludes.contains(servlet.getName())) {