1 files changed, 13 insertions, 10 deletions
diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 1fff4b1dea..b74670178c 100644
--- a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
@@ -1,26 +1,29 @@
 package org.apache.tuscany.sca.sample.comet;
 
 import java.util.Date;
-import java.util.Random;
 
+import org.apache.tuscany.sca.sample.comet.model.Location;
+import org.apache.tuscany.sca.sample.comet.model.Response;
 import org.oasisopen.sca.annotation.Service;
 
 @Service({TemperatureService.class, HumidityService.class})
 public class TemperatureHumidityServiceImpl implements TemperatureService, HumidityService {
 
     @Override
-    public String getHumidity() {
-        return (new Random(new Date().getTime()).nextInt(100)) + "%";
+    public Response getHumidity(Location location) {
+        Response response = new Response();
+        response.setDate(new Date());
+        response.setData(Helper.randomInt(90) + "%");
+        return response;
     }
 
     @Override
-    public String getTemperatureCelsius() {
-        return "" + (new Random(new Date().getTime()).nextInt(40));
-    }
-
-    @Override
-    public String getTemperatureFahrenheit() {
-        return "" + (new Random(new Date().getTime()).nextInt(200));
+    public Response getTemperature(Location location, int scale) {
+        Response response = new Response();
+        response.setDate(new Date());
+        String data = "" + Helper.randomInt(scale == CELSIUS ? 40 : 150);
+        response.setData(data);
+        return response;
     }
 
 }