speed has been increased with preload

Author: Jose Angel Morena

Diff for: .classpath

@@ -23,5 +23,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="C:/Users/jang3/.m2/repository/org/springframework/spring-context/4.3.12.RELEASE/spring-context-4.3.12.RELEASE.jar" sourcepath="C:/Users/jang3/.m2/repository/org/springframework/spring-context/4.3.12.RELEASE/spring-context-4.3.12.RELEASE-sources.jar">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="maven.groupId" value="org.springframework"/>
+			<attribute name="maven.artifactId" value="spring-context"/>
+			<attribute name="maven.version" value="4.3.12.RELEASE"/>
+			<attribute name="maven.scope" value="compile"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Diff for: Configuration.xml

@@ -70,3 +70,4 @@ And last but not least, the configuration for each cluster is defined:
 
 </info>
 
+

Diff for: Configuration2.xml

@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!--
- The aim of this second xml file is to make clear that the configuration is possible to be modified 
- in runtime by executing this rest call: http://localhost/changeXML?configFile=Configuration2.xml
- Then the program takes into account the new configuration, with less clients, more clusters and different weights.
- -->
+<!--
+There is only a single client, "clienteA". Which has 3 different devices, which are managed by different clusters.
+-->
 <info>
-
 <account>
 <type>clienteA</type>
 <targetDevice>XBox</targetDevice>
 <targetDevice>Panasonic</targetDevice>		
 <targetDevice>osmf</targetDevice>	
 </account>
-
-					
+			
 <device>
 <type>XBox</type>
 <pluginVersion>3.3.1</pluginVersion>
@@ -22,7 +18,7 @@
 
 <device>
 <type>Panasonic</type>
-<pluginVersion>3.3.5</pluginVersion>
+<pluginVersion>3.3.2</pluginVersion>
 <pingTime>5</pingTime>		
 </device>
 
@@ -33,27 +29,27 @@
 </device>
 
 <cluster>
-<from>XBox</from>
+<from>Panasonic</from>
 <name>clusterA.com</name>
-<weight>3</weight>
+<weight>5</weight>
 </cluster>
 
 <cluster>
-<from>XBox</from>
+<from>Panasonic</from>
 <name>clusterB.com</name>
-<weight>7</weight>
+<weight>5</weight>
 </cluster>
 
 <cluster>
-<from>XBox</from>
+<from>Panasonic</from>
 <name>clusterC.com</name>
-<weight>7</weight>
+<weight>5</weight>
 </cluster>
 
 <cluster>	
-<from>Panasonic</from>
-<name>clusterA.com</name>
-<weight>1</weight>
+<from>XBox</from>
+<name>clusterB.com</name>
+<weight>10</weight>
 </cluster>
 
 <cluster>	
@@ -65,8 +61,9 @@
 <cluster>	
 <from>osmf</from>
 <name>clusterB.com</name>
-<weight>7</weight>
+<weight>10</weight>
 </cluster>
 
 </info>
 
+

Diff for: README.md

@@ -1,16 +1,21 @@
 package server.server;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.stereotype.Component;
 
+
 /*
  * Programmer: Jose Angel Morena
  * MAIN APPLICATION 
  */
+
 @SpringBootApplication
+@EnableCaching //enables Spring Caching functionality
 public class App {
+	
    public static void main(String[] args) {
       SpringApplication.run(App.class, args);
    }
@@ -23,6 +28,6 @@ public class CustomContainer implements EmbeddedServletContainerCustomizer {
        public void customize(ConfigurableEmbeddedServletContainer configurableEmbeddedServletContainer) {
           configurableEmbeddedServletContainer.setPort(80);
        }
-
    }
+   
 }

Diff for: src/main/java/server/server/App.java

@@ -0,0 +1,59 @@
+package server.server;
+
+import java.util.TreeMap;
+ 
+/* Programmer: Jose Angel Morena
+ * This class encapsulates the information of the configuration to be delivered to the client.
+ * There is a Map to store the clusters because there may be more than one to handle the petition. The structure is a map because
+ * the name of the cluster is associated to its weight. 
+ */
+public class Configuration {
+
+	private Integer totalWeight;
+	/*
+	 * This treemap is here for a single reason. It is needed to decide which cluster is going to be used, given a configuration.
+	 * It is going to be used in the algorithm of the roulette to distribute the load among clusters
+	 */
+	private TreeMap<Integer, String> clusters= new TreeMap<Integer, String>();
+	private String pingTime;
+
+	
+	public Configuration() {
+		//this.code= UUID.randomUUID().toString();; //generate unique code
+	}
+
+	public TreeMap<Integer, String> getClusters() {
+		return clusters;
+	}
+/*
+	public void addCluster(String cluster, int weight) {
+		clusters.put(cluster, weight);
+	}
+	
+	public void setClusters(TreeMap<String, Integer> clusters) {
+		this.clusters = clusters;
+	}
+*/
+	public String getPingTime() {
+		return pingTime;
+	}
+
+	public void setPingTime(String pingTime) {
+		this.pingTime = pingTime;
+	}
+
+	public String toString() {
+		return  "; pingTime: " + this.pingTime + "; clusters: " + this.clusters;
+		
+	}
+
+	public Integer getTotalWeight() {
+		return totalWeight;
+	}
+
+	public void setTotalWeight(Integer totalWeight) {
+		this.totalWeight = totalWeight;
+	}
+
+	
+}

Diff for: src/main/java/server/server/Configuracio.java

@@ -1,9 +1,9 @@
 package server.server;
 
 import java.io.File;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.Random;
