diff options
Diffstat (limited to 'sca-java-2.x/contrib/samples/comet-webapp/src/main/java')
8 files changed, 96 insertions, 20 deletions
diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java new file mode 100644 index 0000000000..d7a3bfc744 --- /dev/null +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java @@ -0,0 +1,12 @@ +package org.apache.tuscany.sca.sample.comet; + +import java.util.Date; +import java.util.Random; + +public class Helper { + + public static int randomInt(int max) { + return (new Random(new Date().getTime()).nextInt(100)); + } + +} diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java index faf80f02e0..7b0d63e1b2 100644 --- a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java @@ -1,10 +1,12 @@ package org.apache.tuscany.sca.sample.comet; +import org.apache.tuscany.sca.sample.comet.model.Location; +import org.apache.tuscany.sca.sample.comet.model.Response; import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HumidityService { - String getHumidity(); - + Response getHumidity(Location location); + } diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java index f40b2eb772..a75f549890 100644 --- a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java @@ -1,10 +1,12 @@ package org.apache.tuscany.sca.sample.comet; +import org.apache.tuscany.sca.sample.comet.model.Location; +import org.apache.tuscany.sca.sample.comet.model.Response; import org.oasisopen.sca.annotation.Remotable; @Remotable public interface PrecipitationService { - String getPrecipitation(); + Response getPrecipitation(Location location); } diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java index df24a74080..0a709070c6 100644 --- a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java @@ -1,16 +1,20 @@ 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(PrecipitationService.class) public class PrecipitationServiceImpl implements PrecipitationService { @Override - public String getPrecipitation() { - return (new Random(new Date().getTime()).nextInt(100)) + "%"; + public Response getPrecipitation(Location location) { + Response response = new Response(); + response.setDate(new Date()); + response.setData(Helper.randomInt(100) + "%"); + return response; } } 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; } } diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java index 6a9e30b051..51714786e8 100644 --- a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java @@ -1,12 +1,15 @@ package org.apache.tuscany.sca.sample.comet; +import org.apache.tuscany.sca.sample.comet.model.Location; +import org.apache.tuscany.sca.sample.comet.model.Response; import org.oasisopen.sca.annotation.Remotable; @Remotable public interface TemperatureService { - String getTemperatureCelsius(); - - String getTemperatureFahrenheit(); - + public static final int CELSIUS = 1; + public static final int FAHRENHEIT = 2; + + Response getTemperature(Location location, int scale); + } diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java new file mode 100644 index 0000000000..0eb0d117e1 --- /dev/null +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java @@ -0,0 +1,24 @@ +package org.apache.tuscany.sca.sample.comet.model; + +public class Location { + + private String city; + private String country; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + +} diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java new file mode 100644 index 0000000000..86c03cffdf --- /dev/null +++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java @@ -0,0 +1,26 @@ +package org.apache.tuscany.sca.sample.comet.model; + +import java.util.Date; + +public class Response { + + private Date date; + private String data; + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + +} |