From 681281e772614282c8d6e07ee1e3b5ec9ca3faf3 Mon Sep 17 00:00:00 2001 From: Inderjeet Singh Date: Tue, 2 Nov 2010 17:16:01 +0000 Subject: [PATCH] Moved the classes to create procedural web-services into a procedural package. Moved IdTypeAdapter as an inner class of Id (Id.GsonTypeAdapter). Created a internal.util package to keep commonly used classes such as Preconditions. made common base classes such as ParamMap, ContentBody public. --- .../gson/webservice/client/QueueConsumer.java | 4 +- .../gson/webservice/client/QueueEntry.java | 4 +- .../gson/webservice/client/RequestSender.java | 4 +- .../webservice/client/ResponseCallback.java | 6 +- .../webservice/client/ResponseReceiver.java | 8 +-- .../webservice/client/WebServiceClient.java | 10 ++-- .../client/WebServiceClientAsync.java | 4 +- .../webservice/definition/ContentBody.java | 5 +- .../definition/ContentBodySpec.java | 1 + .../gson/webservice/definition/HeaderMap.java | 1 + .../webservice/definition/HeaderMapSpec.java | 1 + .../gson/webservice/definition/ParamMap.java | 4 +- .../webservice/definition/ParamMapSpec.java | 1 + .../gson/webservice/definition/TypedKey.java | 2 + .../definition/WebServiceAppException.java | 37 ------------- .../definition/WebServiceSystemException.java | 5 +- .../{ => internal/utils}/Preconditions.java | 4 +- .../{ => procedural}/RequestBody.java | 9 ++- .../procedural}/RequestBodyGsonConverter.java | 4 +- .../{ => procedural}/RequestBodySpec.java | 5 +- .../{ => procedural}/RequestSpec.java | 5 +- .../{ => procedural}/ResponseBody.java | 8 ++- .../ResponseBodyGsonConverter.java | 4 +- .../{ => procedural}/ResponseBodySpec.java | 4 +- .../{ => procedural}/ResponseSpec.java | 5 +- .../{ => procedural}/WebServiceCall.java | 3 +- .../{ => procedural}/WebServiceCallSpec.java | 9 ++- .../{ => procedural}/WebServiceRequest.java | 7 ++- .../{ => procedural}/WebServiceResponse.java | 5 +- .../{ => procedural}/WebServiceSpec.java | 4 +- .../gson/webservice/definition/rest/Id.java | 37 +++++++++++++ .../definition/rest/Preconditions.java | 31 ----------- .../definition/rest/ResourceMap.java | 5 +- .../definition/rest/RestCallSpec.java | 11 ++-- .../definition/rest/RestRequest.java | 12 ++-- .../typeadapters/IdTypeAdapter.java | 55 ------------------- .../rest}/IdTypeAdapterTest.java | 4 +- .../gson/example/client/ExampleClient.java | 8 +-- .../example/service/SampleJsonService.java | 2 +- .../gson/wsexample/server/MainServlet.java | 18 +++--- .../wsf/inject/RequestBodySpecProvider.java | 4 +- .../gson/wsf/inject/RequestSpecProvider.java | 4 +- .../inject/WebServiceCallSpecProvider.java | 4 +- .../server/WebServiceCallServerProvider.java | 8 +-- .../gson/wsf/server/RequestReceiver.java | 8 +-- .../gson/wsf/server/ResponseBuilder.java | 6 +- .../gson/wsf/server/ResponseSender.java | 4 +- .../server/WebServiceCallServerBuilder.java | 6 +- 48 files changed, 178 insertions(+), 222 deletions(-) delete mode 100644 wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceAppException.java rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => internal/utils}/Preconditions.java (89%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/RequestBody.java (84%) rename wsdef/src/main/java/com/google/gson/webservice/{typeadapters => definition/procedural}/RequestBodyGsonConverter.java (93%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/RequestBodySpec.java (91%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/RequestSpec.java (87%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/ResponseBody.java (85%) rename wsdef/src/main/java/com/google/gson/webservice/{typeadapters => definition/procedural}/ResponseBodyGsonConverter.java (93%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/ResponseBodySpec.java (91%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/ResponseSpec.java (87%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/WebServiceCall.java (92%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/WebServiceCallSpec.java (90%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/WebServiceRequest.java (84%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/WebServiceResponse.java (91%) rename wsdef/src/main/java/com/google/gson/webservice/definition/{ => procedural}/WebServiceSpec.java (85%) delete mode 100644 wsdef/src/main/java/com/google/gson/webservice/definition/rest/Preconditions.java delete mode 100644 wsdef/src/main/java/com/google/gson/webservice/typeadapters/IdTypeAdapter.java rename wsdef/src/test/java/com/google/gson/webservice/{typeadapters => definition/rest}/IdTypeAdapterTest.java (94%) diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/QueueConsumer.java b/wsclient/src/main/java/com/google/gson/webservice/client/QueueConsumer.java index fe50883b..350cc57e 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/QueueConsumer.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/QueueConsumer.java @@ -17,9 +17,9 @@ package com.google.gson.webservice.client; import java.util.concurrent.BlockingQueue; -import com.google.gson.webservice.definition.WebServiceCall; -import com.google.gson.webservice.definition.WebServiceResponse; import com.google.gson.webservice.definition.WebServiceSystemException; +import com.google.gson.webservice.definition.procedural.WebServiceCall; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; /** * A consumer that executes in its own thread consuming queue entries and invoking web-service calls diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/QueueEntry.java b/wsclient/src/main/java/com/google/gson/webservice/client/QueueEntry.java index 01ca4c80..42789728 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/QueueEntry.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/QueueEntry.java @@ -15,8 +15,8 @@ */ package com.google.gson.webservice.client; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; /** * A holder class for an entry stored in queue. It contains references to the request, callspec, diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java b/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java index b9f8d9a9..29897c07 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java @@ -25,9 +25,9 @@ import java.util.logging.Logger; import com.google.gson.Gson; import com.google.gson.webservice.definition.HeaderMap; import com.google.gson.webservice.definition.HeaderMapSpec; -import com.google.gson.webservice.definition.RequestBody; -import com.google.gson.webservice.definition.WebServiceRequest; import com.google.gson.webservice.definition.WebServiceSystemException; +import com.google.gson.webservice.definition.procedural.RequestBody; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; /** * Class to send Web service requests on a {@link HttpURLConnection}. diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/ResponseCallback.java b/wsclient/src/main/java/com/google/gson/webservice/client/ResponseCallback.java index 61989694..97262eed 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/ResponseCallback.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/ResponseCallback.java @@ -15,10 +15,10 @@ */ package com.google.gson.webservice.client; -import com.google.gson.webservice.definition.WebServiceCall; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; import com.google.gson.webservice.definition.WebServiceSystemException; +import com.google.gson.webservice.definition.procedural.WebServiceCall; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; /** * A client-supplied callback to be used with {@link WebServiceClientAsync}. When a web-service diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/ResponseReceiver.java b/wsclient/src/main/java/com/google/gson/webservice/client/ResponseReceiver.java index b25abb4e..6450a642 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/ResponseReceiver.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/ResponseReceiver.java @@ -28,11 +28,11 @@ import java.util.logging.Logger; import com.google.gson.Gson; import com.google.gson.webservice.definition.HeaderMap; import com.google.gson.webservice.definition.HeaderMapSpec; -import com.google.gson.webservice.definition.ResponseBody; -import com.google.gson.webservice.definition.ResponseBodySpec; -import com.google.gson.webservice.definition.ResponseSpec; -import com.google.gson.webservice.definition.WebServiceResponse; import com.google.gson.webservice.definition.WebServiceSystemException; +import com.google.gson.webservice.definition.procedural.ResponseBody; +import com.google.gson.webservice.definition.procedural.ResponseBodySpec; +import com.google.gson.webservice.definition.procedural.ResponseSpec; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; /** * Receives a response coming on an {@link HttpURLConnection}. diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClient.java b/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClient.java index ebe654e6..db21076b 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClient.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClient.java @@ -24,12 +24,12 @@ import java.util.logging.Logger; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.webservice.definition.ResponseBody; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; -import com.google.gson.webservice.definition.WebServiceResponse; import com.google.gson.webservice.definition.WebServiceSystemException; -import com.google.gson.webservice.typeadapters.ResponseBodyGsonConverter; +import com.google.gson.webservice.definition.procedural.ResponseBody; +import com.google.gson.webservice.definition.procedural.ResponseBodyGsonConverter; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; /** * Main class used by clients to access a Gson Web service. diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClientAsync.java b/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClientAsync.java index 7c413cbf..fabcd050 100644 --- a/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClientAsync.java +++ b/wsclient/src/main/java/com/google/gson/webservice/client/WebServiceClientAsync.java @@ -19,9 +19,9 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; import com.google.gson.webservice.definition.WebServiceSystemException; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; /** * A client for invoking a JSON-based Web-service in an asynchronous manner. The call is queued, diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBody.java b/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBody.java index d1dd6a75..7875c168 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBody.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBody.java @@ -15,6 +15,7 @@ */ package com.google.gson.webservice.definition; + import java.util.Map; /** @@ -24,9 +25,9 @@ import java.util.Map; * * @author inder */ -class ContentBody extends ParamMap { +public class ContentBody extends ParamMap { - ContentBody(ContentBodySpec spec, Map contents) { + public ContentBody(ContentBodySpec spec, Map contents) { super(spec, contents); } diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBodySpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBodySpec.java index c3897178..acbb89c8 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBodySpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/ContentBodySpec.java @@ -15,6 +15,7 @@ */ package com.google.gson.webservice.definition; + import java.lang.reflect.Type; import java.util.Collections; import java.util.Map; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMap.java b/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMap.java index fe4e5c9d..922e047e 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMap.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMap.java @@ -15,6 +15,7 @@ */ package com.google.gson.webservice.definition; + import java.lang.reflect.Type; import java.util.Map; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMapSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMapSpec.java index 24b401c7..a4ad9cfa 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMapSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/HeaderMapSpec.java @@ -15,6 +15,7 @@ */ package com.google.gson.webservice.definition; + import java.lang.reflect.Type; import java.util.LinkedHashMap; import java.util.Map; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMap.java b/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMap.java index ce73330d..2f25bcfa 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMap.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMap.java @@ -15,12 +15,14 @@ */ package com.google.gson.webservice.definition; +import com.google.gson.webservice.definition.internal.utils.Preconditions; + import java.lang.reflect.Type; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -class ParamMap { +public class ParamMap { public static class Builder { protected final Map contents = new LinkedHashMap(); diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMapSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMapSpec.java index c85cff7b..447be9d7 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMapSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/ParamMapSpec.java @@ -15,6 +15,7 @@ */ package com.google.gson.webservice.definition; + import java.lang.reflect.Type; import java.util.Map; import java.util.Set; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/TypedKey.java b/wsdef/src/main/java/com/google/gson/webservice/definition/TypedKey.java index baa43a15..fd46576f 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/TypedKey.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/TypedKey.java @@ -15,6 +15,8 @@ */ package com.google.gson.webservice.definition; +import com.google.gson.webservice.definition.internal.utils.Preconditions; + /** * A typed key for use in a {@link ParamMap} or a {@link ParamMapSpec}. * diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceAppException.java b/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceAppException.java deleted file mode 100644 index a6552202..00000000 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceAppException.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.gson.webservice.definition; - -/** - * Base class for exceptions thrown to indicate a Web service external or application error - * condition. This can happen due to bad input, or illegal sequence of operations. This should - * never be thrown to indicate a System error condition. For that purpose, use - * {@link WebServiceSystemException} instead. - * - * @author inder - */ -public class WebServiceAppException extends RuntimeException { - - private static final long serialVersionUID = 4422041697108937041L; - - public WebServiceAppException(Exception cause) { - super(cause); - } - - public WebServiceAppException(String msg, Exception cause) { - super(msg, cause); - } -} diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSystemException.java b/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSystemException.java index 76a70d7b..88ee3c04 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSystemException.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSystemException.java @@ -17,9 +17,8 @@ package com.google.gson.webservice.definition; /** * Base class for all exceptions thrown by the Web service to indicate a system error condition. - * This should never be thrown to indicate bad user input. For that purpose, use - * {@link WebServiceAppException}. - * + * This should never be thrown to indicate bad user input. + * * @author inder */ public class WebServiceSystemException extends RuntimeException { diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/Preconditions.java b/wsdef/src/main/java/com/google/gson/webservice/definition/internal/utils/Preconditions.java similarity index 89% rename from wsdef/src/main/java/com/google/gson/webservice/definition/Preconditions.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/internal/utils/Preconditions.java index 2ace6468..547f79bd 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/Preconditions.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/internal/utils/Preconditions.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.internal.utils; -final class Preconditions { +public final class Preconditions { public static void checkArgument(boolean condition) { if (!condition) { diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/RequestBody.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBody.java similarity index 84% rename from wsdef/src/main/java/com/google/gson/webservice/definition/RequestBody.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBody.java index 2c24f1aa..44a0c82f 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/RequestBody.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBody.java @@ -13,7 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.ContentBody; +import com.google.gson.webservice.definition.ParamMap; +import com.google.gson.webservice.definition.TypedKey; +import com.google.gson.webservice.definition.ParamMap.Builder; import java.lang.reflect.Type; import java.util.Map; @@ -24,7 +29,7 @@ import java.util.Map; * {@link java.net.HttpURLConnection#getOutputStream()}) , and is read by the * javax.servlet.http.HttpServletRequest#getInputStream(). * This class omits the default constructor for use by Gson. Instead the user must use - * {@link com.google.gson.webservice.typeadapters.RequestBodyGsonConverter} + * {@link com.google.gson.webservice.definition.procedural.RequestBodyGsonConverter} * * @author inder */ diff --git a/wsdef/src/main/java/com/google/gson/webservice/typeadapters/RequestBodyGsonConverter.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBodyGsonConverter.java similarity index 93% rename from wsdef/src/main/java/com/google/gson/webservice/typeadapters/RequestBodyGsonConverter.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBodyGsonConverter.java index 436d2875..f817617e 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/typeadapters/RequestBodyGsonConverter.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBodyGsonConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.typeadapters; +package com.google.gson.webservice.definition.procedural; import java.lang.reflect.Type; import java.util.Map; @@ -26,8 +26,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.google.gson.webservice.definition.RequestBody; -import com.google.gson.webservice.definition.RequestBodySpec; /** * Gson type adapter for {@link RequestBody}. diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/RequestBodySpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBodySpec.java similarity index 91% rename from wsdef/src/main/java/com/google/gson/webservice/definition/RequestBodySpec.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBodySpec.java index 8fb1950f..6f835fcc 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/RequestBodySpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestBodySpec.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + + +import com.google.gson.webservice.definition.ContentBodySpec; import java.lang.reflect.Type; import java.util.LinkedHashMap; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/RequestSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestSpec.java similarity index 87% rename from wsdef/src/main/java/com/google/gson/webservice/definition/RequestSpec.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestSpec.java index 8c49b892..3520cc86 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/RequestSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/RequestSpec.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.HeaderMapSpec; +import com.google.gson.webservice.definition.internal.utils.Preconditions; /** * Specification for a {@link WebServiceRequest}. diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ResponseBody.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBody.java similarity index 85% rename from wsdef/src/main/java/com/google/gson/webservice/definition/ResponseBody.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBody.java index 3a664ff7..5a0f4bb3 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ResponseBody.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBody.java @@ -13,7 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.ContentBody; +import com.google.gson.webservice.definition.ParamMap; +import com.google.gson.webservice.definition.TypedKey; import java.lang.reflect.Type; import java.util.Map; @@ -21,7 +25,7 @@ import java.util.Map; /** * body of the response. This is written out as JSON to be sent out to the client. * This class omits the default constructor for use by Gson. Instead the user must use - * {@link com.google.gson.webservice.typeadapters.ResponseBodyGsonConverter} + * {@link com.google.gson.webservice.definition.procedural.ResponseBodyGsonConverter} * * @author inder */ diff --git a/wsdef/src/main/java/com/google/gson/webservice/typeadapters/ResponseBodyGsonConverter.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBodyGsonConverter.java similarity index 93% rename from wsdef/src/main/java/com/google/gson/webservice/typeadapters/ResponseBodyGsonConverter.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBodyGsonConverter.java index bf613718..ccdb25e1 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/typeadapters/ResponseBodyGsonConverter.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBodyGsonConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.typeadapters; +package com.google.gson.webservice.definition.procedural; import java.lang.reflect.Type; import java.util.Map; @@ -26,8 +26,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.google.gson.webservice.definition.ResponseBody; -import com.google.gson.webservice.definition.ResponseBodySpec; /** * Gson type adapter for {@link ResponseBody}. diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ResponseBodySpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBodySpec.java similarity index 91% rename from wsdef/src/main/java/com/google/gson/webservice/definition/ResponseBodySpec.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBodySpec.java index ceae2601..2b3022e2 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ResponseBodySpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseBodySpec.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.ContentBodySpec; import java.lang.reflect.Type; import java.util.LinkedHashMap; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/ResponseSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseSpec.java similarity index 87% rename from wsdef/src/main/java/com/google/gson/webservice/definition/ResponseSpec.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseSpec.java index b7373b9c..9ecc4d43 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/ResponseSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/ResponseSpec.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.HeaderMapSpec; +import com.google.gson.webservice.definition.internal.utils.Preconditions; /** * Specification for a {@link WebServiceResponse}. diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceCall.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceCall.java similarity index 92% rename from wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceCall.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceCall.java index f8479069..faa8f476 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceCall.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceCall.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + /** * The data associated with a Web service call. This includes http request header parameters (form diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceCallSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceCallSpec.java similarity index 90% rename from wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceCallSpec.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceCallSpec.java index 6d680e3b..693ad74f 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceCallSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceCallSpec.java @@ -13,13 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.CallPath; +import com.google.gson.webservice.definition.HeaderMapSpec; +import com.google.gson.webservice.definition.HttpMethod; +import com.google.gson.webservice.definition.TypedKey; +import com.google.gson.webservice.definition.internal.utils.Preconditions; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; - /** * Specification for a Json web service call. The call includes the relative path where the call * is available, the specification of requests, and responses. diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceRequest.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceRequest.java similarity index 84% rename from wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceRequest.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceRequest.java index 33946b15..b5db7852 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceRequest.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceRequest.java @@ -13,7 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.ContentBodySpec; +import com.google.gson.webservice.definition.HeaderMap; +import com.google.gson.webservice.definition.HttpMethod; +import com.google.gson.webservice.definition.TypedKey; /** * The data associated with a Web service request. This includes HTTP request header parameters diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceResponse.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceResponse.java similarity index 91% rename from wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceResponse.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceResponse.java index cc9c8745..66132ef0 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceResponse.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceResponse.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.HeaderMap; +import com.google.gson.webservice.definition.TypedKey; import java.lang.reflect.Type; diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceSpec.java similarity index 85% rename from wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSpec.java rename to wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceSpec.java index bf80070a..7cd5d899 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/WebServiceSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/procedural/WebServiceSpec.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.definition; +package com.google.gson.webservice.definition.procedural; + +import com.google.gson.webservice.definition.CallPathMap; /** * Specification of the Web service. This contains a specification of all the diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Id.java b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Id.java index 801baf3a..72696c10 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Id.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Id.java @@ -15,6 +15,15 @@ */ package com.google.gson.webservice.definition.rest; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import com.google.gson.webservice.definition.internal.utils.Preconditions; + import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.WildcardType; @@ -157,4 +166,32 @@ public final class Id { } return type.toString(); } + + /** + * Type adapter for converting an Id to its serialized form + * + * @author inder + * + */ + public static final class GsonTypeAdapter implements JsonSerializer>, + JsonDeserializer> { + + @Override + public JsonElement serialize(Id src, Type typeOfSrc, JsonSerializationContext context) { + return new JsonPrimitive(src.getValue()); + } + + @Override + public Id deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { + if (!(typeOfT instanceof ParameterizedType)) { + throw new JsonParseException("Id of unknown type: " + typeOfT); + } + ParameterizedType parameterizedType = (ParameterizedType) typeOfT; + // Since Id takes only one TypeVariable, the actual type corresponding to the first + // TypeVariable is the Type we are looking for + Type typeOfId = parameterizedType.getActualTypeArguments()[0]; + return Id.get(json.getAsLong(), typeOfId); + } + } } diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Preconditions.java b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Preconditions.java deleted file mode 100644 index 0ba7d096..00000000 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/Preconditions.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2010 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.gson.webservice.definition.rest; - -final class Preconditions { - - public static void checkArgument(boolean condition) { - if (!condition) { - throw new IllegalArgumentException(); - } - } - - public static void checkNotNull(Object obj) { - if (obj == null) { - throw new IllegalArgumentException(); - } - } -} diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/ResourceMap.java b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/ResourceMap.java index 3ada07a1..c3938e24 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/ResourceMap.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/ResourceMap.java @@ -15,11 +15,12 @@ */ package com.google.gson.webservice.definition.rest; +import com.google.gson.webservice.definition.CallPath; +import com.google.gson.webservice.definition.internal.utils.Preconditions; + import java.util.HashMap; import java.util.Map; -import com.google.gson.webservice.definition.CallPath; - /** * A {@link Map} of {@link CallPath} to {@link RestCallSpec} * diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestCallSpec.java b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestCallSpec.java index 7bbcf768..29fa7632 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestCallSpec.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestCallSpec.java @@ -15,15 +15,16 @@ */ package com.google.gson.webservice.definition.rest; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.Set; - import com.google.gson.webservice.definition.CallPath; import com.google.gson.webservice.definition.HeaderMapSpec; import com.google.gson.webservice.definition.HttpMethod; import com.google.gson.webservice.definition.TypedKey; +import com.google.gson.webservice.definition.internal.utils.Preconditions; + +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; /** * Specification for a REST service diff --git a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestRequest.java b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestRequest.java index 41a39a25..c911daa1 100644 --- a/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestRequest.java +++ b/wsdef/src/main/java/com/google/gson/webservice/definition/rest/RestRequest.java @@ -15,21 +15,21 @@ */ package com.google.gson.webservice.definition.rest; -import java.lang.reflect.Type; - -import com.google.gson.webservice.definition.ContentBodySpec; import com.google.gson.webservice.definition.HeaderMap; import com.google.gson.webservice.definition.HttpMethod; -import com.google.gson.webservice.definition.RequestBody; import com.google.gson.webservice.definition.TypedKey; +import java.lang.reflect.Type; + /** * The data associated with a Web service request. This includes HTTP request header parameters - * (form and URL parameters), and {@link RequestBody}. + * (form and URL parameters), and request body. * * @author inder */ public final class RestRequest> { + public static final String JSON_CONTENT_TYPE = "application/json"; + private final HttpMethod method; private final HeaderMap headers; private final R body; @@ -68,7 +68,7 @@ public final class RestRequest> { } public String getContentType() { - return ContentBodySpec.JSON_CONTENT_TYPE; + return JSON_CONTENT_TYPE; } public T getHeader(TypedKey key) { diff --git a/wsdef/src/main/java/com/google/gson/webservice/typeadapters/IdTypeAdapter.java b/wsdef/src/main/java/com/google/gson/webservice/typeadapters/IdTypeAdapter.java deleted file mode 100644 index 811aa009..00000000 --- a/wsdef/src/main/java/com/google/gson/webservice/typeadapters/IdTypeAdapter.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2010 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.gson.webservice.typeadapters; - -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import com.google.gson.webservice.definition.rest.Id; - -/** - * Type adapter for converting an Id to its serialized form - * - * @author inder - * - */ -public final class IdTypeAdapter implements JsonSerializer>, JsonDeserializer> { - - @Override - public JsonElement serialize(Id src, Type typeOfSrc, JsonSerializationContext context) { - return new JsonPrimitive(src.getValue()); - } - - @Override - public Id deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { - if (!(typeOfT instanceof ParameterizedType)) { - throw new JsonParseException("Id of unknown type: " + typeOfT); - } - ParameterizedType parameterizedType = (ParameterizedType) typeOfT; - // Since Id takes only one TypeVariable, the actual type corresponding to the first - // TypeVariable is the Type we are looking for - Type typeOfId = parameterizedType.getActualTypeArguments()[0]; - return Id.get(json.getAsLong(), typeOfId); - } -} diff --git a/wsdef/src/test/java/com/google/gson/webservice/typeadapters/IdTypeAdapterTest.java b/wsdef/src/test/java/com/google/gson/webservice/definition/rest/IdTypeAdapterTest.java similarity index 94% rename from wsdef/src/test/java/com/google/gson/webservice/typeadapters/IdTypeAdapterTest.java rename to wsdef/src/test/java/com/google/gson/webservice/definition/rest/IdTypeAdapterTest.java index 5aef1d4b..f0fef50c 100644 --- a/wsdef/src/test/java/com/google/gson/webservice/typeadapters/IdTypeAdapterTest.java +++ b/wsdef/src/test/java/com/google/gson/webservice/definition/rest/IdTypeAdapterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.gson.webservice.typeadapters; +package com.google.gson.webservice.definition.rest; import java.lang.reflect.Type; import java.util.ArrayList; @@ -47,7 +47,7 @@ public class IdTypeAdapterTest extends TestCase { @Override protected void setUp() { gson = new GsonBuilder() - .registerTypeAdapter(Id.class, new IdTypeAdapter()) + .registerTypeAdapter(Id.class, new Id.GsonTypeAdapter()) .create(); course = new Course(COURSE_ID, 4, new Assignment(null, null), createList(STUDENT1, STUDENT2)); diff --git a/wsexample/client/src/main/java/com/google/gson/example/client/ExampleClient.java b/wsexample/client/src/main/java/com/google/gson/example/client/ExampleClient.java index 85875876..2b74baf6 100644 --- a/wsexample/client/src/main/java/com/google/gson/example/client/ExampleClient.java +++ b/wsexample/client/src/main/java/com/google/gson/example/client/ExampleClient.java @@ -28,10 +28,10 @@ import com.google.gson.webservice.client.WebServiceClient; import com.google.gson.webservice.client.WebServiceConfig; import com.google.gson.webservice.definition.HeaderMap; import com.google.gson.webservice.definition.HttpMethod; -import com.google.gson.webservice.definition.RequestBody; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; -import com.google.gson.webservice.definition.WebServiceResponse; +import com.google.gson.webservice.definition.procedural.RequestBody; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; public class ExampleClient { diff --git a/wsexample/definition/src/main/java/com/google/gson/example/service/SampleJsonService.java b/wsexample/definition/src/main/java/com/google/gson/example/service/SampleJsonService.java index a21ba713..b438f3de 100644 --- a/wsexample/definition/src/main/java/com/google/gson/example/service/SampleJsonService.java +++ b/wsexample/definition/src/main/java/com/google/gson/example/service/SampleJsonService.java @@ -17,7 +17,7 @@ package com.google.gson.example.service; import com.google.gson.example.model.TypedKeys; import com.google.gson.webservice.definition.CallPath; import com.google.gson.webservice.definition.HttpMethod; -import com.google.gson.webservice.definition.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; /** * An example of a web-service definition diff --git a/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java b/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java index 981a3a19..12b6c11d 100644 --- a/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java +++ b/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java @@ -22,15 +22,15 @@ import com.google.gson.example.model.Order; import com.google.gson.example.model.TypedKeys; import com.google.gson.example.service.SampleJsonService; import com.google.gson.webservice.definition.HeaderMap; -import com.google.gson.webservice.definition.RequestBody; -import com.google.gson.webservice.definition.RequestSpec; -import com.google.gson.webservice.definition.ResponseBody; -import com.google.gson.webservice.definition.ResponseSpec; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; -import com.google.gson.webservice.definition.WebServiceResponse; -import com.google.gson.webservice.typeadapters.RequestBodyGsonConverter; -import com.google.gson.webservice.typeadapters.ResponseBodyGsonConverter; +import com.google.gson.webservice.definition.procedural.RequestBody; +import com.google.gson.webservice.definition.procedural.RequestBodyGsonConverter; +import com.google.gson.webservice.definition.procedural.RequestSpec; +import com.google.gson.webservice.definition.procedural.ResponseBody; +import com.google.gson.webservice.definition.procedural.ResponseBodyGsonConverter; +import com.google.gson.webservice.definition.procedural.ResponseSpec; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; import com.google.gson.wsf.server.RequestReceiver; import com.google.gson.wsf.server.ResponseSender; diff --git a/wsf/src/main/java/com/google/gson/wsf/inject/RequestBodySpecProvider.java b/wsf/src/main/java/com/google/gson/wsf/inject/RequestBodySpecProvider.java index c7e0923f..b18a5b97 100644 --- a/wsf/src/main/java/com/google/gson/wsf/inject/RequestBodySpecProvider.java +++ b/wsf/src/main/java/com/google/gson/wsf/inject/RequestBodySpecProvider.java @@ -15,8 +15,8 @@ */ package com.google.gson.wsf.inject; -import com.google.gson.webservice.definition.RequestBodySpec; -import com.google.gson.webservice.definition.RequestSpec; +import com.google.gson.webservice.definition.procedural.RequestBodySpec; +import com.google.gson.webservice.definition.procedural.RequestSpec; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/wsf/src/main/java/com/google/gson/wsf/inject/RequestSpecProvider.java b/wsf/src/main/java/com/google/gson/wsf/inject/RequestSpecProvider.java index 03a8c682..0a0182ca 100644 --- a/wsf/src/main/java/com/google/gson/wsf/inject/RequestSpecProvider.java +++ b/wsf/src/main/java/com/google/gson/wsf/inject/RequestSpecProvider.java @@ -15,8 +15,8 @@ */ package com.google.gson.wsf.inject; -import com.google.gson.webservice.definition.RequestSpec; -import com.google.gson.webservice.definition.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.RequestSpec; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java b/wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java index 1fc9e99a..982d7814 100755 --- a/wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java +++ b/wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java @@ -16,8 +16,8 @@ package com.google.gson.wsf.inject; import com.google.gson.webservice.definition.CallPath; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceSpec; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceSpec; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java b/wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java index 71966917..a8ced929 100755 --- a/wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java +++ b/wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java @@ -18,10 +18,10 @@ package com.google.gson.wsf.inject.server; import javax.servlet.http.HttpServletRequest; import com.google.gson.Gson; -import com.google.gson.webservice.definition.WebServiceCall; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; -import com.google.gson.webservice.definition.WebServiceResponse; +import com.google.gson.webservice.definition.procedural.WebServiceCall; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; import com.google.gson.wsf.server.RequestReceiver; import com.google.gson.wsf.server.WebServiceCallServerBuilder; import com.google.inject.Inject; diff --git a/wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java b/wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java index 9d319834..47089126 100644 --- a/wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java +++ b/wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java @@ -29,11 +29,11 @@ import com.google.gson.JsonParseException; import com.google.gson.webservice.definition.HeaderMap; import com.google.gson.webservice.definition.HeaderMapSpec; import com.google.gson.webservice.definition.HttpMethod; -import com.google.gson.webservice.definition.RequestBody; -import com.google.gson.webservice.definition.RequestBodySpec; -import com.google.gson.webservice.definition.RequestSpec; -import com.google.gson.webservice.definition.WebServiceRequest; import com.google.gson.webservice.definition.WebServiceSystemException; +import com.google.gson.webservice.definition.procedural.RequestBody; +import com.google.gson.webservice.definition.procedural.RequestBodySpec; +import com.google.gson.webservice.definition.procedural.RequestSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; /** * Receives and parses a request at the server side on a {@link HttpServletRequest}. diff --git a/wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java b/wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java index 89dfd352..a5f253b3 100644 --- a/wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java +++ b/wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java @@ -15,9 +15,9 @@ */ package com.google.gson.wsf.server; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; -import com.google.gson.webservice.definition.WebServiceResponse; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; /** * An interface describing a class that can build a response diff --git a/wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java b/wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java index 2cccf9d4..451e8d67 100644 --- a/wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java +++ b/wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletResponse; import com.google.gson.Gson; import com.google.gson.webservice.definition.HeaderMap; import com.google.gson.webservice.definition.HeaderMapSpec; -import com.google.gson.webservice.definition.ResponseBody; -import com.google.gson.webservice.definition.WebServiceResponse; +import com.google.gson.webservice.definition.procedural.ResponseBody; +import com.google.gson.webservice.definition.procedural.WebServiceResponse; /** * Sends a JSON web service response on {@link HttpServletResponse}. diff --git a/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java b/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java index 10f5cafa..f04f1c21 100644 --- a/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java +++ b/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java @@ -15,9 +15,9 @@ */ package com.google.gson.wsf.server; -import com.google.gson.webservice.definition.WebServiceCallSpec; -import com.google.gson.webservice.definition.WebServiceRequest; -import com.google.gson.webservice.definition.WebServiceResponse.Builder; +import com.google.gson.webservice.definition.procedural.WebServiceCallSpec; +import com.google.gson.webservice.definition.procedural.WebServiceRequest; +import com.google.gson.webservice.definition.procedural.WebServiceResponse.Builder; public class WebServiceCallServerBuilder {