-import java.util.TreeMap;
+import java.util.UUID;
 
 import org.springframework.boot.autoconfigure.web.ErrorController;
 import org.springframework.http.HttpStatus;
@@ -21,10 +21,24 @@
  */
 @RestController
 public class ServiceController implements ErrorController { 
-	/*
-	 * filename of configuration file
+		
+	private Random seed = new Random();//random generator
+	
+	/*This attribute is going to store all of the configuration. Its aim is to provide a preload because this way
+	 * the access to the data is going to be much quicker in the rest call
+	 * 
+	 * I assumed per each technology there is a single version to avoid a one more hash entrance.
 	 */
-	private String configFile="Configuration.xml";
+	private Map<String,Map<String,Configuration>> info;
+
+	private String configFile="Configuration.xml";	//filename of configuration file
+	
+	//un cliente tiene varias plataformas
+	//una plataforma UN UNICO PLUGIN, 
+	//plataforma y plugin sera la clave para entrar en PING TIME Y TREEMAP DE SERVERS
+	public ServiceController() {	
+		info = XMLHandler.returnInfo(this.configFile); //extract data considering the xml configuration
+	}
 
 	public String getConfigFile() {
 		return configFile;
@@ -38,14 +52,16 @@ public void setConfigFile(String configFile) {
 	 * url example:
 	 * http://localhost/changeXML?configFile=Configuration.xml
 	 * http://localhost/changeXML?configFile=Configuration2.xml
+	 * 
+	 * It is possible to modify the current xml configuration file and then by using the rest call reload that new configuration
 	 */
 	@RequestMapping(value = "/changeXML",params= {"configFile"},method = RequestMethod.GET)
 	public ResponseEntity<?> updateConfigFile(@RequestParam("configFile") String file) { 
 
 		File f = new File(file);
-		System.out.println(f);
 		if(f.exists() && !f.isDirectory()) { //file is updated if and only if it exisits 
-			this.configFile=file;	
+			this.configFile=file;
+			info = XMLHandler.returnInfo(this.configFile); //extract data considering the xml configuration
 			return new ResponseEntity<String>("XML configuration file has been updated to: "+file, HttpStatus.OK);
 	    }
 		//otherwise path is not going to be updated    
@@ -61,6 +77,11 @@ public ResponseEntity<?> updateConfigFile(@RequestParam("configFile") String fil
 	* Afterwards, the cluster is chosen by the algorithm.
 	* Eventually the xml is returned.
 	*    
+	*    
+	*    The return, chooses a random cluster following a uniform distribution, the reason behind is to distribute more uniformly 
+			 the chosen cluster according to the clusters of that technology
+	*    
+	*    	  	 
     * url example:
     * http://localhost/getData?accountCode=clienteA&targetDevice=XBox&pluginVersion=3.3.1 
     */
@@ -71,43 +92,16 @@ public ResponseEntity<?> updateConfigFile(@RequestParam("configFile") String fil
 			headers = "Accept=application/xml",
 			method = RequestMethod.GET)
 	public @ResponseBody ResponseEntity<?> platformPetition(@RequestParam("accountCode") String accountCode, @RequestParam("targetDevice") String targetDevice, @RequestParam("pluginVersion") String pluginVersion ) {
-	   
-		Configuracio config= XMLHandler.check_configuration(accountCode,targetDevice,pluginVersion,this.configFile); //extract data considering the xml configuration
-		
-		if (config==null) return new ResponseEntity<String>("",HttpStatus.OK);
-		
-		String cluster=chooseCluster(config);
-	    return new ResponseEntity<q>(new q(cluster,String.valueOf(config.getPingTime()),config.getCode()), HttpStatus.OK);
+		try {
+			Configuration config = info.get(accountCode).get(targetDevice+pluginVersion);
+			return new ResponseEntity<q>(new q(config.getClusters().ceilingEntry(new Random().nextInt(config.getTotalWeight()))
+					.getValue(),config.getPingTime(),new UUID(this.seed.nextLong(), this.seed.nextLong()).toString()), HttpStatus.OK);			
+		}
+		catch (Exception e) {
+			return null;
+        }
 	}
-
 
-	/*
-	 * This methods decides statistically which cluster is to be returned.  
-	 * Roulette wheel selection algorithm  	 
-	 * There is a list of clusters stored in a structure. Then a random number is chosen between 0 and
-	 * the sum of all the weights. This random number is generated with an uniform distribution.
-	 * Search in the cluster list for the first server for which the sum of weights for all servers up 
-	 * to and including this cluster is more than the random value.
-	 *  
-	 * I decided to use this method for three reasons:
-	 * 	- Firstly, if the xml is modified in run time, the frequency of selections is going to be according 
-	 * 	  to the xml configuration. Also if some other clusters are added, these will be taken into consideration.
-	 *  - Secondly, this approach allows to not count the number of requests processed in order to decide which cluster to return.
-	 *  - Last but not least, I believe it to be a good way to distribute the load among the clusters.   
-	 */
-	public String chooseCluster(Configuracio config) {
-	    TreeMap<Integer, String> pool= new TreeMap<Integer, String>();
-	    Integer totalWeight=0;
-	    for ( Entry<String, Integer> entry : config.getClusters().entrySet() ) {
-	        totalWeight += entry.getValue();
-	        pool.put(totalWeight, entry.getKey());	//associate each server with the sum of the weights so far
-	    }	    
-	    
-	    int rnd = new Random().nextInt(totalWeight);
-	    
-	    return pool.ceilingEntry(rnd).getValue();
-	}
-
 	/*
 	 * error handler
 	 */