X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FIPDataController.java;fp=server%2Fcompbio%2Fcontrollers%2FIPDataController.java;h=d66b7cc695546db2d8a46acb09d2d2befee15f51;hb=6823d2f36ff55b7ab11d674e3fe4d04dc57d6bbf;hp=86f752ebc5f988347d573a8ae3b49538864b8002;hpb=6ccd0c1414766d7ffa84f6594a9a14d50c5053b8;p=proteocache.git

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index 86f752e..d66b7cc 100644
--- a/server/compbio/controllers/IPDataController.java
+++ b/server/compbio/controllers/IPDataController.java
@@ -8,8 +8,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import compbio.cassandra.TotalByCounterBean;
-import compbio.cassandra.UserBean;
+import compbio.beans.TotalByCounterBean;
+import compbio.beans.UserBean;
+import compbio.cassandra.readers.IpReader;
+import compbio.cassandra.readers.ReaderByCounter;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -59,8 +61,8 @@ public class IPDataController extends BasicController {
 		}
 
 		final long startTime = System.currentTimeMillis();
-		CassandraRequester cr = new CassandraRequester();
-		List<TotalByCounterBean> r = cr.readIpByCounter(realcounter);
+		ReaderByCounter reader = new ReaderByCounter();
+		List<TotalByCounterBean> r = reader.readIpByCounter(realcounter);
 		model.put("results", r);
 		model.put("njobs", 0);
 		String csvline = "";
@@ -83,8 +85,8 @@ public class IPDataController extends BasicController {
 	public String findIP(@RequestParam("ip") String ip, Map<String, Object> model) {
 		model.put("username", getPrincipalName());
 		final long startTime = System.currentTimeMillis();
-		CassandraRequester cr = new CassandraRequester();
-		UserBean r = cr.readIp(ip);
+		IpReader reader = new IpReader();
+		UserBean r = reader.readIp(ip);
 		model.put("results", r);
 		model.put("njobs", 0);
 		if (null != r) {