Cors Change

Techolution · Mar 22, 2018 · a6059d0 · a6059d0
1 parent 5305f7a
commit a6059d0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/...ava/com/techolution/mauritius/smartwater/connection/controller/ConnectDataController.java b/...ava/com/techolution/mauritius/smartwater/connection/controller/ConnectDataController.java
@@ -12,12 +12,15 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.CrossOrigin;
+
 
 import com.techolution.mauritius.smartwater.connection.domain.Dfj;
 import com.techolution.mauritius.smartwater.connection.domain.ResponseData;
 import com.techolution.mauritius.smartwater.connection.domain.Telemetry;
 import com.techolution.mauritius.smartwater.connection.service.ConnectionStatisticsService;
 
+@CrossOrigin(origins = {"*"})
 @RestController
 @RequestMapping(value="/insert")
 public class ConnectDataController {

diff --git a/...echolution/mauritius/smartwater/connection/controller/ConnectionStatisticsController.java b/...echolution/mauritius/smartwater/connection/controller/ConnectionStatisticsController.java
@@ -8,6 +8,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@
 import com.techolution.mauritius.smartwater.connection.domain.ResponseData;
 import com.techolution.mauritius.smartwater.connection.service.ConnectionStatisticsService;
 
+@CrossOrigin(origins = {"*"})
 @RestController
 @RequestMapping(value="/read")
 

diff --git a/...in/java/com/techolution/mauritius/smartwater/controller/ConnectionMetaDataController.java b/...in/java/com/techolution/mauritius/smartwater/controller/ConnectionMetaDataController.java
@@ -7,6 +7,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,7 @@
 import com.techolution.mauritius.smartwater.domain.ResponseData;
 import com.techolution.mauritius.smartwater.service.ConsolidatedDataService;
 
+@CrossOrigin(origins = {"*"})
 @RestController
 @RequestMapping(value="/read")
 

diff --git a/...main/java/com/techolution/mauritius/smartwater/controller/ConsolidatedDataController.java b/...main/java/com/techolution/mauritius/smartwater/controller/ConsolidatedDataController.java
@@ -8,6 +8,7 @@
 import org.apache.http.client.ClientProtocolException;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -17,7 +18,7 @@
 import com.techolution.mauritius.smartwater.domain.TotalConsolidatedConsumption;
 import com.techolution.mauritius.smartwater.domain.TotalConsolidatedDeviceStatus;
 import com.techolution.mauritius.smartwater.service.ConsolidatedDataService;
-
+@CrossOrigin(origins = {"*"})
 @RestController
 @RequestMapping(value="/consolidateddata")
 

diff --git a/...s/src/main/java/com/techolution/mauritius/smartwater/service/ConsolidatedDataService.java b/...s/src/main/java/com/techolution/mauritius/smartwater/service/ConsolidatedDataService.java
@@ -39,14 +39,16 @@ public class ConsolidatedDataService {
 	public List<MeterConnection> getAllConnections(){
 
 		log.info("Entering ConsolidatedDataService.getAllConnections ");
-		List returnList= (List)connectionDetailsRepository.findAll();
+		List<MeterConnection> returnList= (List)connectionDetailsRepository.findAll();
 		log.info("Exiting ConsolidatedDataService.getAllConnections ");
 		if(returnList == null) {
 			log.debug("returnList size is null");
 		}else{
 			log.debug("List size is:"+returnList.size());	
 		}
 
+
+
 		return returnList;
 	}
 
@@ -123,6 +125,9 @@ public TotalConsolidatedConsumption getConsumptionForToday() throws ClientProtoc
 		return consolidatedConsumption;
 
 	}
+
+
+
 
 	public TotalConsolidatedDeviceStatus getDeviceStatusForThisMonth() throws ClientProtocolException, IOException, JSONException{
 

diff --git a/.../src/main/java/com/techolution/mauritius/smartwater/map/controller/MapDataController.java b/.../src/main/java/com/techolution/mauritius/smartwater/map/controller/MapDataController.java
@@ -7,6 +7,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +20,7 @@
 import com.techolution.mauritius.smartwater.domain.ResponseData;
 import com.techolution.mauritius.smartwater.map.service.MapDataService;
 
-
+@CrossOrigin(origins = {"*"})
 @RestController
 @RequestMapping(value="/map")