From 8fb7beeb6f1cef99f2877d1f40ccc5d5d92c507f Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Tue, 10 Dec 2024 15:25:44 +0100 Subject: [PATCH 1/3] gin update, switched to jakarta namespace - gwt update to 2.12.1 - java requirement set to 11 - required changes done - checkstyle config for new checkstyle version included - checkstyle warnings fixed - all other dependencies updated - disabled gwtp-version check by default (page doesn't exist anymore) - removed unused imports --- .gitignore | 3 +- codequality/checkstyle.xml | 154 ++++++++++++++++++ codequality/opensource.java.header | 15 ++ codequality/suppressions.xml | 15 ++ gwtp-core/gwtp-all/pom.xml | 2 +- gwtp-core/gwtp-clients-common/pom.xml | 10 +- .../client/CodeSplitBundleProvider.java | 4 +- .../client/CodeSplitNamedBundleProvider.java | 4 +- .../common/client/CommonGinModule.java | 4 +- .../common/client/NamedProviderBundle.java | 2 +- .../common/client/ProviderBundle.java | 2 +- .../common/client/StandardProvider.java | 4 +- ...amedProviderBundleCollectionProcessor.java | 3 +- .../bundles/ProviderBundleMetaInfReader.java | 1 - .../gwtplatform/common/ClientsCommon.gwt.xml | 8 +- .../bundles/NamedProviderBundleAggregate.vm | 5 +- .../bundles/NamedProviderBundleCollection.vm | 3 +- gwtp-core/gwtp-crawler/pom.xml | 4 +- .../crawler/server/CrawlFilter.java | 20 +-- gwtp-core/gwtp-dispatch-common-client/pom.xml | 4 +- .../dispatch/DispatchCommonClient.gwt.xml | 4 +- .../dispatch/DispatchCommonShared.gwt.xml | 4 +- .../dispatch/rest/DispatchRestShared.gwt.xml | 4 +- gwtp-core/gwtp-dispatch-rest/pom.xml | 14 +- .../rest/client/context/RestContext.java | 28 +++- .../dispatch/rest/client/core/CoreModule.java | 4 +- .../rest/client/core/DefaultBodyFactory.java | 5 +- .../core/DefaultDispatchCallFactory.java | 4 +- .../client/core/DefaultHeaderFactory.java | 5 +- .../core/DefaultRequestBuilderFactory.java | 4 +- .../core/DefaultResponseDeserializer.java | 7 +- .../rest/client/core/DefaultRestDispatch.java | 6 +- .../rest/client/core/DefaultUriFactory.java | 6 +- .../client/filter/DefaultRestFilterChain.java | 4 +- .../client/gin/RestDispatchAsyncModule.java | 4 +- .../AbstractJacksonMapperProvider.java | 4 +- .../DispatchingJacksonMapperProvider.java | 4 +- .../serialization/JsonSerialization.java | 5 +- .../serialization/SerializationModule.java | 4 +- .../dispatch/rest/processors/NameUtils.java | 4 +- .../rest/processors/endpoint/EndPoint.java | 1 - .../resolvers/DateFormatResolver.java | 17 +- .../parameters/CookieParamValueResolver.java | 6 +- .../resource/ResourceMethodUtils.java | 4 +- .../processors/resource/ResourceUtils.java | 1 - .../resource/RootResourceProcessor.java | 4 +- .../JacksonSerializationProcessor.java | 3 +- .../dispatch/rest/DispatchRest.gwt.xml | 4 +- .../rest/processors/resource/Resource.vm | 3 +- .../jackson/JacksonMapperProvider.vm | 3 +- .../DefaultRequestBuilderFactoryTest.java | 11 +- .../rest/client/RestDispatchCallTest.java | 10 +- .../client/core/DefaultBodyFactoryTest.java | 20 +-- .../client/core/DefaultCookieManagerTest.java | 2 - .../client/core/DefaultHeaderFactoryTest.java | 10 +- .../core/DefaultResponseDeserializerTest.java | 3 +- .../client/core/DefaultUriFactoryTest.java | 5 +- .../core/parameters/FormParameterTest.java | 4 +- .../core/parameters/MatrixParameterTest.java | 4 +- .../core/parameters/PathParameterTest.java | 6 +- .../core/parameters/QueryParameterTest.java | 4 +- .../filter/DefaultRestFilterChainTest.java | 10 +- .../RestParameterBindingsSerializerTest.java | 3 +- .../processors/AnnotatedElementBuilder.java | 3 +- .../resolvers/ContentTypeResolverTest.java | 1 - gwtp-core/gwtp-dispatch-rpc-client/pom.xml | 10 +- .../client/DefaultRpcDispatchCallFactory.java | 4 +- .../rpc/client/PhoneGapDispatchAsync.java | 4 +- .../dispatch/rpc/client/RpcDispatchAsync.java | 4 +- .../client/gin/RpcDispatchAsyncModule.java | 4 +- .../DefaultRpcInterceptorRegistry.java | 4 +- .../dispatch/rpc/DispatchRpc.gwt.xml | 4 +- .../gwtp-dispatch-rpc-server-guice/pom.xml | 2 +- .../rpc/server/guice/DispatchImpl.java | 6 +- .../rpc/server/guice/DispatchServiceImpl.java | 4 +- .../rpc/server/guice/HandlerModule.java | 10 +- .../guice/RandomSecurityCookieFilter.java | 6 +- .../ActionHandlerValidatorLinker.java | 4 +- ...azyActionHandlerValidatorRegistryImpl.java | 6 +- .../guice/request/DefaultRequestProvider.java | 10 +- .../rpc/server/ActionThrownByHandlerTest.java | 4 +- .../server/ActionThrownByValidatorTest.java | 4 +- .../HandlerThatThrowsActionException.java | 4 +- .../gwtp-dispatch-rpc-server-spring/pom.xml | 2 +- .../server/spring/DispatchServiceImpl.java | 10 +- .../request/DefaultRequestProvider.java | 4 +- gwtp-core/gwtp-dispatch-rpc-server/pom.xml | 11 +- .../server/AbstractDispatchServiceImpl.java | 8 +- .../AbstractRandomSecurityCookieFilter.java | 18 +- .../dispatch/rpc/server/RequestProvider.java | 2 +- gwtp-core/gwtp-dispatch-rpc-shared/pom.xml | 2 +- .../dispatch/rpc/DispatchRpcShared.gwt.xml | 4 +- gwtp-core/gwtp-dispatch-rpc-test/pom.xml | 2 +- gwtp-core/gwtp-mvp-client/pom.xml | 10 +- .../mvp/client/AutobindDisable.java | 4 +- .../gwtplatform/mvp/client/Bootstrapper.java | 2 +- .../mvp/client/DefaultBootstrapper.java | 4 +- .../mvp/client/HandlerContainerImpl.java | 4 +- .../gwtplatform/mvp/client/HasPopupSlot.java | 4 +- .../gwtplatform/mvp/client/RootPresenter.java | 4 +- .../com/gwtplatform/mvp/client/ViewImpl.java | 1 - .../client/annotations/CustomProvider.java | 2 +- .../mvp/client/gin/DefaultModule.java | 4 +- .../client/proxy/AsyncCallFailHandler.java | 2 +- .../client/proxy/AsyncCallStartHandler.java | 2 +- .../client/proxy/AsyncCallSucceedHandler.java | 2 +- .../mvp/client/proxy/DefaultPlaceManager.java | 4 +- .../client/proxy/LockInteractionHandler.java | 3 +- .../mvp/client/proxy/NavigationHandler.java | 2 +- .../proxy/NavigationRefusedHandler.java | 3 +- .../mvp/client/proxy/ProxyImpl.java | 4 +- .../mvp/client/proxy/ProxyPlaceAbstract.java | 4 +- .../client/proxy/ResetPresentersHandler.java | 2 +- .../DefaultGatekeeperProcessor.java | 7 +- .../PlaceTokenRegistryProcessor.java | 3 +- .../mvp/processors/bundle/BundleDetails.java | 10 +- .../mvp/processors/entrypoint/EntryPoint.java | 4 +- .../entrypoint/EntryPointProcessor.java | 3 +- .../proxy/AbstractProxyDetails.java | 9 +- .../processors/proxy/ProxyEventMethod.java | 1 - .../processors/proxy/ProxyPlaceDetails.java | 6 +- .../com/gwtplatform/mvp/FormFactor.gwt.xml | 4 +- .../resources/com/gwtplatform/mvp/Mvp.gwt.xml | 4 +- .../gwtplatform/mvp/MvpWithEntryPoint.gwt.xml | 4 +- .../gwtplatform/mvp/MvpWithFormFactor.gwt.xml | 4 +- .../mvp/processors/bundle/ProviderBundle.vm | 5 +- .../mvp/processors/proxy/macros.vm | 4 +- .../mvp/client/HandlerContainerImpl2Test.java | 4 +- .../mvp/client/HandlerContainerImplTest.java | 4 +- .../gwtplatform/mvp/client/PresenterTest.java | 4 +- .../mvp/client/PresenterWidgetTest.java | 6 +- .../gwtplatform/mvp/client/ViewImplTest.java | 5 +- .../gwt/mvp/AdminPresenterTestUtilGwt.java | 4 +- .../mvp/InstantiationCounterTestUtilGwt.java | 2 +- .../gwt/mvp/MainPresenterTestUtilGwt.java | 6 +- .../gwt/mvp/PopupPresenterTestUtilGwt.java | 4 +- .../client/gwt/mvp/PopupViewTestUtilGwt.java | 4 +- .../mvp/client/mvp/MainPresenterTestUtil.java | 6 +- .../mvp/client/mvp/MockInjectionTest.java | 4 +- .../mvp/client/mvp/RealInjectionTest.java | 4 +- .../mvp/SubPresenterWidgetTestUtil.java | 4 +- .../mvp/client/proxy/GatekeeperTest.java | 8 +- .../proxy/GatekeeperWithParamsTest.java | 6 +- .../client/proxy/PlaceManagerImpl2Test.java | 16 +- .../client/proxy/PlaceManagerImplTest.java | 14 +- .../client/proxy/PlaceManagerTestUtil.java | 4 +- .../com/gwtplatform/mvp/MvpGwtTest.gwt.xml | 4 +- gwtp-core/gwtp-mvp-shared/pom.xml | 4 +- .../shared/proxy/ParameterTokenFormatter.java | 4 +- .../mvp/shared/proxy/RouteTokenFormatter.java | 8 +- .../com/gwtplatform/mvp/MvpShared.gwt.xml | 4 +- gwtp-core/gwtp-processors/pom.xml | 2 +- gwtp-core/gwtp-tester/pom.xml | 10 +- gwtp-core/pom.xml | 28 ++-- gwtp-crawler-service/.factorypath | 37 ----- gwtp-crawler-service/pom.xml | 10 +- .../server/CrawlServiceServlet.java | 22 +-- .../server/guice/CrawlServiceModule.java | 6 +- pom.xml | 93 ++++++----- .../processors/tools/AbstractProcessor.java | 2 +- .../processors/tools/GwtSourceFilter.java | 2 +- .../processors/tools/domain/Type.java | 2 +- .../processors/tools/outputter/Outputter.java | 5 +- .../tools/utils/ElementPredicates.java | 3 +- .../processors/tools/utils/Primitives.java | 4 +- .../processors/tools/utils/Utils.java | 3 +- .../module1/GwtSourceFilterTestModule.gwt.xml | 4 +- .../module2/GwtSourceFilterTestModule.gwt.xml | 4 +- .../module3/GwtSourceFilterTestModule.gwt.xml | 4 +- .../module4/GwtSourceFilterTestModule.gwt.xml | 4 +- src/site/site.xml | 10 +- 171 files changed, 686 insertions(+), 527 deletions(-) create mode 100644 codequality/checkstyle.xml create mode 100644 codequality/opensource.java.header create mode 100644 codequality/suppressions.xml delete mode 100644 gwtp-crawler-service/.factorypath diff --git a/.gitignore b/.gitignore index 5cff6acc97..0834ec3c43 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ META-INF .checkstyle chromedriver.log .errai/ -*.versionsBackup \ No newline at end of file +*.versionsBackup +.factorypath diff --git a/codequality/checkstyle.xml b/codequality/checkstyle.xml new file mode 100644 index 0000000000..9bff910fe6 --- /dev/null +++ b/codequality/checkstyle.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codequality/opensource.java.header b/codequality/opensource.java.header new file mode 100644 index 0000000000..7467547a3e --- /dev/null +++ b/codequality/opensource.java.header @@ -0,0 +1,15 @@ +/\*\*? + \* Copyright \d{4} ArcBees 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\. + \*/ diff --git a/codequality/suppressions.xml b/codequality/suppressions.xml new file mode 100644 index 0000000000..8e6d283b44 --- /dev/null +++ b/codequality/suppressions.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/gwtp-core/gwtp-all/pom.xml b/gwtp-core/gwtp-all/pom.xml index a551c8e91f..63d057bd21 100644 --- a/gwtp-core/gwtp-all/pom.xml +++ b/gwtp-core/gwtp-all/pom.xml @@ -240,7 +240,7 @@ - com.google.gwt + org.gwtproject gwt-dev provided diff --git a/gwtp-core/gwtp-clients-common/pom.xml b/gwtp-core/gwtp-clients-common/pom.xml index 4474dce8b2..f3e0ff8e6b 100644 --- a/gwtp-core/gwtp-clients-common/pom.xml +++ b/gwtp-core/gwtp-clients-common/pom.xml @@ -27,21 +27,17 @@ - com.google.gwt + org.gwtproject gwt-user - com.google.gwt + org.gwtproject gwt-dev - com.google.gwt.inject + io.github.gwtplus.gin gin - - com.google.inject - guice - com.gwtplatform diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java index 62ef1cf36c..56792c2921 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java @@ -16,11 +16,11 @@ package com.gwtplatform.common.client; -import javax.inject.Provider; - import com.google.gwt.inject.client.AsyncProvider; import com.google.gwt.user.client.rpc.AsyncCallback; +import jakarta.inject.Provider; + /** * Implements a {@link IndirectProvider} that uses code splitting for a specific type. The object will be provided from * a {@link ProviderBundle}. diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitNamedBundleProvider.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitNamedBundleProvider.java index a5b07ec4db..f8cf77c42c 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitNamedBundleProvider.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitNamedBundleProvider.java @@ -16,11 +16,11 @@ package com.gwtplatform.common.client; -import javax.inject.Provider; - import com.google.gwt.inject.client.AsyncProvider; import com.google.gwt.user.client.rpc.AsyncCallback; +import jakarta.inject.Provider; + public class CodeSplitNamedBundleProvider implements IndirectProvider { private final AsyncProvider bundleProvider; private final String providerName; diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java index 9c0eda3587..ce739c730b 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java @@ -16,11 +16,11 @@ package com.gwtplatform.common.client; -import javax.inject.Singleton; - import com.google.gwt.inject.client.AbstractGinModule; import com.gwtplatform.common.shared.UrlUtils; +import jakarta.inject.Singleton; + /** * Common client bindings. * You can safely install this module multiple times as the bindings will be performed only on the first install. diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/NamedProviderBundle.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/NamedProviderBundle.java index e10455453c..5480fbcc65 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/NamedProviderBundle.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/NamedProviderBundle.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Provider; +import jakarta.inject.Provider; public abstract class NamedProviderBundle extends ProviderBundle { private final List presenterIds; diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java index a85d419ea0..25f31bbff9 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java @@ -16,7 +16,7 @@ package com.gwtplatform.common.client; -import javax.inject.Provider; +import jakarta.inject.Provider; /** * This class can be used to contain a group of providers that should all sit diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java index aacca15b8a..b59998b2b2 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java @@ -16,10 +16,10 @@ package com.gwtplatform.common.client; -import javax.inject.Provider; - import com.google.gwt.user.client.rpc.AsyncCallback; +import jakarta.inject.Provider; + /** * An {@link IndirectProvider} that immediately gets the object and invokes the callback, without performing code * splitting. This is essentially the same as a standard {@link Provider}, but shares the interface of other {@link diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollectionProcessor.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollectionProcessor.java index 9a56e3155f..067cb6e808 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollectionProcessor.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollectionProcessor.java @@ -22,7 +22,6 @@ import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; -import javax.inject.Singleton; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; @@ -34,6 +33,8 @@ import com.gwtplatform.processors.tools.bindings.BindingsProcessors; import com.gwtplatform.processors.tools.domain.Type; +import jakarta.inject.Singleton; + import static com.google.auto.common.MoreElements.asType; import static com.gwtplatform.common.processors.module.GwtpAppModuleProcessor.MAIN_MODULE_TYPE; import static com.gwtplatform.processors.tools.bindings.BindingContext.newBinding; diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/ProviderBundleMetaInfReader.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/ProviderBundleMetaInfReader.java index f1137e965c..25a2484296 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/ProviderBundleMetaInfReader.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/processors/bundles/ProviderBundleMetaInfReader.java @@ -41,7 +41,6 @@ import com.gwtplatform.processors.tools.logger.Logger; import static java.nio.file.Files.newInputStream; - import static com.google.common.io.CharStreams.readLines; import static com.google.common.io.Files.getNameWithoutExtension; diff --git a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml index fea77ac7e0..d50f08f44c 100644 --- a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml +++ b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml @@ -1,6 +1,6 @@ - + @@ -11,9 +11,9 @@ - + - + diff --git a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleAggregate.vm b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleAggregate.vm index 6afc10222a..587f398f7a 100644 --- a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleAggregate.vm +++ b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleAggregate.vm @@ -1,11 +1,12 @@ package $impl.packageName; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + import java.util.ArrayList; import java.util.List; import javax.annotation.Generated; -import javax.inject.Inject; -import javax.inject.Provider; import com.gwtplatform.common.client.NamedProviderBundle; #printImports($imports) diff --git a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollection.vm b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollection.vm index f0b751b68b..aadf4f9aea 100644 --- a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollection.vm +++ b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollection.vm @@ -4,7 +4,8 @@ import java.util.Map; import java.util.HashMap; import javax.annotation.Generated; -import javax.inject.Inject; + +import jakarta.inject.Inject; import com.google.gwt.inject.client.AsyncProvider; import com.gwtplatform.common.client.NamedProviderBundle; diff --git a/gwtp-core/gwtp-crawler/pom.xml b/gwtp-core/gwtp-crawler/pom.xml index 14fee2b8cc..cec3dba8ca 100644 --- a/gwtp-core/gwtp-crawler/pom.xml +++ b/gwtp-core/gwtp-crawler/pom.xml @@ -32,8 +32,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api diff --git a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java index 69127c7b43..93069af8ae 100644 --- a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java +++ b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java @@ -27,16 +27,16 @@ import java.net.URLEncoder; import java.util.logging.Logger; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Servlet that makes this application crawlable. diff --git a/gwtp-core/gwtp-dispatch-common-client/pom.xml b/gwtp-core/gwtp-dispatch-common-client/pom.xml index ccea571abe..e3d6982ad1 100644 --- a/gwtp-core/gwtp-dispatch-common-client/pom.xml +++ b/gwtp-core/gwtp-dispatch-common-client/pom.xml @@ -22,11 +22,11 @@ gwtp-dispatch-common-shared - com.google.gwt + org.gwtproject gwt-user - com.google.gwt.inject + io.github.gwtplus.gin gin diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml b/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml index 76eb8a94b7..c199bbd4b2 100644 --- a/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml +++ b/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml b/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml index a69eaf1074..9a67c2d6e5 100644 --- a/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml +++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml b/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml index c73a51d167..9b7dd502ef 100644 --- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml +++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-dispatch-rest/pom.xml b/gwtp-core/gwtp-dispatch-rest/pom.xml index dde82dc70a..f863f751d9 100644 --- a/gwtp-core/gwtp-dispatch-rest/pom.xml +++ b/gwtp-core/gwtp-dispatch-rest/pom.xml @@ -55,26 +55,18 @@ gwtp-dispatch-rest-shared - com.google.gwt + org.gwtproject gwt-user - com.google.gwt + org.gwtproject gwt-dev - com.google.gwt.inject + io.github.gwtplus.gin gin - - com.google.inject - guice - - - com.google.inject.extensions - guice-multibindings - diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/context/RestContext.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/context/RestContext.java index 83f15957c6..4425d4d097 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/context/RestContext.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/context/RestContext.java @@ -17,6 +17,7 @@ package com.gwtplatform.dispatch.rest.client.context; import java.util.List; +import java.util.Objects; import com.gwtplatform.dispatch.rest.shared.HttpMethod; import com.gwtplatform.dispatch.rest.shared.HttpParameter; @@ -142,14 +143,25 @@ public RestContext build() { @Override public int hashCode() { - int result = template != null ? template.hashCode() : 0; - result = 31 * result + (path != null ? path.hashCode() : 0); - result = 31 * result + (httpMethod != null ? httpMethod.hashCode() : 0); - result = 31 * result + queryCount; - result = 31 * result + (transcendent ? 1 : 0); - result = 31 * result + (anyHttpMethod ? 1 : 0); - result = 31 * result + (anyQueryCount ? 1 : 0); - return result; + return Objects.hash(anyHttpMethod, anyQueryCount, httpMethod, path, queryCount, template, transcendent); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + Builder other = (Builder) obj; + return anyHttpMethod == other.anyHttpMethod && anyQueryCount == other.anyQueryCount + && httpMethod == other.httpMethod && Objects.equals(path, other.path) + && queryCount == other.queryCount && Objects.equals(template, other.template) + && transcendent == other.transcendent; } } diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java index 9d0fc8ee51..0a80fd7d78 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java @@ -16,12 +16,12 @@ package com.gwtplatform.dispatch.rest.client.core; -import javax.inject.Singleton; - import com.google.gwt.inject.client.AbstractGinModule; import com.gwtplatform.dispatch.rest.client.RestDispatch; import com.gwtplatform.dispatch.rest.client.filter.RestFilterChain; +import jakarta.inject.Singleton; + public class CoreModule extends AbstractGinModule { private final CoreModuleBuilder builder; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java index d6a7a964eb..8c8010ba4d 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java @@ -19,8 +19,6 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Provider; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; @@ -33,6 +31,9 @@ import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + public class DefaultBodyFactory implements BodyFactory { private final Provider> serializationsProvider; private final UriFactory uriFactory; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java index 1f2c32339d..4b0d535ebd 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java @@ -16,13 +16,13 @@ package com.gwtplatform.dispatch.rest.client.core; -import javax.inject.Inject; - import com.gwtplatform.dispatch.rest.client.RestCallback; import com.gwtplatform.dispatch.rest.client.annotations.RestBinding; import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.SecurityCookieAccessor; +import jakarta.inject.Inject; + /** * The default implementation for {@link DispatchCallFactory}. */ diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java index 1cf325fbb7..cc616122a0 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Provider; import javax.ws.rs.core.HttpHeaders; import com.google.gwt.http.client.RequestBuilder; @@ -35,6 +33,9 @@ import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; import com.gwtplatform.dispatch.rest.shared.RestAction; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + import static com.google.gwt.user.client.rpc.RpcRequestBuilder.MODULE_BASE_HEADER; public class DefaultHeaderFactory implements HeaderFactory { diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java index c1de9c4857..92b0f02e86 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java @@ -19,8 +19,6 @@ import java.util.EnumMap; import java.util.Map; -import javax.inject.Inject; - import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestBuilder.Method; import com.gwtplatform.dispatch.rest.client.annotations.RequestTimeout; @@ -28,6 +26,8 @@ import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + /** * Default implementation for {@link RequestBuilderFactory}. */ diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java index d907e9724b..73b5e70174 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java @@ -18,8 +18,6 @@ import java.util.Set; -import javax.inject.Inject; -import javax.inject.Provider; import javax.ws.rs.core.HttpHeaders; import com.google.gwt.http.client.Response; @@ -29,6 +27,9 @@ import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + /** * Default implementation for {@link ResponseDeserializer}. */ @@ -91,7 +92,7 @@ protected R deserializeValue(Serialization serialization, String resultClass private boolean isSuccessStatusCode(Response response) { int statusCode = response.getStatusCode(); - return (statusCode >= 200 && statusCode < 300) || statusCode == 304; + return statusCode >= 200 && statusCode < 300 || statusCode == 304; } private R getDeserializedResponse(RestAction action, Response response) throws ActionException { diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java index 6a1c1990ee..4a99bc8057 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java @@ -16,15 +16,15 @@ package com.gwtplatform.dispatch.rest.client.core; -import javax.inject.Inject; -import javax.inject.Provider; - import com.gwtplatform.dispatch.rest.client.RestCallback; import com.gwtplatform.dispatch.rest.client.RestDispatch; import com.gwtplatform.dispatch.rest.client.filter.RestFilterChain; import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.DispatchRequest; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + /** * The default implementation for {@link RestDispatch}. */ diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java index 44b9582323..e1e9b3e255 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java @@ -20,9 +20,6 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Provider; - import com.gwtplatform.dispatch.rest.client.RestApplicationPath; import com.gwtplatform.dispatch.rest.client.annotations.GlobalQueryParams; import com.gwtplatform.dispatch.rest.client.gin.RestParameterBindings; @@ -30,6 +27,9 @@ import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; import com.gwtplatform.dispatch.rest.shared.RestAction; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + public class DefaultUriFactory implements UriFactory { private final RestParameterBindings globalQueryParams; private final Provider applicationPathProvider; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChain.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChain.java index 261f156525..9baa55be26 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChain.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChain.java @@ -19,14 +19,14 @@ import java.util.Iterator; import java.util.Map.Entry; -import javax.inject.Inject; - import com.gwtplatform.dispatch.client.ExecuteCommand; import com.gwtplatform.dispatch.rest.client.RestCallback; import com.gwtplatform.dispatch.rest.client.context.RestContext; import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.DispatchRequest; +import jakarta.inject.Inject; + public class DefaultRestFilterChain implements RestFilterChain { private final Iterator> filterIterator; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java index 1077b21732..b40ddb1d7c 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rest.client.gin; -import javax.inject.Singleton; - import com.google.inject.Provides; import com.gwtplatform.common.client.CommonGinModule; import com.gwtplatform.dispatch.client.gin.AbstractDispatchAsyncModule; @@ -31,6 +29,8 @@ import com.gwtplatform.dispatch.rest.client.filter.RestFilterRegistry; import com.gwtplatform.dispatch.rest.client.serialization.SerializationModule; +import jakarta.inject.Singleton; + /** * An implementation of {@link AbstractDispatchAsyncModule} that binds classes used by a restful dispatch. *

diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java index 28f48df89f..92a56594ce 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java @@ -19,10 +19,10 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Provider; - import com.github.nmorel.gwtjackson.client.ObjectMapper; +import jakarta.inject.Provider; + /** * Abstract class providing utility methods to reduce the code generation complexity of {@link JacksonMapperProvider}. */ diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/DispatchingJacksonMapperProvider.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/DispatchingJacksonMapperProvider.java index d5bd94209d..46dbd34fde 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/DispatchingJacksonMapperProvider.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/DispatchingJacksonMapperProvider.java @@ -18,10 +18,10 @@ import java.util.Set; -import javax.inject.Inject; - import com.github.nmorel.gwtjackson.client.ObjectMapper; +import jakarta.inject.Inject; + public class DispatchingJacksonMapperProvider implements JacksonMapperProvider { private final Set providers; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java index a03de88a41..4e122c075c 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java @@ -18,7 +18,6 @@ import java.util.List; -import javax.inject.Inject; import javax.ws.rs.core.MediaType; import com.github.nmorel.gwtjackson.client.JsonDeserializationContext; @@ -27,6 +26,8 @@ import com.github.nmorel.gwtjackson.client.exception.JsonMappingException; import com.gwtplatform.dispatch.rest.shared.ContentType; +import jakarta.inject.Inject; + /** * JSON implementation of {@link Serialization}. It acts as a facade to * gwt-jackson. @@ -57,7 +58,7 @@ public boolean canSerialize(String type, List contentTypes) { @Override public boolean canDeserialize(String type, ContentType contentType) { return VOID.equals(type) - || (CONTENT_TYPE.isCompatible(contentType) && jacksonMapperProvider.hasMapper(type)); + || CONTENT_TYPE.isCompatible(contentType) && jacksonMapperProvider.hasMapper(type); } @Override diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java index bb173b1aee..c91b167b0e 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java @@ -16,12 +16,12 @@ package com.gwtplatform.dispatch.rest.client.serialization; -import javax.inject.Singleton; - import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.binder.GinBinder; import com.google.gwt.inject.client.binder.GinLinkedBindingBuilder; +import jakarta.inject.Singleton; + import static com.google.gwt.inject.client.multibindings.GinMultibinder.newSetBinder; public class SerializationModule extends AbstractGinModule { diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/NameUtils.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/NameUtils.java index 63055e9449..17ac4edf18 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/NameUtils.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/NameUtils.java @@ -20,7 +20,7 @@ import javax.lang.model.element.Name; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; -import javax.lang.model.util.SimpleElementVisitor6; +import javax.lang.model.util.SimpleElementVisitor8; import com.gwtplatform.dispatch.rest.processors.resource.ResourceMethod; import com.gwtplatform.processors.tools.domain.Type; @@ -33,7 +33,7 @@ public class NameUtils { private static final String JACKSON_MAPPER_PROVIDER_NAME = "GeneratedJacksonMapperProvider"; public static String parentName(VariableElement element) { - return element.getEnclosingElement().accept(new SimpleElementVisitor6("") { + return element.getEnclosingElement().accept(new SimpleElementVisitor8("") { @Override public String visitExecutable(ExecutableElement parent, Void v) { return qualifiedMethodName(parent); diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/endpoint/EndPoint.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/endpoint/EndPoint.java index 2479d02742..ab13a8f675 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/endpoint/EndPoint.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/endpoint/EndPoint.java @@ -31,7 +31,6 @@ import com.gwtplatform.processors.tools.utils.Utils; import static javax.lang.model.util.ElementFilter.methodsIn; - import static com.google.auto.common.MoreElements.asType; import static com.google.common.base.Optional.absent; import static com.google.common.base.Optional.of; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/DateFormatResolver.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/DateFormatResolver.java index cb8a2926c5..fd4752d6bd 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/DateFormatResolver.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/DateFormatResolver.java @@ -16,11 +16,14 @@ package com.gwtplatform.dispatch.rest.processors.resolvers; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; +import javax.lang.model.element.Name; import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor8; import com.google.common.base.Optional; import com.gwtplatform.dispatch.rest.shared.DateFormat; @@ -32,12 +35,16 @@ public class DateFormatResolver { private static final String DATE_FORMAT_NOT_DATE = - "Method `%s` parameter's `%s` is annotated with @DateFormat but its type is not Date."; - private static final SimpleTypeVisitor6 DATE_TYPE_VALIDATION_VISITOR = - new SimpleTypeVisitor6(false) { + "Method `%s` parameter's `%s` is annotated with @DateFormat but its type is not Date, LocalDate " + + "or LocalDateTime."; + private static final SimpleTypeVisitor8 DATE_TYPE_VALIDATION_VISITOR = + new SimpleTypeVisitor8(false) { @Override public Boolean visitDeclared(DeclaredType type, Void v) { - return asType(type.asElement()).getQualifiedName().contentEquals(Date.class.getCanonicalName()); + final Name typeName = asType(type.asElement()).getQualifiedName(); + return typeName.contentEquals(Date.class.getCanonicalName()) + || typeName.contentEquals(LocalDate.class.getCanonicalName()) + || typeName.contentEquals(LocalDateTime.class.getCanonicalName()); } }; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/parameters/CookieParamValueResolver.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/parameters/CookieParamValueResolver.java index 542882589e..46038552bb 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/parameters/CookieParamValueResolver.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resolvers/parameters/CookieParamValueResolver.java @@ -25,7 +25,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.PrimitiveType; import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor8; import javax.ws.rs.CookieParam; import javax.ws.rs.core.Cookie; @@ -42,8 +42,8 @@ public class CookieParamValueResolver extends HttpParamValueResolver { private static final String COOKIE_BAD_RETURN_TYPE = "Method `%s` parameter's `%s` is annotated with @CookieParam " + "but has a bad return type. It may only be a primitive, `Cookie` or a `Collection`."; - private static final SimpleTypeVisitor6 VALID_COOKIE_TYPE_VISITOR = - new SimpleTypeVisitor6(false) { + private static final SimpleTypeVisitor8 VALID_COOKIE_TYPE_VISITOR = + new SimpleTypeVisitor8(false) { @Override public Boolean visitPrimitive(PrimitiveType type, CookieParamValueResolver resolver) { return true; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceMethodUtils.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceMethodUtils.java index 006a1fd396..e361568f78 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceMethodUtils.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceMethodUtils.java @@ -22,7 +22,7 @@ import javax.lang.model.element.Name; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeVisitor; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor8; import com.google.common.collect.FluentIterable; import com.gwtplatform.dispatch.rest.processors.details.HttpVariable; @@ -33,7 +33,7 @@ public class ResourceMethodUtils { private static final TypeVisitor IS_REST_ACTION_VISITOR = - new SimpleTypeVisitor6(false) { + new SimpleTypeVisitor8(false) { @Override public Boolean visitDeclared(DeclaredType type, Void nothing) { Name returnTypeName = asTypeElement(type).getQualifiedName(); diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceUtils.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceUtils.java index 95c584e0eb..0aebc4531f 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceUtils.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/ResourceUtils.java @@ -30,7 +30,6 @@ import com.gwtplatform.processors.tools.utils.Utils; import static javax.lang.model.util.ElementFilter.methodsIn; - import static com.google.auto.common.MoreElements.asType; public class ResourceUtils { diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/RootResourceProcessor.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/RootResourceProcessor.java index 2cebc4a2b9..89000aa0c1 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/RootResourceProcessor.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/resource/RootResourceProcessor.java @@ -18,8 +18,6 @@ import java.util.List; -import javax.inject.Singleton; - import com.gwtplatform.dispatch.rest.processors.DispatchRestContextProcessor; import com.gwtplatform.processors.tools.bindings.BindingsProcessors; import com.gwtplatform.processors.tools.domain.Type; @@ -28,6 +26,8 @@ import com.gwtplatform.processors.tools.outputter.Outputter; import com.gwtplatform.processors.tools.utils.Utils; +import jakarta.inject.Singleton; + import static com.gwtplatform.dispatch.rest.processors.NameUtils.findRestModuleType; import static com.gwtplatform.processors.tools.bindings.BindingContext.newBinding; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonSerializationProcessor.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonSerializationProcessor.java index 173a6b49ad..21d38ac4e0 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonSerializationProcessor.java +++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonSerializationProcessor.java @@ -19,7 +19,6 @@ import java.util.Map; import java.util.TreeMap; -import javax.inject.Singleton; import javax.tools.FileObject; import javax.ws.rs.core.MediaType; @@ -39,6 +38,8 @@ import com.gwtplatform.processors.tools.utils.Primitives; import com.gwtplatform.processors.tools.utils.Utils; +import jakarta.inject.Singleton; + import static com.gwtplatform.dispatch.rest.processors.NameUtils.findRestModuleType; import static com.gwtplatform.processors.tools.bindings.BindingContext.newSetBinder; import static com.gwtplatform.processors.tools.utils.Primitives.findByBoxed; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml index b69189994a..c294703f44 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml +++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/resource/Resource.vm b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/resource/Resource.vm index 754675c936..37d19ac60c 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/resource/Resource.vm +++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/resource/Resource.vm @@ -1,7 +1,8 @@ package $impl.packageName; +import jakarta.inject.Inject; + import javax.annotation.Generated; -import javax.inject.Inject; import com.gwtplatform.common.shared.UrlUtils; import com.gwtplatform.dispatch.rest.client.annotations.DefaultDateFormat; diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonMapperProvider.vm b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonMapperProvider.vm index 87353e5a31..80c9a54bee 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonMapperProvider.vm +++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/processors/serialization/jackson/JacksonMapperProvider.vm @@ -1,7 +1,8 @@ package $impl.packageName; +import jakarta.inject.Provider; + import javax.annotation.Generated; -import javax.inject.Provider; import com.github.nmorel.gwtjackson.client.ObjectMapper; import com.google.gwt.core.client.GWT; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java index 6d3eeb37b9..e26bcb1fba 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rest.client; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.junit.Test; @@ -31,11 +29,12 @@ import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; - import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET; @RunWith(JukitoRunner.class) @@ -64,7 +63,7 @@ protected void configureTest() { @Test public void requestTimeoutShouldBeTheTimeoutProvided() throws ActionException { // Given - given(httpRequestBuilderFactory.create(eq(RequestBuilder.GET), anyString())).willReturn(requestBuilder); + given(httpRequestBuilderFactory.create(eq(RequestBuilder.GET), isNull())).willReturn(requestBuilder); RestAction action = new SecuredRestAction(GET, RELATIVE_PATH); diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java index 3c3e5039e6..7dbd7c34b0 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rest.client; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,9 +33,11 @@ import com.gwtplatform.dispatch.shared.ActionException; import com.gwtplatform.dispatch.shared.SecurityCookieAccessor; +import jakarta.inject.Inject; + +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.same; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -69,7 +69,7 @@ public void someAction_cookieSavedBeforeExecution(RestCallback callback) RequestBuilder requestBuilder = mock(RequestBuilder.class); RestDispatchCall call = createCall(action, callback); - given(requestBuilderFactory.build(same(action), anyString())).willReturn(requestBuilder); + given(requestBuilderFactory.build(same(action), isNull())).willReturn(requestBuilder); // when call.execute(); diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java index 420a1abb60..c59382f405 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java @@ -18,7 +18,6 @@ import java.util.Date; -import javax.inject.Inject; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; @@ -42,16 +41,17 @@ import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; - import static com.gwtplatform.dispatch.rest.shared.HttpMethod.DELETE; import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET; @@ -126,8 +126,8 @@ public void build_body_requestContainsSerializedString(Serialization serializati action.setBodyParam(unserializedObject); action.setBodyClass(serializationKey); - given(serialization.canSerialize(eq(serializationKey), anyListOf(ContentType.class))).willReturn(true); - given(serialization.serialize(eq(serializationKey), anyListOf(ContentType.class), eq(unserializedObject))) + given(serialization.canSerialize(eq(serializationKey), anyList())).willReturn(true); + given(serialization.serialize(eq(serializationKey), anyList(), eq(unserializedObject))) .willReturn(serializedValue); // When @@ -148,7 +148,7 @@ public void build_body_noSerializer_throws(Serialization serialization) throws A action.setBodyParam(unserializedObject); action.setBodyClass(serializationKey); - given(serialization.canSerialize(eq(serializationKey), anyListOf(ContentType.class))).willReturn(false); + given(serialization.canSerialize(eq(serializationKey), anyList())).willReturn(false); // When factory.buildBody(requestBuilder, action); diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultCookieManagerTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultCookieManagerTest.java index 1cb7e58159..018ce49c8c 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultCookieManagerTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultCookieManagerTest.java @@ -28,13 +28,11 @@ import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; import static java.util.Arrays.asList; - import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; - import static com.google.common.collect.Maps.immutableEntry; @RunWith(GwtMockitoTestRunner.class) diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java index 00c6931430..a92155cc62 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java @@ -18,8 +18,6 @@ import java.util.Arrays; -import javax.inject.Inject; -import javax.inject.Provider; import javax.ws.rs.core.HttpHeaders; import org.jukito.JukitoModule; @@ -45,12 +43,14 @@ import com.gwtplatform.dispatch.rest.shared.ContentType; import com.gwtplatform.dispatch.rest.shared.RestAction; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; - import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET; import static com.gwtplatform.dispatch.rest.shared.HttpMethod.POST; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java index 6e3dbf1044..a92d72c102 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java @@ -16,7 +16,6 @@ package com.gwtplatform.dispatch.rest.client.core; -import javax.inject.Inject; import javax.ws.rs.core.HttpHeaders; import org.jukito.JukitoModule; @@ -32,6 +31,8 @@ import com.gwtplatform.dispatch.rest.shared.HttpMethod; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java index 3d3eb76887..9bf48a24b6 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rest.client.core; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestSingleton; @@ -37,8 +35,9 @@ import com.gwtplatform.dispatch.rest.client.testutils.UrlUtilsForTests; import com.gwtplatform.dispatch.rest.shared.RestAction; -import static org.assertj.core.api.Assertions.assertThat; +import jakarta.inject.Inject; +import static org.assertj.core.api.Assertions.assertThat; import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET; import static com.gwtplatform.dispatch.rest.shared.HttpMethod.POST; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java index ec5860743a..afebfb1aa9 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.junit.Before; import org.junit.Test; @@ -31,6 +29,8 @@ import com.gwtplatform.common.shared.UrlUtils; import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; import static org.mockito.BDDMockito.given; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java index 158d59eade..3e9cd8913f 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.junit.Before; import org.junit.Test; @@ -31,6 +29,8 @@ import com.gwtplatform.common.shared.UrlUtils; import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; import static org.mockito.BDDMockito.given; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java index 7be2c22973..2282101059 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.junit.After; import org.junit.Before; @@ -33,10 +31,12 @@ import com.gwtplatform.common.shared.UrlUtils; import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; @RunWith(JukitoRunner.class) public class PathParameterTest { diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java index d1b2d312c5..1e88008bf7 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map.Entry; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.junit.Before; import org.junit.Test; @@ -31,6 +29,8 @@ import com.gwtplatform.common.shared.UrlUtils; import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; import static org.mockito.BDDMockito.given; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChainTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChainTest.java index 537be005fb..b7bd375c32 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChainTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/filter/DefaultRestFilterChainTest.java @@ -21,9 +21,6 @@ import java.util.Iterator; import java.util.Map.Entry; -import javax.inject.Inject; -import javax.inject.Provider; - import org.jukito.JukitoRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,10 +34,13 @@ import com.gwtplatform.dispatch.rest.shared.RestAction; import com.gwtplatform.dispatch.shared.DispatchRequest; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/gin/RestParameterBindingsSerializerTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/gin/RestParameterBindingsSerializerTest.java index aa374a080d..ed8708c19d 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/gin/RestParameterBindingsSerializerTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/gin/RestParameterBindingsSerializerTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import org.junit.Test; +import com.google.gwt.junit.GWTMockUtilities; import com.gwtplatform.dispatch.rest.client.core.parameters.FormParameter; import com.gwtplatform.dispatch.rest.client.core.parameters.HeaderParameter; import com.gwtplatform.dispatch.rest.client.core.parameters.PathParameter; @@ -26,7 +27,6 @@ import com.gwtplatform.dispatch.rest.shared.HttpMethod; import static org.junit.Assert.assertEquals; - import static com.gwtplatform.dispatch.rest.client.gin.RestParameterBindingsSerializer.URL_UTILS; public class RestParameterBindingsSerializerTest { @@ -65,6 +65,7 @@ public void serializeSimple() { @Test public void serializeComplex() { // given + GWTMockUtilities.disarm(); RestParameterBindings map = new RestParameterBindings(); map.put(HttpMethod.GET, new QueryParameter("a", 1, null, URL_UTILS)); map.put(HttpMethod.GET, new FormParameter("b", false, null, URL_UTILS)); diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/AnnotatedElementBuilder.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/AnnotatedElementBuilder.java index b030b72240..81dcde1a04 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/AnnotatedElementBuilder.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/AnnotatedElementBuilder.java @@ -35,9 +35,8 @@ import com.google.gwt.dev.util.collect.Maps; import static java.util.Arrays.asList; - +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockingDetails; diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/resolvers/ContentTypeResolverTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/resolvers/ContentTypeResolverTest.java index 9560d17a73..4e81c8fd96 100644 --- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/resolvers/ContentTypeResolverTest.java +++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/processors/resolvers/ContentTypeResolverTest.java @@ -32,7 +32,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; - import static com.gwtplatform.dispatch.rest.processors.AnnotatedElementBuilder.stubElementWithoutAnnotations; public class ContentTypeResolverTest { diff --git a/gwtp-core/gwtp-dispatch-rpc-client/pom.xml b/gwtp-core/gwtp-dispatch-rpc-client/pom.xml index 642726063e..bb2df92f76 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-client/pom.xml @@ -44,20 +44,16 @@ gwtp-dispatch-rpc-shared - com.google.gwt + org.gwtproject gwt-user - com.google.gwt + org.gwtproject gwt-dev - com.google.gwt.inject + io.github.gwtplus.gin gin - - com.google.inject - guice - diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java index 84b8ef144b..0679e38b96 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java +++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rpc.client; -import javax.inject.Inject; - import com.google.gwt.user.client.rpc.AsyncCallback; import com.gwtplatform.dispatch.rpc.client.interceptor.RpcInterceptorRegistry; import com.gwtplatform.dispatch.rpc.shared.Action; @@ -25,6 +23,8 @@ import com.gwtplatform.dispatch.rpc.shared.Result; import com.gwtplatform.dispatch.shared.SecurityCookieAccessor; +import jakarta.inject.Inject; + /** * The default implementation for {@link RpcDispatchCallFactory}. */ diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java index fe4f57318e..2da71f6a7e 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java +++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java @@ -16,13 +16,13 @@ package com.gwtplatform.dispatch.rpc.client; -import javax.inject.Inject; - import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.user.client.rpc.RpcRequestBuilder; import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync; +import jakarta.inject.Inject; + /** * This class is an extension of {@link RpcDispatchAsync} and configures the right service entry point and request * headers for Phone Gap applications. diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java index d513af0b4b..1246262535 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java +++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rpc.client; -import javax.inject.Inject; - import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.gwtplatform.dispatch.rpc.shared.Action; @@ -26,6 +24,8 @@ import com.gwtplatform.dispatch.rpc.shared.Result; import com.gwtplatform.dispatch.shared.DispatchRequest; +import jakarta.inject.Inject; + /** * This class is the default implementation of {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}, which is * essentially the client-side access to the {@link com.gwtplatform.dispatch.rpc.server.Dispatch} class on the diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java index 285f6e4302..e05edadb72 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java +++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rpc.client.gin; -import javax.inject.Singleton; - import com.google.gwt.core.client.GWT; import com.google.inject.Provides; import com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor; @@ -36,6 +34,8 @@ import com.gwtplatform.dispatch.rpc.shared.DispatchService; import com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync; +import jakarta.inject.Singleton; + /** * An implementation of {@link AbstractDispatchAsyncModule} that uses Remote Procedure Calls (RPC). *

diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java index 5bbd2b0499..1d334dd628 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java +++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java @@ -85,7 +85,7 @@ protected void register(final RpcInterceptor handler) { } /** - * Register a {@link javax.inject.Provider} of a client-side interceptor. + * Register a {@link jakarta.inject.Provider} of a client-side interceptor. * * @param actionType The type of action that the client-side interceptor supports. * @param handlerProvider The {@link com.google.inject.Provider} of the handler. @@ -111,7 +111,7 @@ protected void register(Class actionType, * Register a client-side interceptor that is part of a {@link com.gwtplatform.common.client.ProviderBundle}. * * @param actionType The type of that the client-side interceptor supports. - * @param bundleProvider The {@link javax.inject.Provider} of the {@link com.gwtplatform.common.client + * @param bundleProvider The {@link jakarta.inject.Provider} of the {@link com.gwtplatform.common.client * .ProviderBundle}. * @param providerId The id of the client-side interceptor provider. */ diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml b/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml index 066ddfd7cf..3f0ee9c459 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml +++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml index 361921496b..32ccc0eac0 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml @@ -21,7 +21,7 @@ gwtp-dispatch-rpc-shared - com.google.gwt + org.gwtproject gwt-user diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java index 822732aebf..6279e045a0 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java @@ -16,12 +16,12 @@ package com.gwtplatform.dispatch.rpc.server.guice; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.gwtplatform.dispatch.rpc.server.AbstractDispatchImpl; import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorRegistry; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class DispatchImpl extends AbstractDispatchImpl { diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java index 9a139921a6..f09d14cf56 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rpc.server.guice; -import javax.inject.Singleton; - import com.google.inject.Inject; import com.gwtplatform.dispatch.rpc.server.AbstractDispatchServiceImpl; import com.gwtplatform.dispatch.rpc.server.Dispatch; @@ -25,6 +23,8 @@ import com.gwtplatform.dispatch.rpc.server.logger.DispatchServiceLogHandler; import com.gwtplatform.dispatch.shared.SecurityCookie; +import jakarta.inject.Singleton; + /** * This is the server-side implementation of the {@link com.gwtplatform.dispatch.rpc.shared.DispatchService}, * for which the client-side async service is {@link com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync}. diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java index 74c13a2544..91c90fce77 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java @@ -62,9 +62,9 @@ protected , R extends Result> void bindHandler( Class actionClass, Class> handlerClass) { bind(ActionHandlerValidatorMap.class).annotatedWith( UniqueAnnotations.create()).toInstance( - new ActionHandlerValidatorMapImpl<>(actionClass, - new ActionHandlerValidatorClass<>(handlerClass, - DefaultActionValidator.class))); + new ActionHandlerValidatorMapImpl<>(actionClass, + new ActionHandlerValidatorClass<>(handlerClass, + DefaultActionValidator.class))); } /** @@ -79,9 +79,9 @@ protected , R extends Result> void bindHandler( Class actionValidator) { bind(ActionHandlerValidatorMap.class).annotatedWith( UniqueAnnotations.create()).toInstance( - new ActionHandlerValidatorMapImpl<>( + new ActionHandlerValidatorMapImpl<>( actionClass, - new ActionHandlerValidatorClass<>(handlerClass, actionValidator))); + new ActionHandlerValidatorClass<>(handlerClass, actionValidator))); } @Override diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java index 25458abfc9..95068f0de5 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java @@ -16,12 +16,12 @@ package com.gwtplatform.dispatch.rpc.server.guice; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.gwtplatform.dispatch.rpc.server.AbstractRandomSecurityCookieFilter; import com.gwtplatform.dispatch.shared.SecurityCookie; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class RandomSecurityCookieFilter extends AbstractRandomSecurityCookieFilter { diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java index 7f1d8fb429..3aa0bd81dc 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java @@ -16,13 +16,13 @@ package com.gwtplatform.dispatch.rpc.server.guice.actionhandlervalidator; -import javax.inject.Inject; - import com.google.inject.Injector; import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorLinkerHelper; import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorRegistry; import com.gwtplatform.dispatch.rpc.server.guice.GuiceBeanProvider; +import jakarta.inject.Inject; + /** * This class links any registered {@link com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler ActionHandler} * and {@link com.gwtplatform.dispatch.rpc.server.actionvalidator.ActionValidator ActionValidator} diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java index e3306027a0..52e5f4a010 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java @@ -18,9 +18,6 @@ import java.util.concurrent.ConcurrentHashMap; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.inject.Injector; import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorClass; import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorInstance; @@ -29,6 +26,9 @@ import com.gwtplatform.dispatch.rpc.shared.Action; import com.gwtplatform.dispatch.rpc.shared.Result; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + /** * This is a lazy-loading implementation of the registry. It will only create action handlers and validators when they * are first used. All {@link com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler} and diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java index 2f929f082e..8c960e6c6b 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java @@ -16,13 +16,13 @@ package com.gwtplatform.dispatch.rpc.server.guice.request; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; - import com.gwtplatform.dispatch.rpc.server.RequestProvider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServletRequest; + @Singleton public class DefaultRequestProvider implements RequestProvider { diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java index 90f43a57d5..2c898a9fcc 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rpc.server; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.junit.Test; @@ -28,6 +26,8 @@ import com.gwtplatform.dispatch.rpc.shared.ServiceException; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java index b3fa238d8d..b339de6c4c 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.dispatch.rpc.server; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.junit.Test; @@ -27,6 +25,8 @@ import com.gwtplatform.dispatch.rpc.shared.ServiceException; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java index 6be9e95b2b..1445727ee6 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java @@ -16,12 +16,12 @@ package com.gwtplatform.dispatch.rpc.server; -import javax.inject.Inject; - import com.gwtplatform.dispatch.rpc.server.actionhandler.AbstractActionHandler; import com.gwtplatform.dispatch.rpc.shared.NoResult; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.inject.Inject; + public class HandlerThatThrowsActionException extends AbstractActionHandler { @Inject HandlerThatThrowsActionException() { diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml index 8068011279..67b2524257 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml @@ -22,7 +22,7 @@ - com.google.gwt + org.gwtproject gwt-user diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java index b261ae1781..6678f510a1 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java @@ -18,11 +18,6 @@ import java.io.IOException; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -34,6 +29,11 @@ import com.gwtplatform.dispatch.rpc.server.RequestProvider; import com.gwtplatform.dispatch.rpc.server.logger.DispatchServiceLogHandler; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Dispatch request to the handler. */ diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java index ea5878375f..e1f807a943 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java +++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java @@ -16,13 +16,13 @@ package com.gwtplatform.dispatch.rpc.server.spring.request; -import javax.servlet.http.HttpServletRequest; - import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import com.gwtplatform.dispatch.rpc.server.RequestProvider; +import jakarta.servlet.http.HttpServletRequest; + /** * Request provider. */ diff --git a/gwtp-core/gwtp-dispatch-rpc-server/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server/pom.xml index 146468cc24..c6c579bb03 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-server/pom.xml @@ -21,8 +21,17 @@ gwtp-dispatch-rpc-shared - com.google.gwt + org.gwtproject gwt-user + + org.gwtproject + gwt-servlet-jakarta + ${gwt.version} + + + jakarta.servlet + jakarta.servlet-api + diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java index ceae49dcf3..a395cb0364 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java +++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java @@ -16,10 +16,7 @@ package com.gwtplatform.dispatch.rpc.server; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; - -import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import com.google.gwt.user.server.rpc.jakarta.RemoteServiceServlet; import com.gwtplatform.dispatch.rpc.server.logger.DispatchServiceLogHandler; import com.gwtplatform.dispatch.rpc.shared.Action; import com.gwtplatform.dispatch.rpc.shared.DispatchService; @@ -27,6 +24,9 @@ import com.gwtplatform.dispatch.rpc.shared.ServiceException; import com.gwtplatform.dispatch.shared.ActionException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + /** * This is the server-side implementation of the {@link DispatchService}, for which the client-side async service is * {@link com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync}. diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java index 1b6d60af90..daefb56552 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java +++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java @@ -20,15 +20,15 @@ import java.math.BigInteger; import java.security.SecureRandom; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This filter will automatically inject a security cookie inside the request the first time the page is loaded. This diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java index 94a39e43c0..e01c5c9f7f 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java +++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java @@ -16,7 +16,7 @@ package com.gwtplatform.dispatch.rpc.server; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public interface RequestProvider { HttpServletRequest getServletRequest(); diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml b/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml index bc82329c6b..54bf6f857f 100644 --- a/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml @@ -46,7 +46,7 @@ - com.google.gwt + org.gwtproject gwt-user diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml index 8764acdac8..9be1748769 100644 --- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml +++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-dispatch-rpc-test/pom.xml b/gwtp-core/gwtp-dispatch-rpc-test/pom.xml index 43e1c897f2..b90ba09a58 100644 --- a/gwtp-core/gwtp-dispatch-rpc-test/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-test/pom.xml @@ -22,7 +22,7 @@ gwtp-dispatch-rpc-shared - com.google.gwt + org.gwtproject gwt-user diff --git a/gwtp-core/gwtp-mvp-client/pom.xml b/gwtp-core/gwtp-mvp-client/pom.xml index db523c6c05..ce37e92ee5 100644 --- a/gwtp-core/gwtp-mvp-client/pom.xml +++ b/gwtp-core/gwtp-mvp-client/pom.xml @@ -71,21 +71,17 @@ gwtp-mvp-shared - com.google.gwt + org.gwtproject gwt-user - com.google.gwt + org.gwtproject gwt-dev - com.google.gwt.inject + io.github.gwtplus.gin gin - - com.google.inject - guice - diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java index bf4f9d4399..1c13e5f72f 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java @@ -16,8 +16,8 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Bind this class to indicate that you wish to globally disable automatic binding in diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java index 8b93ed7885..7fa6dad890 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java @@ -18,7 +18,7 @@ /** * Defines a class that will be executed after injection happens. Your bootstrapper must contain a default, empty - * constructor or an {@linkplain javax.inject.Inject @Inject}ed constructor. + * constructor or an {@linkplain jakarta.inject.Inject @Inject}ed constructor. *

* This class is responsible for calling {@link com.gwtplatform.mvp.client.proxy.PlaceManager#revealCurrentPlace * PlaceManager#revealCurrentPlace}. This is particularly useful when you need to do initialisation steps before the diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java index cf567fc00b..648301e719 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java @@ -16,10 +16,10 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; - import com.gwtplatform.mvp.client.proxy.PlaceManager; +import jakarta.inject.Inject; + /** * The default Bootstrapper that is used if none is specified in {@link * com.gwtplatform.mvp.client.annotations.UseBootstrapper @UseBootstrapper}. diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java index 940d084643..315b1d70b1 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java @@ -18,10 +18,10 @@ import java.util.List; -import javax.inject.Inject; - import com.google.web.bindery.event.shared.HandlerRegistration; +import jakarta.inject.Inject; + /** * The implementation of {@link HandlerContainer}. Inherit from this class if * you want subclasses that can contain handlers. diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java index fd11adbdfd..be6db4923d 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java @@ -28,7 +28,7 @@ public interface HasPopupSlot { * * @param child The popup child, a {@link PresenterWidget}. */ - void addToPopupSlot(final PresenterWidget child); + void addToPopupSlot(PresenterWidget child); /** * This method removes popup content within the {@link Presenter}. The view associated with the {@code content}'s @@ -37,5 +37,5 @@ public interface HasPopupSlot { * @param child The popup child, a {@link PresenterWidget}, which has previously been added using {@link * #addToPopupSlot(PresenterWidget)}. */ - void removeFromPopupSlot(final PresenterWidget child); + void removeFromPopupSlot(PresenterWidget child); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java index fc3c38baee..7915e09e24 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; - import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style; @@ -40,6 +38,8 @@ import com.gwtplatform.mvp.client.proxy.RevealRootPopupContentEvent; import com.gwtplatform.mvp.client.proxy.RevealRootPopupContentHandler; +import jakarta.inject.Inject; + /** * This is the presenter for the top-level of the application. It is derived * from presenter widget, but it's just because it doesn't need a proxy has it diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java index cb6e3dc244..f61f0ad595 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java @@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.InsertPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Widget; - import com.gwtplatform.mvp.client.presenter.slots.IsSingleSlot; import com.gwtplatform.mvp.client.presenter.slots.OrderedSlot; import com.gwtplatform.mvp.client.presenter.slots.Slot; diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java index 926eb56da4..8aca01e0f3 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java @@ -30,7 +30,7 @@ * and processed by GIN. *

* The class implementing {@code IndirectProvider} must provide a constructor which takes the original provider as the - * single argument. For presenters which use {@link ProxyStandard @ProxyStandard} this is {@link javax.inject.Provider + * single argument. For presenters which use {@link ProxyStandard @ProxyStandard} this is {@link jakarta.inject.Provider * Provider<T>}; for presenters which use {@link ProxyCodeSplit @ProxyCodeSplit} or {@link ProxyCodeSplitBundle * @ProxyCodeSplitBundle } this is {@link com.google.gwt.inject.client.AsyncProvider AsyncProvider<T>} *

diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java index 0f8ea4f04b..83144b1bdf 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java @@ -18,8 +18,6 @@ import java.lang.annotation.Annotation; -import javax.inject.Singleton; - import com.google.gwt.inject.client.AbstractGinModule; import com.google.web.bindery.event.shared.EventBus; import com.google.web.bindery.event.shared.SimpleEventBus; @@ -33,6 +31,8 @@ import com.gwtplatform.mvp.shared.proxy.ParameterTokenFormatter; import com.gwtplatform.mvp.shared.proxy.TokenFormatter; +import jakarta.inject.Singleton; + /** * Module with default GWTP bindings. You can use {@link DefaultModule.Builder} to configure each required bindings. */ diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java index 0984c38b5c..8fd7539712 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java @@ -22,5 +22,5 @@ * Handler for {@link AsyncCallFailEvent}. */ public interface AsyncCallFailHandler extends EventHandler { - void onAsyncCallFail(final AsyncCallFailEvent asyncCallFailEvent); + void onAsyncCallFail(AsyncCallFailEvent asyncCallFailEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java index c2ccd5341d..ef34432b87 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java @@ -22,5 +22,5 @@ * Handler for {@link AsyncCallStartEvent}. */ public interface AsyncCallStartHandler extends EventHandler { - void onAsyncCallStart(final AsyncCallStartEvent asyncCallStartEvent); + void onAsyncCallStart(AsyncCallStartEvent asyncCallStartEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java index 0091194ab0..4111535e95 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java @@ -22,5 +22,5 @@ * Handler for {@link AsyncCallSucceedEvent}. */ public interface AsyncCallSucceedHandler extends EventHandler { - void onAsyncCallSucceed(final AsyncCallSucceedEvent asyncCallSucceedEvent); + void onAsyncCallSucceed(AsyncCallSucceedEvent asyncCallSucceedEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java index b08af2ccae..93639eb96a 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client.proxy; -import javax.inject.Inject; - import com.google.gwt.place.shared.PlaceHistoryHandler.Historian; import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.annotations.DefaultPlace; @@ -26,6 +24,8 @@ import com.gwtplatform.mvp.shared.proxy.PlaceRequest; import com.gwtplatform.mvp.shared.proxy.TokenFormatter; +import jakarta.inject.Inject; + /** * This is a subtype of {@link com.gwtplatform.mvp.client.proxy.PlaceManagerImpl PlaceManagerImpl} that uses * custom name tokens to reveal default, error and unauthorized places. diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java index 065e1beda4..9c9690a8fb 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java @@ -22,6 +22,5 @@ * Handler for {@link LockInteractionEvent}. */ public interface LockInteractionHandler extends EventHandler { - void onLockInteraction( - final LockInteractionEvent lockInteractionEvent); + void onLockInteraction(LockInteractionEvent lockInteractionEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java index 3982878dd6..05284de38a 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java @@ -22,5 +22,5 @@ * Handler for {@link NavigationEvent}. */ public interface NavigationHandler extends EventHandler { - void onNavigation(final NavigationEvent navigationEvent); + void onNavigation(NavigationEvent navigationEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java index ce6e41cb2c..c42c3122af 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java @@ -22,6 +22,5 @@ * Handler for {@link NavigationRefusedEvent}. */ public interface NavigationRefusedHandler extends EventHandler { - void onNavigationRefused( - final NavigationRefusedEvent navigationRefusedEvent); + void onNavigationRefused(NavigationRefusedEvent navigationRefusedEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java index d19be164ab..3b1a024a9e 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java @@ -16,14 +16,14 @@ package com.gwtplatform.mvp.client.proxy; -import javax.inject.Inject; - import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.common.client.IndirectProvider; import com.gwtplatform.mvp.client.Presenter; +import jakarta.inject.Inject; + /** * @param

The presenter's type. */ diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java index c630057680..844aac39cb 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client.proxy; -import javax.inject.Inject; - import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.user.client.Command; @@ -29,6 +27,8 @@ import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.shared.proxy.PlaceRequest; +import jakarta.inject.Inject; + /** * A useful mixing class to define a {@link Proxy} that is also a {@link Place}. * You can usually inherit from the simpler form {@link ProxyPlace}. diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java index 697957de32..420ccc600b 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java @@ -20,6 +20,6 @@ public interface ResetPresentersHandler extends EventHandler { - void onResetPresenters(final ResetPresentersEvent resetPresentersEvent); + void onResetPresenters(ResetPresentersEvent resetPresentersEvent); } diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/DefaultGatekeeperProcessor.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/DefaultGatekeeperProcessor.java index bfb2274761..dd69718c43 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/DefaultGatekeeperProcessor.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/DefaultGatekeeperProcessor.java @@ -23,7 +23,6 @@ import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; -import javax.inject.Singleton; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; @@ -42,6 +41,8 @@ import com.gwtplatform.processors.tools.exceptions.UnableToProcessException; import com.gwtplatform.processors.tools.utils.MetaInfResource; +import jakarta.inject.Singleton; + import static com.google.auto.common.MoreElements.hasModifiers; import static com.gwtplatform.common.processors.module.GwtpAppModuleProcessor.MAIN_MODULE_TYPE; import static com.gwtplatform.processors.tools.bindings.BindingContext.newAnnotatedBinding; @@ -111,8 +112,8 @@ private Set extractGatekeepers(RoundEnvironment roundEnv) { } private void validateGatekeepers(Set gatekeepers) { - if ((!generated && gatekeepers.size() > 1) - || (generated && !gatekeepers.isEmpty())) { + if (!generated && gatekeepers.size() > 1 + || generated && !gatekeepers.isEmpty()) { logger.error() .context(gatekeepers.iterator().next()) .log("Multiple classes annotated with @DefaultGatekeeper. You may only have one or none."); diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/PlaceTokenRegistryProcessor.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/PlaceTokenRegistryProcessor.java index 1c2505b2b3..f3c051b354 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/PlaceTokenRegistryProcessor.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/PlaceTokenRegistryProcessor.java @@ -22,7 +22,6 @@ import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; -import javax.inject.Singleton; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.tools.FileObject; @@ -36,6 +35,8 @@ import com.gwtplatform.processors.tools.domain.Type; import com.gwtplatform.processors.tools.utils.MetaInfResource; +import jakarta.inject.Singleton; + import static com.gwtplatform.common.processors.module.GwtpAppModuleProcessor.MAIN_MODULE_TYPE; import static com.gwtplatform.processors.tools.bindings.BindingContext.newBinding; diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/bundle/BundleDetails.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/bundle/BundleDetails.java index 0b3ae3939d..ff47aa52b8 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/bundle/BundleDetails.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/bundle/BundleDetails.java @@ -22,7 +22,7 @@ import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleAnnotationValueVisitor7; +import javax.lang.model.util.SimpleAnnotationValueVisitor8; import com.google.common.base.CaseFormat; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplitBundle.NoOpProviderBundle; @@ -111,7 +111,7 @@ private void initialize() { private String extractBundleValue() { return getAnnotationValue(codeSplitBundleMirror, "value") - .accept(new SimpleAnnotationValueVisitor7("") { + .accept(new SimpleAnnotationValueVisitor8("") { @Override public String visitString(String value, Void v) { return sanitizeBundleName(value); @@ -126,7 +126,7 @@ private String sanitizeBundleName(String name) { private int extractBundleId() { return getAnnotationValue(codeSplitBundleMirror, "id") - .accept(new SimpleAnnotationValueVisitor7(-1) { + .accept(new SimpleAnnotationValueVisitor8(-1) { @Override public Integer visitInt(int id, Void v) { return id; @@ -136,7 +136,7 @@ public Integer visitInt(int id, Void v) { private Type extractBundleClass() { return getAnnotationValue(codeSplitBundleMirror, "bundleClass") - .accept(new SimpleAnnotationValueVisitor7() { + .accept(new SimpleAnnotationValueVisitor8() { @Override public Type visitType(TypeMirror bundleClass, Void v) { boolean isNotSpecified = asTypeElement(bundleClass).getQualifiedName() @@ -161,7 +161,7 @@ private void validateBundleConfiguration() { + "Either specify a bundle name or a Bundle Class with an ID. " + "Defaulting to @ProxyStandard."); valid = false; - } else if ((id < 0 && bundleType != null) || (id > -1 && bundleType == null)) { + } else if (id < 0 && bundleType != null || id > -1 && bundleType == null) { logger.mandatoryWarning() .context(proxyElement, codeSplitBundleMirror) .log("@ProxyCodeSplitBundle used with an invalid Bundle Class configuration. " diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPoint.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPoint.java index 706a64a62c..406143d172 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPoint.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPoint.java @@ -23,7 +23,7 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleAnnotationValueVisitor7; +import javax.lang.model.util.SimpleAnnotationValueVisitor8; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -141,7 +141,7 @@ private DeclaredType getTypeMirrorFromAnnotation(Class ann Optional annotation = getAnnotationMirror(element, annotationClass); if (annotation.isPresent()) { return getAnnotationValue(annotation.get(), "value") - .accept(new SimpleAnnotationValueVisitor7(null) { + .accept(new SimpleAnnotationValueVisitor8(null) { @Override public DeclaredType visitType(TypeMirror typeMirror, Void nothing) { return asDeclared(typeMirror); diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPointProcessor.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPointProcessor.java index d580976ea3..dd67bb67d6 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPointProcessor.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/entrypoint/EntryPointProcessor.java @@ -21,7 +21,6 @@ import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; -import javax.inject.Singleton; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; @@ -33,6 +32,8 @@ import com.gwtplatform.processors.tools.bindings.BindingsProcessors; import com.gwtplatform.processors.tools.domain.Type; +import jakarta.inject.Singleton; + import static com.google.auto.common.MoreElements.asType; import static com.gwtplatform.common.processors.module.GwtpAppModuleProcessor.MAIN_MODULE_TYPE; import static com.gwtplatform.processors.tools.bindings.BindingContext.newBinding; diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/AbstractProxyDetails.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/AbstractProxyDetails.java index 09fa2150dc..52e1c6694f 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/AbstractProxyDetails.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/AbstractProxyDetails.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; -import javax.inject.Provider; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -31,7 +30,7 @@ import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleAnnotationValueVisitor7; +import javax.lang.model.util.SimpleAnnotationValueVisitor8; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; @@ -51,8 +50,9 @@ import com.gwtplatform.processors.tools.logger.Logger; import com.gwtplatform.processors.tools.utils.Utils; -import static java.util.Arrays.asList; +import jakarta.inject.Provider; +import static java.util.Arrays.asList; import static javax.lang.model.element.ElementKind.CLASS; import static javax.lang.model.element.Modifier.ABSTRACT; import static javax.lang.model.element.Modifier.PRIVATE; @@ -61,7 +61,6 @@ import static javax.lang.model.util.ElementFilter.constructorsIn; import static javax.lang.model.util.ElementFilter.fieldsIn; import static javax.lang.model.util.ElementFilter.methodsIn; - import static com.google.auto.common.AnnotationMirrors.getAnnotationValue; import static com.google.auto.common.MoreElements.asType; import static com.google.auto.common.MoreElements.getAnnotationMirror; @@ -260,7 +259,7 @@ private Optional extractCustomProvider() { if (annotationMirror.isPresent()) { AnnotationValue value = getAnnotationValue(annotationMirror.get(), "value"); - DeclaredType valueType = value.accept(new SimpleAnnotationValueVisitor7() { + DeclaredType valueType = value.accept(new SimpleAnnotationValueVisitor8() { @Override public DeclaredType visitType(TypeMirror typeMirror, Void ignored) { return asDeclared(typeMirror); diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyEventMethod.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyEventMethod.java index 19beab4a81..d09af248c3 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyEventMethod.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyEventMethod.java @@ -40,7 +40,6 @@ import static javax.lang.model.util.ElementFilter.fieldsIn; import static javax.lang.model.util.ElementFilter.methodsIn; - import static com.google.auto.common.MoreElements.hasModifiers; import static com.google.auto.common.MoreTypes.asDeclared; import static com.google.auto.common.MoreTypes.asExecutable; diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyPlaceDetails.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyPlaceDetails.java index 31de636c5d..0d87ec4902 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyPlaceDetails.java +++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/processors/proxy/ProxyPlaceDetails.java @@ -26,7 +26,7 @@ import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.SimpleAnnotationValueVisitor7; +import javax.lang.model.util.SimpleAnnotationValueVisitor8; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; @@ -105,7 +105,7 @@ private TypeMirror extractGatekeeperMirror() { if (annotationMirror.isPresent()) { AnnotationValue value = getAnnotationValue(annotationMirror.get(), "value"); - return value.accept(new SimpleAnnotationValueVisitor7(null) { + return value.accept(new SimpleAnnotationValueVisitor8(null) { @Override public TypeMirror visitType(TypeMirror typeMirror, Void o) { return typeMirror; @@ -129,7 +129,7 @@ private void extractGatekeeperParams() { gatekeeperParams = new ArrayList<>(); if (annotation != null && verifyIsGatekeeperWithParams()) { - FluentIterable.of(annotation.value()) + FluentIterable.from(annotation.value()) .transform(param -> param .replace("\\", "\\\\") .replace("\"", "\\\"")) diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml index 161e508eb9..b0bbdc3d1e 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml +++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml index aaafd3a1f6..028be73c3f 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml +++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml index 21fcceef77..829d4cc461 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml +++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml index 58231114ab..3c8a539fa5 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml +++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/bundle/ProviderBundle.vm b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/bundle/ProviderBundle.vm index 3b1284b4fb..7b14026b3a 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/bundle/ProviderBundle.vm +++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/bundle/ProviderBundle.vm @@ -3,8 +3,9 @@ package $impl.packageName; import java.util.AbstractMap.SimpleEntry; import javax.annotation.Generated; -import javax.inject.Inject; -import javax.inject.Provider; + +import jakarta.inject.Inject; +import jakarta.inject.Provider; import com.gwtplatform.common.client.NamedProviderBundle; import com.gwtplatform.common.client.annotations.ProviderBundle; diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/proxy/macros.vm b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/proxy/macros.vm index 6478014469..9d4af6e42a 100644 --- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/proxy/macros.vm +++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/processors/proxy/macros.vm @@ -1,6 +1,6 @@ #macro(printProxyImports $proxy) #set($bundle=$proxy.bundleDetails) -import javax.inject.Inject; +import jakarta.inject.Inject; #if($bundle && !$bundle.isManualBundle()) #if(!$proxy.customProvider) import com.gwtplatform.common.client.CodeSplitNamedBundleProvider; @@ -17,7 +17,7 @@ import com.google.gwt.inject.client.AsyncProvider; import com.gwtplatform.common.client.CodeSplitProvider; #end #else -import javax.inject.Provider; +import jakarta.inject.Provider; #if(!$proxy.customProvider) import com.gwtplatform.common.client.StandardProvider; #end diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java index 8cfbeb3187..25eb8e92ea 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java @@ -16,13 +16,13 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.junit.Test; import org.junit.runner.RunWith; +import jakarta.inject.Inject; + import static org.junit.Assert.assertFalse; /** diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java index c134c5412f..c34cd930b4 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.jukito.TestSingleton; import org.junit.Test; @@ -25,6 +23,8 @@ import com.google.web.bindery.event.shared.HandlerRegistration; +import jakarta.inject.Inject; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java index ec09a003ca..1a3c950967 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; - import org.jukito.JukitoRunner; import org.jukito.TestSingleton; import org.junit.Test; @@ -26,6 +24,8 @@ import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.proxy.Proxy; +import jakarta.inject.Inject; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java index dc42e702fd..ec8860a074 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java @@ -16,9 +16,6 @@ package com.gwtplatform.mvp.client; -import javax.inject.Inject; -import javax.inject.Named; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestSingleton; @@ -34,6 +31,9 @@ import com.google.web.bindery.event.shared.HandlerRegistration; import com.gwtplatform.mvp.client.presenter.slots.Slot; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/ViewImplTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/ViewImplTest.java index 7b20e76e56..c3f9f368f2 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/ViewImplTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/ViewImplTest.java @@ -34,13 +34,12 @@ import com.google.gwt.user.client.ui.InsertPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Widget; - import com.gwtplatform.mvp.client.presenter.slots.OrderedSlot; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java index 98e790f1db..6820298460 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client.gwt.mvp; -import javax.inject.Inject; - import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; @@ -27,6 +25,8 @@ import com.gwtplatform.mvp.client.gwt.mvp.AdminPresenterTestUtilGwt.MyView; import com.gwtplatform.mvp.client.proxy.ProxyPlace; +import jakarta.inject.Inject; + /** * A test presenter meant to be run in a GWTTestCase. */ diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java index 7643beebb8..722d5ed422 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java @@ -16,7 +16,7 @@ package com.gwtplatform.mvp.client.gwt.mvp; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * A class that counts the number of times a Ginjector was created. diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java index 99d1181fce..72ac79400b 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java @@ -16,9 +16,6 @@ package com.gwtplatform.mvp.client.gwt.mvp; -import javax.inject.Inject; -import javax.inject.Provider; - import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.PopupViewCloseHandler; import com.gwtplatform.mvp.client.Presenter; @@ -29,6 +26,9 @@ import com.gwtplatform.mvp.client.gwt.mvp.MainPresenterTestUtilGwt.MyView; import com.gwtplatform.mvp.client.proxy.ProxyPlace; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + /** * A test presenter meant to be run in a GWTTestCase. */ diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java index 3f7af34280..5e22e569cd 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java @@ -16,13 +16,13 @@ package com.gwtplatform.mvp.client.gwt.mvp; -import javax.inject.Inject; - import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.PopupView; import com.gwtplatform.mvp.client.PopupViewCloseHandler; import com.gwtplatform.mvp.client.PresenterWidget; +import jakarta.inject.Inject; + public class PopupPresenterTestUtilGwt extends PresenterWidget { interface MyView extends PopupView { } diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java index 63c670cf03..35be0dee19 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java @@ -16,12 +16,12 @@ package com.gwtplatform.mvp.client.gwt.mvp; -import javax.inject.Inject; - import com.google.gwt.user.client.ui.DialogBox; import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.PopupViewImpl; +import jakarta.inject.Inject; + public class PopupViewTestUtilGwt extends PopupViewImpl implements PopupPresenterTestUtilGwt.MyView { @Inject PopupViewTestUtilGwt(EventBus eventBus) { diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java index 4a6cbf79ea..3c6b2e1477 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java @@ -16,9 +16,6 @@ package com.gwtplatform.mvp.client.mvp; -import javax.inject.Inject; -import javax.inject.Named; - import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.PresenterWidget; @@ -27,6 +24,9 @@ import com.gwtplatform.mvp.client.presenter.slots.SingleSlot; import com.gwtplatform.mvp.client.proxy.Proxy; +import jakarta.inject.Inject; +import jakarta.inject.Named; + /** * This is the test presenter. */ diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java index f4cb69fb40..035b2004fc 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client.mvp; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestSingleton; @@ -30,6 +28,8 @@ import com.gwtplatform.mvp.client.PresenterWidget; import com.gwtplatform.mvp.client.View; +import jakarta.inject.Inject; + /** * Test behaviour when a mock {@link PresenterWidget} is injected. */ diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java index 5ca63f8729..e541f279f4 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java @@ -16,8 +16,6 @@ package com.gwtplatform.mvp.client.mvp; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestSingleton; @@ -30,6 +28,8 @@ import com.gwtplatform.mvp.client.PresenterWidget; import com.gwtplatform.mvp.client.View; +import jakarta.inject.Inject; + /** * Test behaviour when a real {@link com.gwtplatform.mvp.client.PresenterWidget} is injected. */ diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java index d4dcd5c5b5..5d884a0e48 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java @@ -16,12 +16,12 @@ package com.gwtplatform.mvp.client.mvp; -import javax.inject.Inject; - import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.client.PresenterWidget; import com.gwtplatform.mvp.client.View; +import jakarta.inject.Inject; + /** * This is the test presenter. */ diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java index 264d16d587..804b8b66e2 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java @@ -18,10 +18,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestEagerSingleton; @@ -40,6 +36,10 @@ import com.gwtplatform.mvp.shared.proxy.PlaceRequest; import com.gwtplatform.tester.DeferredCommandManager; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java index 84ccfcba95..b6c05b6b88 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java @@ -19,9 +19,6 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; -import javax.inject.Provider; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestEagerSingleton; @@ -39,6 +36,9 @@ import com.gwtplatform.mvp.shared.proxy.PlaceRequest; import com.gwtplatform.tester.DeferredCommandManager; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java index a83e84998e..4aedc3463f 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java @@ -18,8 +18,6 @@ import java.util.Collections; -import javax.inject.Inject; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestSingleton; @@ -31,10 +29,12 @@ import com.gwtplatform.mvp.shared.proxy.PlaceRequest; import com.gwtplatform.tester.DeferredCommandManager; +import jakarta.inject.Inject; + import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; @@ -88,7 +88,7 @@ public void placeManagerUserCallUpdateHistoryWhenRevealingPlace() { assertEquals(1, placeRequest.getParameterNames().size()); assertEquals("dummyValue", placeRequest.getParameter("dummyParam", null)); - verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false)); + verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false)); } @Test @@ -112,7 +112,7 @@ public void placeManagerRevealRelativePlaceWithZeroLevelShouldGoToDefaultPlace() assertEquals("defaultPlace", placeRequest.getNameToken()); assertEquals(0, placeRequest.getParameterNames().size()); - verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false)); + verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false)); } @Test @@ -136,6 +136,6 @@ public void placeManagerRevealPlaceHierarchyWithEmptyHierarchyShouldGoToDefaultP assertEquals("defaultPlace", placeRequest.getNameToken()); assertEquals(0, placeRequest.getParameterNames().size()); - verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false)); + verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false)); } } diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java index 13d6f1d104..363fcb0283 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java @@ -18,9 +18,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Provider; - import org.jukito.JukitoModule; import org.jukito.JukitoRunner; import org.jukito.TestEagerSingleton; @@ -39,9 +36,12 @@ import com.gwtplatform.mvp.shared.proxy.PlaceRequest; import com.gwtplatform.tester.DeferredCommandManager; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -265,7 +265,7 @@ public void placeManagerRevealPlaceStandard( verify(presenter).prepareFromRequest(placeRequest); verify(presenter).forceReveal(); - verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false)); + verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false)); assertEquals(1, navigationHandler.navCount); placeRequest = navigationHandler.lastEvent.getRequest(); @@ -289,7 +289,7 @@ public void placeManagerRevealPlaceRedirectInPrepareFromRequestNoHistory() { // Then // assert called only once - verify(gwtWindowMethods, times(1)).setBrowserHistoryToken(any(String.class), eq(false)); + verify(gwtWindowMethods, times(1)).setBrowserHistoryToken(isNull(), eq(false)); PlaceRequest finalPlaceRequest = placeManager.getCurrentPlaceRequest(); assertEquals("dummyNameTokenBasic", finalPlaceRequest.getNameToken()); diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java index 5cea1e8f66..d5b2423d82 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java +++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java @@ -16,13 +16,13 @@ package com.gwtplatform.mvp.client.proxy; -import javax.inject.Inject; - import com.google.gwt.place.shared.PlaceHistoryHandler.Historian; import com.google.web.bindery.event.shared.EventBus; import com.gwtplatform.mvp.shared.proxy.PlaceRequest; import com.gwtplatform.mvp.shared.proxy.TokenFormatter; +import jakarta.inject.Inject; + import static org.mockito.Mockito.mock; /** diff --git a/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml b/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml index ee2c22ab81..ed6726f769 100644 --- a/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml +++ b/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-mvp-shared/pom.xml b/gwtp-core/gwtp-mvp-shared/pom.xml index e3378bf66f..41091a41ff 100644 --- a/gwtp-core/gwtp-mvp-shared/pom.xml +++ b/gwtp-core/gwtp-mvp-shared/pom.xml @@ -32,8 +32,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java index 8983a376c2..17e2b95dfb 100644 --- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java +++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java @@ -20,10 +20,10 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; - import com.gwtplatform.common.shared.UrlUtils; +import jakarta.inject.Inject; + /** * Formats tokens from {@code String} values to {@link PlaceRequest} and {@link PlaceRequest} * hierarchies and vice-versa. The default implementation diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java index f978a653f5..5d95cb942b 100644 --- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java +++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import java.util.TreeSet; -import javax.inject.Inject; - import com.gwtplatform.common.shared.UrlUtils; +import jakarta.inject.Inject; + /** * Implementation of {@link TokenFormatter} with support for route like place names. *

@@ -223,9 +223,9 @@ public String toPlaceToken(PlaceRequest placeRequest) throws TokenFormatExceptio @Override public String toHistoryToken(List placeRequestHierarchy) throws TokenFormatException { - assert placeRequestHierarchy.size() == 1 : "Expected a place hierarchy with exactly one place."; + assert !placeRequestHierarchy.isEmpty() : "Expected a place hierarchy with one or more places."; - return toPlaceToken(placeRequestHierarchy.get(0)); + return toPlaceToken(placeRequestHierarchy.get(placeRequestHierarchy.size() - 1)); } @Override diff --git a/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml b/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml index a69eaf1074..9a67c2d6e5 100644 --- a/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml +++ b/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/gwtp-core/gwtp-processors/pom.xml b/gwtp-core/gwtp-processors/pom.xml index 1720d18224..014b82d2a2 100644 --- a/gwtp-core/gwtp-processors/pom.xml +++ b/gwtp-core/gwtp-processors/pom.xml @@ -46,7 +46,7 @@ - com.google.gwt + org.gwtproject gwt-user diff --git a/gwtp-core/gwtp-tester/pom.xml b/gwtp-core/gwtp-tester/pom.xml index 3d7bc757e4..f0bde10d11 100644 --- a/gwtp-core/gwtp-tester/pom.xml +++ b/gwtp-core/gwtp-tester/pom.xml @@ -30,15 +30,11 @@ gwtp-dispatch-rpc-server - com.google.gwt + org.gwtproject gwt-user - com.google.inject - guice - - - com.google.gwt.inject + io.github.gwtplus.gin gin @@ -54,7 +50,7 @@ test - com.google.gwt + org.gwtproject gwt-dev test diff --git a/gwtp-core/pom.xml b/gwtp-core/pom.xml index c96b1d65a0..45462241d5 100644 --- a/gwtp-core/pom.xml +++ b/gwtp-core/pom.xml @@ -44,9 +44,11 @@ gwt-maven-plugin ${gwt-maven-plugin.version} - -Xss1024k -Xmx512M + -Xss1024k -Xmx512M --add-opens=java.base/java.lang=ALL-UNNAMED **/*GwtTest.java,**/*GwtTestSuite.java htmlunit + true + FF 180 ${target.jdk} @@ -60,18 +62,18 @@ - com.google.gwt + org.gwtproject gwt-user ${gwt.version} - com.google.gwt + org.gwtproject gwt-dev ${gwt.version} - com.google.gwt - gwt-servlet + org.gwtproject + gwt-servlet-jakarta ${gwt.version} @@ -187,12 +189,12 @@ - com.google.gwt + org.gwtproject gwt-user ${gwt.version} - com.google.gwt + org.gwtproject gwt-dev ${gwt.version} @@ -214,21 +216,21 @@ ${guice.version} - com.google.gwt.inject + io.github.gwtplus.gin gin ${gin.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api.version} - javax.inject - javax.inject - ${javax.inject.version} + jakarta.inject + jakarta.inject-api + ${jakarta.inject.version} javax.ws.rs diff --git a/gwtp-crawler-service/.factorypath b/gwtp-crawler-service/.factorypath deleted file mode 100644 index 9606e6c7f2..0000000000 --- a/gwtp-crawler-service/.factorypath +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gwtp-crawler-service/pom.xml b/gwtp-crawler-service/pom.xml index e4a111d8bc..c27d459c07 100644 --- a/gwtp-crawler-service/pom.xml +++ b/gwtp-crawler-service/pom.xml @@ -28,14 +28,14 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api.version} - javax.inject - javax.inject - ${javax.inject.version} + jakarta.inject + jakarta.inject-api + ${jakarta.inject.version} diff --git a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java index a45b95a9b7..d10fb44cf4 100644 --- a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java +++ b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java @@ -26,12 +26,6 @@ import java.util.logging.Logger; import java.util.regex.Pattern; -import javax.inject.Provider; -import javax.inject.Singleton; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController; import com.gargoylesoftware.htmlunit.SilentCssErrorHandler; import com.gargoylesoftware.htmlunit.WebClient; @@ -39,10 +33,16 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.google.common.base.Strings; import com.google.inject.Inject; -import com.googlecode.objectify.Key; +import com.googlecode.objectify.ObjectifyService; import com.gwtplatform.crawlerservice.server.domain.CachedPage; import com.gwtplatform.crawlerservice.server.service.CachedPageDao; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Servlet that makes it possible to fetch an external page, renders it using HTMLUnit and returns the HTML page. */ @@ -107,7 +107,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) { if (!Strings.isNullOrEmpty(url)) { url = URLDecoder.decode(url, CHAR_ENCODING); - CachedPage cachedPage = cachedPageDao.get(Key.create(CachedPage.class, url)); + CachedPage cachedPage = cachedPageDao.get(ObjectifyService.key(CachedPage.class, url)); Date currDate = new Date(); @@ -216,9 +216,9 @@ private String renderPage(String url) throws IOException { webClient.setAjaxController(new SyncAllAjaxController()); webClient.setCssErrorHandler(new SilentCssErrorHandler()); - WebRequest webRequest = new WebRequest(new URL(url), "text/html"); + WebRequest webRequest = new WebRequest(new URL(url), "text/html", null); HtmlPage page = webClient.getPage(webRequest); - webClient.getJavaScriptEngine().pumpEventLoop(timeoutMillis); + webClient.getJavaScriptEngine().setJavaScriptTimeout(timeoutMillis); int waitForBackgroundJavaScript = webClient.waitForBackgroundJavaScript(jsTimeoutMillis); int loopCount = 0; @@ -242,7 +242,7 @@ private String renderPage(String url) throws IOException { } } - webClient.closeAllWindows(); + webClient.close(); return Pattern.compile("", Pattern.DOTALL) .matcher(page.asXml().replace("", "")) diff --git a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java index 8e6af02750..dd157eb60c 100644 --- a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java +++ b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java @@ -16,14 +16,14 @@ package com.gwtplatform.crawlerservice.server.guice; -import javax.inject.Singleton; - import com.gargoylesoftware.htmlunit.BrowserVersion; import com.gargoylesoftware.htmlunit.WebClient; import com.google.inject.Provides; import com.google.inject.servlet.ServletModule; import com.gwtplatform.crawlerservice.server.CrawlServiceServlet; +import jakarta.inject.Singleton; + public class CrawlServiceModule extends ServletModule { @Override @@ -34,6 +34,6 @@ public void configureServlets() { @Singleton @Provides WebClient getWebClient() { - return new WebClient(BrowserVersion.FIREFOX_38); + return new WebClient(BrowserVersion.FIREFOX_ESR); } } diff --git a/pom.xml b/pom.xml index a5269ad357..9a282f091e 100644 --- a/pom.xml +++ b/pom.xml @@ -235,60 +235,61 @@ - 1.8 + 11 UTF-8 UTF-8 false - 2.8.0 - 2.15 - 6.12 - 1.2 - 3.2 - 2.8.2 - 2.10.2 - 2.2.4 - 2.4 - 2.17 - 2.8 - 2.10 - 3.4 - 1.3.1.5 - 2.1 - 2.5.1 + 2.10.0 + 3.6.0 + 10.20.1 + 3.13.0 + 3.1.3 + 3.11.1 + 5.1 + 3.3.1 + 3.5.2 + 3.8.0 + 3.8.1 + 3.21.0 + 3.0-beta-02 + 5.9.2 + 2.18.0 + 3.1.1 - 2.8.0 + 2.12.1 - 2.1.2 - 0.14.1 + + HEAD-SNAPSHOT + 0.15.4 1.1.1 - 2.2 - 1.9.7 - 3.0 - 1 - 18.0 - 5.0.2 + 3.3.0 + 2.0.3 + 7.0.0 + 2.0.1 + 33.3.1-jre + 6.1.2 1.0 - 3.1.0 - 4.0.5.RELEASE + 6.1.0 + 6.2.0 1.7 - 1.0-SNAPSHOT - 1.0-rc2 - 2.19 + 1.2.2 + 1.1.1 + 2.70.0 - 1.4.1 - 4.11 - 1.9.5 - 1.1.4 - 1.6.1 + 1.5 + 4.13.2 + 4.11.0 + 1.1.9 + 3.26.3 - 0.11 + 0.12 SetAsParam @@ -342,8 +343,8 @@ maven-checkstyle-plugin ${maven-checkstyle-plugin.version} - /checkstyle.xml - /suppressions.xml + /codequality/checkstyle.xml + /codequality/suppressions.xml basedir=${basedir} true true @@ -357,11 +358,6 @@ checkstyle ${checkstyle.version} - - com.arcbees - checkstyle - ${arcbees-checkstyle.version} - @@ -409,6 +405,14 @@ com.github.searls jasmine-maven-plugin ${jasmine-maven-plugin.version} + + + + io.github.bonigarcia + webdrivermanager + ${webdrivermanager.version} + + @@ -451,6 +455,7 @@ **/*GwtTest.java + --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/AbstractProcessor.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/AbstractProcessor.java index 4a109229bb..2ad02852d6 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/AbstractProcessor.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/AbstractProcessor.java @@ -45,7 +45,7 @@ public abstract class AbstractProcessor extends javax.annotation.processing.Abst @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.RELEASE_7; + return SourceVersion.RELEASE_11; } @Override diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/GwtSourceFilter.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/GwtSourceFilter.java index 68e60722ef..a6ab17a3e4 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/GwtSourceFilter.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/GwtSourceFilter.java @@ -88,7 +88,7 @@ private static DocumentBuilder createDocumentBuilder() { } public String getApplicationPackage() { - return getSourcePackages().iterator().next(); + return getSourcePackages().stream().findFirst().orElse(""); } public Set getSourcePackages() { diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/domain/Type.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/domain/Type.java index d23e9b8232..66e06129e2 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/domain/Type.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/domain/Type.java @@ -102,7 +102,7 @@ public Type(TypeMirror type) { enclosingNames = enclosingElementNames.toString(); } else { - throw new IllegalArgumentException("TypeMirror must be a primitive or declared type."); + throw new IllegalArgumentException("TypeMirror must be a primitive or declared type. " + type.toString()); } } diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/outputter/Outputter.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/outputter/Outputter.java index d0b58c1ae0..04bdf64de9 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/outputter/Outputter.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/outputter/Outputter.java @@ -67,10 +67,7 @@ public Outputter( Processor processor, Filer filer, String... macroFiles) { - this.logger = logger; - this.processor = new Type(processor.getClass()); - this.filer = filer; - this.macroFiles = FluentIterable.of(macroFiles).append(DEFAULT_MACRO_FILE).toSet(); + this(logger, processor, filer, List.of(macroFiles)); } public Outputter( diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/ElementPredicates.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/ElementPredicates.java index 95e2d6cc18..799acd0749 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/ElementPredicates.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/ElementPredicates.java @@ -16,9 +16,10 @@ package com.gwtplatform.processors.tools.utils; +import jakarta.inject.Inject; + import java.util.List; -import javax.inject.Inject; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Primitives.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Primitives.java index b8275b8d39..fe6de8ddf7 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Primitives.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Primitives.java @@ -47,12 +47,12 @@ public enum Primitives { } public static Optional findByPrimitive(final CharSequence primitiveName) { - return FluentIterable.of(values()) + return FluentIterable.from(values()) .firstMatch(primitives -> primitiveName.equals(primitives.getPrimitive())); } public static Optional findByBoxed(final CharSequence boxedName) { - return FluentIterable.of(values()) + return FluentIterable.from(values()) .firstMatch(primitives -> boxedName.equals(primitives.getBoxedClass().getCanonicalName())); } diff --git a/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Utils.java b/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Utils.java index edc6c35046..8ce8bded52 100644 --- a/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Utils.java +++ b/processor-tools/src/main/java/com/gwtplatform/processors/tools/utils/Utils.java @@ -107,7 +107,8 @@ public List getAllMembers(TypeElement type, Class exclusion) { public List getAllMembers(TypeElement type, TypeElement... exclusions) { List allMembers = elements.getAllMembers(type); - final Set allExclusions = exclusions == null ? null : FluentIterable.of(exclusions) + @SuppressWarnings("unchecked") + final Set allExclusions = exclusions == null ? null : (Set) FluentIterable.from(exclusions) .transformAndConcat(elements::getAllMembers).toSet(); return FluentIterable.from(allMembers) diff --git a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module1/GwtSourceFilterTestModule.gwt.xml b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module1/GwtSourceFilterTestModule.gwt.xml index a62e0d3a10..1f3110ef59 100644 --- a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module1/GwtSourceFilterTestModule.gwt.xml +++ b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module1/GwtSourceFilterTestModule.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module2/GwtSourceFilterTestModule.gwt.xml b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module2/GwtSourceFilterTestModule.gwt.xml index c1f8f476c6..8d46c40307 100644 --- a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module2/GwtSourceFilterTestModule.gwt.xml +++ b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module2/GwtSourceFilterTestModule.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module3/GwtSourceFilterTestModule.gwt.xml b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module3/GwtSourceFilterTestModule.gwt.xml index 905de9273f..ae0e1014a1 100644 --- a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module3/GwtSourceFilterTestModule.gwt.xml +++ b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module3/GwtSourceFilterTestModule.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module4/GwtSourceFilterTestModule.gwt.xml b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module4/GwtSourceFilterTestModule.gwt.xml index bbc738a1b6..abeeba16bb 100644 --- a/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module4/GwtSourceFilterTestModule.gwt.xml +++ b/processor-tools/src/test/resources/com/gwtplatform/processors/tools/module4/GwtSourceFilterTestModule.gwt.xml @@ -1,6 +1,6 @@ - + diff --git a/src/site/site.xml b/src/site/site.xml index 61bf677b09..62b47285b8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,10 +1,10 @@ - + org.apache.maven.skins maven-fluido-skin - 1.3.1 + 2.0.0 @@ -33,4 +33,4 @@

- + From 6d0d9cdd41da33efd1a23f887f579e9d2b65f7a9 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Fri, 24 Jan 2025 13:47:57 +0100 Subject: [PATCH 2/3] dependencies updated --- gwtp-core/gwtp-all/pom.xml | 20 ++++++++-------- gwtp-core/gwtp-clients-common/pom.xml | 2 +- gwtp-core/gwtp-dispatch-common-client/pom.xml | 2 +- gwtp-core/gwtp-dispatch-rest/pom.xml | 4 ++-- gwtp-core/gwtp-dispatch-rpc-client/pom.xml | 2 +- .../gwtp-dispatch-rpc-server-guice/pom.xml | 2 +- gwtp-core/gwtp-mvp-client/pom.xml | 4 ++-- gwtp-core/gwtp-mvp-shared/pom.xml | 2 +- gwtp-core/gwtp-tester/pom.xml | 4 ++-- gwtp-core/pom.xml | 4 ++-- pom.xml | 24 +++++++++---------- processor-tools/pom.xml | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gwtp-core/gwtp-all/pom.xml b/gwtp-core/gwtp-all/pom.xml index 63d057bd21..4d508c3cab 100644 --- a/gwtp-core/gwtp-all/pom.xml +++ b/gwtp-core/gwtp-all/pom.xml @@ -15,7 +15,7 @@ true - 2.5.3 + 3.7.1 @@ -274,7 +274,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.1 + 3.8.1 unpack-dependencies @@ -299,7 +299,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.6 + 3.1.0 @@ -317,12 +317,12 @@ All Rights Reserved.]]> - - - - - - + + + + + + @@ -339,7 +339,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.5 + 3.6.0 attach-artifacts diff --git a/gwtp-core/gwtp-clients-common/pom.xml b/gwtp-core/gwtp-clients-common/pom.xml index f3e0ff8e6b..a26068c19d 100644 --- a/gwtp-core/gwtp-clients-common/pom.xml +++ b/gwtp-core/gwtp-clients-common/pom.xml @@ -35,7 +35,7 @@ gwt-dev - io.github.gwtplus.gin + de.knightsoft-net gin diff --git a/gwtp-core/gwtp-dispatch-common-client/pom.xml b/gwtp-core/gwtp-dispatch-common-client/pom.xml index e3d6982ad1..9796873bb6 100644 --- a/gwtp-core/gwtp-dispatch-common-client/pom.xml +++ b/gwtp-core/gwtp-dispatch-common-client/pom.xml @@ -26,7 +26,7 @@ gwt-user - io.github.gwtplus.gin + de.knightsoft-net gin diff --git a/gwtp-core/gwtp-dispatch-rest/pom.xml b/gwtp-core/gwtp-dispatch-rest/pom.xml index f863f751d9..f3b0d1fe8d 100644 --- a/gwtp-core/gwtp-dispatch-rest/pom.xml +++ b/gwtp-core/gwtp-dispatch-rest/pom.xml @@ -64,7 +64,7 @@ - io.github.gwtplus.gin + de.knightsoft-net gin @@ -83,7 +83,7 @@ - org.jukito + de.knightsoft-net jukito diff --git a/gwtp-core/gwtp-dispatch-rpc-client/pom.xml b/gwtp-core/gwtp-dispatch-rpc-client/pom.xml index bb2df92f76..64a9bc4efa 100644 --- a/gwtp-core/gwtp-dispatch-rpc-client/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-client/pom.xml @@ -52,7 +52,7 @@ gwt-dev - io.github.gwtplus.gin + de.knightsoft-net gin diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml index 32ccc0eac0..b37b19c7d9 100644 --- a/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml +++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml @@ -36,7 +36,7 @@ test - org.jukito + de.knightsoft-net jukito diff --git a/gwtp-core/gwtp-mvp-client/pom.xml b/gwtp-core/gwtp-mvp-client/pom.xml index ce37e92ee5..56d112c042 100644 --- a/gwtp-core/gwtp-mvp-client/pom.xml +++ b/gwtp-core/gwtp-mvp-client/pom.xml @@ -79,7 +79,7 @@ gwt-dev - io.github.gwtplus.gin + de.knightsoft-net gin @@ -101,7 +101,7 @@ test - org.jukito + de.knightsoft-net jukito diff --git a/gwtp-core/gwtp-mvp-shared/pom.xml b/gwtp-core/gwtp-mvp-shared/pom.xml index 41091a41ff..b976bf2880 100644 --- a/gwtp-core/gwtp-mvp-shared/pom.xml +++ b/gwtp-core/gwtp-mvp-shared/pom.xml @@ -43,7 +43,7 @@ mockito-core - org.jukito + de.knightsoft-net jukito diff --git a/gwtp-core/gwtp-tester/pom.xml b/gwtp-core/gwtp-tester/pom.xml index f0bde10d11..690be633cc 100644 --- a/gwtp-core/gwtp-tester/pom.xml +++ b/gwtp-core/gwtp-tester/pom.xml @@ -34,13 +34,13 @@ gwt-user - io.github.gwtplus.gin + de.knightsoft-net gin - org.jukito + de.knightsoft-net jukito test diff --git a/gwtp-core/pom.xml b/gwtp-core/pom.xml index 45462241d5..6d6e02b804 100644 --- a/gwtp-core/pom.xml +++ b/gwtp-core/pom.xml @@ -216,7 +216,7 @@ ${guice.version} - io.github.gwtplus.gin + de.knightsoft-net gin ${gin.version} @@ -248,7 +248,7 @@ - org.jukito + de.knightsoft-net jukito ${jukito.version} test diff --git a/pom.xml b/pom.xml index 9a282f091e..26630c316e 100644 --- a/pom.xml +++ b/pom.xml @@ -243,10 +243,10 @@ 2.10.0 3.6.0 - 10.20.1 + 10.21.1 3.13.0 3.1.3 - 3.11.1 + 3.11.2 5.1 3.3.1 3.5.2 @@ -262,7 +262,7 @@ 2.12.1 - HEAD-SNAPSHOT + 4.0.0 0.15.4 @@ -275,14 +275,14 @@ 6.1.2 1.0 6.1.0 - 6.2.0 + 6.2.2 1.7 1.2.2 1.1.1 2.70.0 - 1.5 + 1.6 4.13.2 4.11.0 1.1.9 @@ -510,13 +510,13 @@ ${project.build.directory}/staging - http://download.oracle.com/javase/6/docs/api/ - http://google-web-toolkit.googlecode.com/svn/javadoc/latest/ - http://static.springsource.org/spring/docs/3.0.x/javadoc-api/ - http://google-gin.googlecode.com/svn/trunk/javadoc/ - http://google-guice.googlecode.com/svn/trunk/javadoc/ - http://aopalliance.sourceforge.net/doc/ - https://developers.google.com/appengine/docs/java/javadoc/ + https://docs.oracle.com/en/java/javase/11/docs/api/ + https://www.gwtproject.org/javadoc/latest/ + https://docs.spring.io/spring-framework/docs/current/javadoc-api/ + https://gwtplus.github.io/google-gin/latest/javadoc/ + https://javadoc.io/doc/com.google.inject/guice/latest/index.html + https://aopalliance.sourceforge.net/doc/ + https://cloud.google.com/appengine/docs/legacy/standard/java/javadoc/ diff --git a/processor-tools/pom.xml b/processor-tools/pom.xml index e87d88e6b6..2767e84dfd 100644 --- a/processor-tools/pom.xml +++ b/processor-tools/pom.xml @@ -36,7 +36,7 @@ - org.jukito + de.knightsoft-net jukito ${jukito.version} test From e7d4dd0474ba71f8fbea615da918369171bd5052 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Fri, 24 Jan 2025 15:35:57 +0100 Subject: [PATCH 3/3] fixed javadoc errors --- .../common/client/ProviderBundle.java | 6 +-- .../crawler/server/ServiceKey.java | 2 +- .../client/CompletedDispatchRequest.java | 2 +- .../client/DefaultSecurityCookieAccessor.java | 2 +- .../client/DelegatingDispatchRequest.java | 8 +-- .../dispatch/client/ExecuteCommand.java | 2 +- .../client/GwtHttpDispatchRequest.java | 2 +- .../gin/AbstractDispatchAsyncModule.java | 12 ++--- .../dispatch/shared/ActionException.java | 4 +- .../dispatch/shared/HasSecured.java | 2 +- .../dispatch/shared/SecurityCookie.java | 6 +-- .../shared/SecurityCookieAccessor.java | 4 +- .../dispatch/rest/shared/ContentType.java | 2 +- .../dispatch/rest/shared/DateFormat.java | 6 +-- .../dispatch/rest/shared/HttpMethod.java | 2 +- .../dispatch/rest/shared/RestAction.java | 8 +-- .../rest/client/DispatchRestEntryPoint.java | 2 +- .../gin/BaseRestDispatchModuleBuilder.java | 2 +- .../client/gin/RestDispatchAsyncModule.java | 4 +- .../rpc/client/CallbackDispatchRequest.java | 2 +- .../DefaultCallbackDispatchRequest.java | 12 ++--- .../DelegatingCallbackDispatchRequest.java | 6 +-- .../dispatch/rpc/client/DispatchCall.java | 18 +++---- .../dispatch/rpc/client/RpcDispatchAsync.java | 2 +- .../client/gin/RpcDispatchAsyncModule.java | 4 +- .../DefaultRpcInterceptorRegistry.java | 8 +-- .../InterceptorMismatchException.java | 2 +- .../RpcInterceptedAsyncCallback.java | 6 +-- .../client/interceptor/RpcInterceptor.java | 18 +++---- .../AbstractCachingRpcInterceptor.java | 4 +- .../rpc/server/guice/DispatchModule.java | 2 +- .../rpc/server/guice/DispatchServiceImpl.java | 2 +- .../rpc/server/AbstractDispatchImpl.java | 6 +-- .../server/AbstractDispatchServiceImpl.java | 4 +- .../AbstractRandomSecurityCookieFilter.java | 6 +-- .../dispatch/rpc/server/Dispatch.java | 4 +- .../dispatch/rpc/server/Utils.java | 2 +- .../server/actionhandler/ActionHandler.java | 2 +- .../actionvalidator/ActionValidator.java | 2 +- .../rpc/shared/AbstractSimpleResult.java | 2 +- .../dispatch/rpc/shared/Action.java | 4 +- .../dispatch/rpc/shared/ActionImpl.java | 6 +-- .../dispatch/rpc/shared/BatchResult.java | 2 +- .../dispatch/rpc/shared/DispatchAsync.java | 9 ++-- .../dispatch/rpc/shared/DispatchService.java | 12 ++--- .../rpc/shared/DispatchServiceAsync.java | 10 ++-- .../dispatch/rpc/shared/MultipleResult.java | 2 +- .../dispatch/rpc/shared/NoResult.java | 4 +- .../dispatch/rpc/shared/Result.java | 7 ++- .../dispatch/rpc/shared/SimpleResult.java | 2 +- .../rpc/shared/UnsecuredActionImpl.java | 4 +- .../mvp/client/AutobindDisable.java | 2 +- .../mvp/client/HandlerContainer.java | 8 +-- .../mvp/client/HandlerContainerImpl.java | 20 ++++---- .../gwtplatform/mvp/client/HasPopupSlot.java | 4 +- .../com/gwtplatform/mvp/client/HasSlots.java | 14 +++--- .../com/gwtplatform/mvp/client/PopupView.java | 2 +- .../gwtplatform/mvp/client/PopupViewImpl.java | 2 +- .../mvp/client/PopupViewWithUiHandlers.java | 4 +- .../com/gwtplatform/mvp/client/Presenter.java | 22 ++++---- .../mvp/client/PresenterWidget.java | 50 +++++++++---------- .../gwtplatform/mvp/client/RootPresenter.java | 4 +- .../java/com/gwtplatform/mvp/client/View.java | 21 ++++---- .../com/gwtplatform/mvp/client/ViewImpl.java | 10 ++-- .../mvp/client/ViewWithUiHandlers.java | 4 +- .../client/annotations/CustomProvider.java | 10 ++-- .../client/annotations/GatekeeperParams.java | 4 +- .../client/annotations/ProxyCodeSplit.java | 4 +- .../annotations/ProxyCodeSplitBundle.java | 10 ++-- .../mvp/client/annotations/ProxyEvent.java | 4 +- .../mvp/client/annotations/ProxyStandard.java | 4 +- .../client/gin/AbstractPresenterModule.java | 14 +++--- .../mvp/client/gin/DefaultModule.java | 2 +- .../client/presenter/slots/NestedSlot.java | 2 +- .../mvp/client/proxy/DefaultPlaceManager.java | 6 +-- .../mvp/client/proxy/Gatekeeper.java | 2 +- .../client/proxy/GatekeeperWithParams.java | 6 +-- .../client/proxy/LockInteractionEvent.java | 5 +- .../client/proxy/ManualRevealCallback.java | 4 +- .../mvp/client/proxy/NavigationEvent.java | 2 +- .../client/proxy/NotifyingAsyncCallback.java | 2 +- .../gwtplatform/mvp/client/proxy/Place.java | 4 +- .../mvp/client/proxy/PlaceManager.java | 42 ++++++++-------- .../proxy/PlaceRequestInternalEvent.java | 4 +- .../gwtplatform/mvp/client/proxy/Proxy.java | 4 +- .../mvp/client/proxy/ProxyImpl.java | 2 +- .../mvp/client/proxy/ProxyPlace.java | 4 +- .../mvp/client/proxy/ProxyPlaceAbstract.java | 4 +- .../mvp/client/proxy/ProxyRaw.java | 2 +- .../client/proxy/ResetPresentersEvent.java | 2 +- .../mvp/client/proxy/RevealContentEvent.java | 2 +- .../client/proxy/RevealRootContentEvent.java | 2 +- .../proxy/RevealRootLayoutContentEvent.java | 2 +- .../shared/proxy/ParameterTokenFormatter.java | 26 +++++----- .../mvp/shared/proxy/PlaceRequest.java | 18 +++---- .../mvp/shared/proxy/RouteTokenFormatter.java | 4 +- .../dispatch/annotation/GenDispatch.java | 34 ++++++------- .../dispatch/annotation/GenDto.java | 24 ++++----- .../dispatch/annotation/GenEvent.java | 36 ++++++------- .../dispatch/annotation/GenProxy.java | 6 +-- .../gwtplatform/dispatch/annotation/In.java | 4 +- .../dispatch/annotation/Optional.java | 6 +-- .../dispatch/annotation/Order.java | 4 +- .../gwtplatform/dispatch/annotation/Out.java | 4 +- .../helper/BuilderGenerationHelper.java | 4 +- .../helper/ClassGenerationHelper.java | 12 ++--- .../annotation/helper/GenerationHelper.java | 12 ++--- .../helper/InterfaceGenerationHelper.java | 8 +-- .../processor/GenDispatchProcessor.java | 2 +- .../annotation/processor/GenDtoProcessor.java | 2 +- .../processor/GenEventProcessor.java | 2 +- .../annotation/processor/GenProcessor.java | 2 +- .../processor/GenProxyProcessor.java | 2 +- .../DispatchAnnotationProcessingTest.java | 2 +- .../DtoAnnotationProcessingTest.java | 2 +- .../EventAnnotationProcessingTest.java | 2 +- .../ProxyAnnotationProcessingTest.java | 2 +- .../gwtplatform/tester/AsyncMockProvider.java | 2 +- .../tester/DeferredCommandManager.java | 2 +- .../com/gwtplatform/tester/MockFactory.java | 4 +- .../com/gwtplatform/tester/MockProvider.java | 2 +- .../com/gwtplatform/tester/MockingBinder.java | 6 +-- 122 files changed, 395 insertions(+), 417 deletions(-) diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java index 25f31bbff9..1e3d77cfef 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java @@ -26,7 +26,7 @@ * the objects were behind their individual split points. * GWTP automatically handles ProviderBundles when used with ApplicationController * and Ginjector generation. - *

+ *

* Here is an example use of a manual {@link ProviderBundle}: * 

  * public class MyPresenterBundle extends ProviderBundle {
@@ -36,8 +36,8 @@
  *
  *   @Inject
  *   MyPresenterBundle(
- *       final Provider object1Provider,
- *       final Provider object2Provider) {
+ *       final Provider<Object1> object1Provider,
+ *       final Provider<Object2> object2Provider) {
  *     super( BUNDLE_SIZE );
  *     providers[ID_Object1] = object1Provider;
  *     providers[ID_Object2] = object2Provider;
diff --git a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java
index 53cdd762a2..f164d76f99 100644
--- a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java
+++ b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java
@@ -28,7 +28,7 @@
 
 /**
  * Use this annotation to bind the key that should be used when invoking
- * {@link CrawlServiceServlet}. For example:
+ * {@code CrawlServiceServlet}. For example:
  * 
bindConstant().annotatedWith(ServiceKey.class).to("123456");
  * 

  */
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/CompletedDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/CompletedDispatchRequest.java
index 777b68ab8d..234dc933d8 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/CompletedDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/CompletedDispatchRequest.java
@@ -20,7 +20,7 @@
 
 /**
  * An implementation of {@link DispatchRequest} that is always completed. It should be used with
- * {@link com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler ClientActionHandler}s that do not perform
+ * {@code com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler}s that do not perform
  * any asynchronous processing.
  */
 public class CompletedDispatchRequest implements DispatchRequest {
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java
index b171165b40..7dcf73b4ef 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java
@@ -24,7 +24,7 @@
 /**
  * This class provides access to the session id client side by looking into a cookie on the browser. This will work to
  * prevent XSRF attack.
- * 

+ * 

  * To use this class you have to bind a constant string annotated with {@code @}{@link SecurityCookie} to your desired
  * cookie name.
  */
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java
index 2178a807ae..d837deeba3 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java
@@ -19,9 +19,9 @@
 import com.gwtplatform.dispatch.shared.DispatchRequest;
 
 /**
- * An implementation of {@link DispatchRequest} that is used in conjunction with {@link
- * com.gwtplatform.dispatch.client.interceptor.Interceptor Interceptor}s.
- * 

+ * An implementation of {@link DispatchRequest} that is used in conjunction with {@code
+ * com.gwtplatform.dispatch.client.interceptor.Interceptor}s.
+ * 

  * As the interceptor implementation may be provided asynchronously, the {@code DelegatingAsyncCallback} will initially
  * not contain a {@link DispatchRequest}. Once the interceptor is executed, this will be populated with a {@link
  * DispatchRequest} by calling {@link #setDelegate(DispatchRequest)}.
@@ -35,7 +35,7 @@ public DelegatingDispatchRequest() {
 
     /**
      * Assign the delegated {@link DispatchRequest} for this object.
-     * 

+     * 

      * If the code that requested the command to be executed has already chosen to cancel the {@link DispatchRequest},
      * the {@link DispatchRequest} that has been passed will be immediately cancelled.
      *
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExecuteCommand.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExecuteCommand.java
index 267174096a..ca97fc8f6e 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExecuteCommand.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExecuteCommand.java
@@ -19,7 +19,7 @@
 import com.gwtplatform.dispatch.shared.DispatchRequest;
 
 /**
- * The interface that {@link com.gwtplatform.dispatch.client.interceptor.Interceptor Interceptor}s use to send the
+ * The interface that {@code com.gwtplatform.dispatch.client.interceptor.Interceptor}s use to send the
  * action to execute to the server.
  *
  * @param  The action type.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java
index d44a73be78..3fb7202b44 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java
@@ -21,7 +21,7 @@
 
 /**
  * An implementation of {@link DispatchRequest} that is an adapter for {@link Request}.
- * 

+ * 

  * If the code that requested the command to be executed chooses to cancel the {@link DispatchRequest} and the
  * {@link Request} that has been passed is still pending, it will be cancelled.
  */
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java
index c99e9945cd..bd07175e6d 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java
@@ -28,27 +28,21 @@
  * This gin module provides provides access to the dispatcher singleton, which is used to make calls to the server. This
  * module requires a {@link SecurityCookieAccessor} which is, by default, bound to
  * {@link DefaultSecurityCookieAccessor}.
- * 

+ * 

  * Install the module in one of your {@link #configure()} methods:
- * 

+ * 

  * 
  * install(new RestDispatchAsyncModule.Builder()
  *                 .sessionAccessor(MySessionAccessor.class)
  *                 .build());
  * 

- *
- * @see com.gwtplatform.dispatch.rpc.client.gin.RpcDispatchAsyncModule
- * @see com.gwtplatform.dispatch.rest.client.gin.RestDispatchAsyncModule
  */
 public abstract class AbstractDispatchAsyncModule extends AbstractGinModule {
     /**
      * A {@link AbstractDispatchAsyncModule} builder.
-     * 

+     * 

      * By default, this builder configures the {@link AbstractDispatchAsyncModule} to use {@link
      * DefaultSecurityCookieAccessor}.
-     *
-     * @see com.gwtplatform.dispatch.rpc.client.gin.RpcDispatchAsyncModule.Builder
-     * @see com.gwtplatform.dispatch.rest.client.gin.RestDispatchAsyncModule.Builder
      */
     public abstract static class Builder> {
         private Class sessionAccessorType = DefaultSecurityCookieAccessor.class;
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java
index 8075b2a453..8407052c4b 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java
@@ -17,8 +17,8 @@
 package com.gwtplatform.dispatch.shared;
 
 /**
- * These are thrown by {@link com.gwtplatform.dispatch.server.Dispatch#execute(Action)} if there is a problem executing
- * a particular {@link Action}.
+ * These are thrown by {@code com.gwtplatform.dispatch.server.Dispatch#execute(Action)} if there is a problem executing
+ * a particular {@code Action}.
  */
 public class ActionException extends Exception {
 
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java
index 49c0d16048..e23fee8d43 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java
@@ -23,7 +23,7 @@ public interface HasSecured {
     /**
      * Verifies if the action is secured. Secured actions perform a number of extra security checks, such as validating
      * the {@link com.gwtplatform.dispatch.shared.SecurityCookie} to foil XSRF attacks.
-     * 

+     * 

      * Important! Make sure your method returns a value that does not depend on client-side information,
      * otherwise it could be tampered with to turn a secure action into an insecure one. An example of a bad practice
      * would be to store a {@code boolean secured} member and return that. Since this field is serialized, the user
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java
index c9affb7ea5..549c8d91da 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java
@@ -25,12 +25,12 @@
 
 /**
  * Bind this annotation on the string you want to use as a security cookie.
- * 

+ * 

  * 
  * bindConstant().annotatedWith(SecurityCookie.class).to("MYCOOKIE");
  * 

- * 

- * @see com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor
+ * 

+ * see com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.PARAMETER})
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java
index d84a3c77a5..934263c06b 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java
@@ -20,8 +20,8 @@
  * Provides access to the security cookie stored on the client. The goal of this security cookie is to prevent XSRF
  * attack. For more details see 
  *     this document.
- * 

- * Notice that the default implementation is {@link com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor} which
+ * 

+ * Notice that the default implementation is {@code com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor} which
  * does not prevent XSRF attacks if {@literal @}{@link SecurityCookie} is not bound.
  */
 public interface SecurityCookieAccessor {
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java
index 96de9999e8..c0ba9e77f7 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java
@@ -45,7 +45,7 @@ public ContentType(
 
     /**
      * Parses a content type and return an object representation. Input may look like:
-     * 

+     * 

      * application/json; charset=utf-8; q=0.9
      */
     public static ContentType valueOf(String value) {
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java
index 4e97c057c3..1f95c668ac 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java
@@ -23,7 +23,7 @@
 
 /**
  * Annotation used to specify a date format pattern.
- * 

+ * 

  * This annotation may be put on {@link java.util.Date Date} parameters annotated with
  * {@link javax.ws.rs.FormParam @FormParam}, {@link javax.ws.rs.QueryParam @QueryParam},
  * {@link javax.ws.rs.PathParam @PathParam} or {@link javax.ws.rs.HeaderParam @HeaderParam}.
@@ -34,7 +34,7 @@
     /**
      * 
      * ISO 8601 date format.
-     * 

+     * 

      * Example: {@code 2014-02-25T10:59:26.046-05:00}
      */
     String DEFAULT = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZ";
@@ -42,7 +42,7 @@
     /**
      * The formatting pattern to use for parsing the date. The pattern must follow the rules defined by
      * {@link com.google.gwt.i18n.shared.DateTimeFormat DateTimeFormat}.
-     * 

+     * 

      * If not specified, {@link #DEFAULT} will be used.
      */
     String value() default DEFAULT;
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java
index d060165c6b..2935a7bc83 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java
@@ -17,7 +17,7 @@
 package com.gwtplatform.dispatch.rest.shared;
 
 /**
- * Represents the HTTP methods supported by the {@link com.gwtplatform.dispatch.rest.client.RestDispatch RestDispatch}.
+ * Represents the HTTP methods supported by the {@code com.gwtplatform.dispatch.rest.client.RestDispatch}.
  */
 public enum HttpMethod {
     GET,
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java
index 8e45913a04..85364fedd2 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java
@@ -21,8 +21,8 @@
 import com.gwtplatform.dispatch.shared.HasSecured;
 
 /**
- * An action used by {@link com.gwtplatform.dispatch.rest.client.RestDispatch RestDispatch}.
- * 

+ * An action used by {@code com.gwtplatform.dispatch.rest.client.RestDispatch}.
+ * 

  * You will usually want to let GWTP generate your actions by creating services as explained here.
  *
@@ -30,8 +30,8 @@
  */
 public interface RestAction extends HasSecured {
     /**
-     * Returns the relative path for this action. It should not be prepended by the path annotated with {@link
-     * com.gwtplatform.dispatch.rest.client.RestApplicationPath @RestApplicationPath}. This path does not contain
+     * Returns the relative path for this action. It should not be prepended by the path annotated with {@code
+     * com.gwtplatform.dispatch.rest.client.RestApplicationPath}. This path does not contain
      * regular expressions for the URI templates anymore.
      *
      * @return the relative path for this action.
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java
index f87a55dc93..69115587c8 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java
@@ -21,7 +21,7 @@
 /**
  * This interface is used to initiate the generation of services and
  * {@link com.gwtplatform.dispatch.rest.shared.RestAction}s.
- * 

+ * 

  * Making it an {@link EntryPoint} makes sure GWT kicks off the generation as early as possible.
  */
 public interface DispatchRestEntryPoint extends EntryPoint {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java
index 51c80d922f..bb69c87f35 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java
@@ -77,7 +77,7 @@ public RestParameterBuilder addGlobalQueryParam(String key) {
     /**
      * Specify the pattern to use to format dates before they are sent to the end-point. The pattern must follow the
      * rules defined by {@link com.google.gwt.i18n.shared.DateTimeFormat DateTimeFormat}.
-     * 

+     * 

      * Default is {@link com.gwtplatform.dispatch.rest.shared.DateFormat#DEFAULT}.
      *
      * @param defaultDateFormat The pattern used to format dates.
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java
index b40ddb1d7c..5a5292be2d 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java
@@ -33,10 +33,10 @@
 
 /**
  * An implementation of {@link AbstractDispatchAsyncModule} that binds classes used by a restful dispatch.
- * 

+ * 

  * This gin module provides access to the {@link RestDispatch} singleton, which is used to make calls to the server over
  * HTTP.
- * 

+ * 

  * You must manually bind {@literal @}{@link com.gwtplatform.dispatch.rest.client.RestApplicationPath
  * RestApplicationPath} to point to your server API root path.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/CallbackDispatchRequest.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/CallbackDispatchRequest.java
index cd7417d5ea..439e1d9a06 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/CallbackDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/CallbackDispatchRequest.java
@@ -21,7 +21,7 @@
 
 /**
  * An implementation of {@link DispatchRequest} that should be used by
- * {@link com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler}s that make asynchronous calls.
+ * {@code com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler}s that make asynchronous calls.
  *
  * @param  The type of the {@link AsyncCallback}.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultCallbackDispatchRequest.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultCallbackDispatchRequest.java
index 1f711689e1..8815b5dd3a 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultCallbackDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultCallbackDispatchRequest.java
@@ -20,11 +20,11 @@
 
 /**
  * An implementation of {@link CallbackDispatchRequest} that should be used by
- * {@link com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler}s that make asynchronous calls that do not
+ * {@code com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler}s that make asynchronous calls that do not
  * return a {@link com.google.gwt.http.client.Request}.
- * 

+ * 

  * {@link #isPending()} will return true until either {@link #onSuccess(Object)} or {@link #onFailure} is called.
- * 

+ * 

  * Calling {@link #cancel()} will prevent the {@link #onSuccess(Object)} and {@link #onFailure(Throwable)} from being
  * forwarded to the code that requested the action handler be executed/undone.
  *
@@ -40,11 +40,9 @@ public class DefaultCallbackDispatchRequest implements CallbackDispatchReques
      * Construct a {@link DefaultCallbackDispatchRequest}. See the class documentation for details.
      *
      * @param callback The {@code resultCallback} parameter passed to
-     *                 {@link com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler#execute
-     *                 ClientActionHandler#execute()}
+     *                 {@code ClientActionHandler#execute()}
      *                 or the callback parameter passed to
-     *                 {@link com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler#undo
-     *                 ClientActionHandler#undo()}
+     *                 {@code ClientActionHandler#undo()}
      */
     public DefaultCallbackDispatchRequest(AsyncCallback callback) {
         this.callback = callback;
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DelegatingCallbackDispatchRequest.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DelegatingCallbackDispatchRequest.java
index ce212a62c9..8e071b5c92 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DelegatingCallbackDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DelegatingCallbackDispatchRequest.java
@@ -22,11 +22,11 @@
 
 /**
  * An implementation of {@link DispatchRequest} that should be used by
- * {@link com.gwtplatform.dispatch.client.interceptor.Interceptor}s that make asynchronous calls that return a
+ * {@code com.gwtplatform.dispatch.client.interceptor.Interceptor}s that make asynchronous calls that return a
  * {@link com.google.gwt.http.client.Request Request}.
- * 

+ * 

  * This class also takes a {@link DispatchRequest} and delegate work to this {@link DispatchRequest}.
- * 

+ * 

  * This class is used within
  * {@link com.gwtplatform.dispatch.rpc.client.interceptor.caching.AbstractCachingRpcInterceptor} to be able to store
  * inside an {@link java.util.HashMap HashMap} {@link DefaultCallbackDispatchRequest}
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DispatchCall.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DispatchCall.java
index 944b8460fa..b370daeca8 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DispatchCall.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DispatchCall.java
@@ -23,16 +23,16 @@
 import com.gwtplatform.dispatch.shared.SecurityCookieAccessor;
 
 /**
- * An class representing a call made to the server through {@link com.gwtplatform.dispatch.rest.client.RestDispatch
- * RestDispatch} or {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync}.
- * 

+ * An class representing a call made to the server through {@code com.gwtplatform.dispatch.rest.client.RestDispatch}
+ * or {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync}.
+ * 

  * This class will perform the work shared by all dispatch modules. It will delegate exceptions to the bound {@link
  * ExceptionHandler}. It will provide access to the security cookie through the bound {@link SecurityCookieAccessor}.
- * 

+ * 

  * It also provides a couple extension points for implementations.
  *
- * @param  The type of the {@link TypedAction} wrapped by this {@link DispatchCall}.
- * @param  The type of the result of the wrapped {@link TypedAction}.
+ * @param  The type of the {@code TypedAction} wrapped by this {@link DispatchCall}.
+ * @param  The type of the result of the wrapped {@code TypedAction}.
  */
 public abstract class DispatchCall {
     private final A action;
@@ -66,7 +66,7 @@ public boolean isIntercepted() {
     }
 
     /**
-     * Execution entry point. Call this method to execute the {@link TypedAction action} wrapped by this instance.
+     * Execution entry point. Call this method to execute the {@code TypedAction} wrapped by this instance.
      *
      * @return a {@link DispatchRequest} object.
      */
@@ -81,9 +81,9 @@ public boolean isIntercepted() {
     protected abstract DispatchRequest processCall();
 
     /**
-     * Returns the {@link TypedAction} wrapped by this {@link DispatchCall}.
+     * Returns the {@code TypedAction} wrapped by this {@link DispatchCall}.
      *
-     * @return the {@link TypedAction} wrapped by this object.
+     * @return the {@code TypedAction} wrapped by this object.
      */
     protected A getAction() {
         return action;
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java
index 1246262535..415ebc043e 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java
@@ -28,7 +28,7 @@
 
 /**
  * This class is the default implementation of {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}, which is
- * essentially the client-side access to the {@link com.gwtplatform.dispatch.rpc.server.Dispatch} class on the
+ * essentially the client-side access to the {@code com.gwtplatform.dispatch.rpc.server.Dispatch} class on the
  * server-side.
  */
 public class RpcDispatchAsync implements DispatchAsync {
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java
index e05edadb72..fbf76b08fb 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java
@@ -38,10 +38,10 @@
 
 /**
  * An implementation of {@link AbstractDispatchAsyncModule} that uses Remote Procedure Calls (RPC).
- * 

+ * 

  * This gin module provides provides access to the {@link DispatchAsync} singleton, which is used to make calls to the
  * server over RPC.
- * 

+ * 

  * If you want to prevent XSRF attack (you use secured {@link com.gwtplatform.dispatch.rpc.shared.Action}s) the empty
  * {@link DefaultSecurityCookieAccessor} could leave your application vulnerable to XSRF attacks.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java
index 1d334dd628..a6ab38a914 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java
@@ -27,11 +27,11 @@
 
 /**
  * The default implementation that {@link RpcInterceptorRegistry} that if bound will not load any client-side
- * interceptors. 
 To register client-side interceptors, extend this class and call {@link #register} in the
+ * interceptors. 
 To register client-side interceptors, extend this class and call {@link #register} in the
  * constructor.
- * 

- * 
Example

- * 

+ * 

+ * 
Example

+ * 

  * 
  * 
  * public class MyRpcInterceptorRegistry extends DefaultClientInterceptorRegistry {
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/InterceptorMismatchException.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/InterceptorMismatchException.java
index 09007123e2..dbe18d53e9 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/InterceptorMismatchException.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/InterceptorMismatchException.java
@@ -19,7 +19,7 @@
 /**
  * This exception is thrown as a side-effect of an error when registering a delegating callback. A provider was
  * registered to provide a client-side interceptor for an action, but this action was not the same action as specified
- * by {@link Interceptor#getActionType()}.
+ * by {@code Interceptor#getActionType()}.
  */
 public class InterceptorMismatchException extends RuntimeException {
     private static final long serialVersionUID = 1L;
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptedAsyncCallback.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptedAsyncCallback.java
index b16295e853..97bd494425 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptedAsyncCallback.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptedAsyncCallback.java
@@ -27,11 +27,11 @@
 import com.gwtplatform.dispatch.shared.DispatchRequest;
 
 /**
- * {@code AsyncCallback} implementation wrapping another {@link AsyncCallback} object used by a {@link
- * com.gwtplatform.dispatch.client.interceptor.Interceptor Interceptor} implementations to delegate the execution
+ * {@code AsyncCallback} implementation wrapping another {@link AsyncCallback} object used by a {@code
+ * com.gwtplatform.dispatch.client.interceptor.Interceptor} implementations to delegate the execution
  * result.
  *
- * @param  the {@link TypedAction} type.
+ * @param  the {@code TypedAction} type.
  * @param  the result type for this action.
  */
 public class RpcInterceptedAsyncCallback, R extends Result>
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java
index 64c6552e06..f91eea9aa1 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java
@@ -23,21 +23,21 @@
 
 /**
  * Instances of this interface will handle specific types of action classes on the client.
- * 

+ * 

  * When a call is executed, the {@link RpcInterceptor} that has been registered with the bound {@link
  * RpcInterceptorRegistry} is called and {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync} does
  * not automatically send the command over HTTP to the server.
- * 

+ * 

  * Interceptors provide a number of flexible options: 
     
  • The action can be modified before sending the action to
  * the server.
    •  
  • A result can be returned without contacting the server.
    •  
  • The result can be modified or
  * processed after it is returned from the server.
    •  
  • The {@link RpcInterceptor} can take over and communicate
  * directly with the server, possibly using a different mechanism.
    •  

- * 

+ * 

  * Important! If your interceptor makes asynchronous calls, be careful with your use of fields as a second call
  * your interceptor could be made while it is waiting for the asynchronous call to return.
- * 

- * 
Caching Interceptor Example

- * 

+ * 

+ * 
Caching Interceptor Example

+ * 

  * 
  * 
  * // Interface of cache singleton
@@ -116,7 +116,7 @@ public interface RpcInterceptor {
 
     /**
      * Handles the specified action.
-     * 

+     * 

      * If the interceptor makes asynchronous calls, it is recommended that you confirm that this request has not been
      * cancelled after returning by calling {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#isPending()
      * DelegatingDispatchRequest#isPending()} against the request parameter.
@@ -126,7 +126,7 @@ public interface RpcInterceptor {
      *                       cancelled, you must invoke {@link AsyncCallback#onSuccess(Object)} on this callback once
      *                       you have obtained the result. If any failure occurs call {@link
      *                       AsyncCallback#onFailure(Throwable)}.
-     * @param executeCommand Call {@link ExecuteCommand#execute(Object, AsyncCallback)} on this object to send the
+     * @param executeCommand Call {@link ExecuteCommand#execute(Object, Object)} on this object to send the
      *                       action over to the server. As a parameter you can pass {@code resultCallback} or your
      *                       custom {@link AsyncCallback} if you want to process the result.
      * @return A {@link DispatchRequest} object. Never return {@code null}, instead return a new {@link
@@ -140,7 +140,7 @@ DispatchRequest execute(
 
     /**
      * Undoes the specified action if supported.
-     * 

+     * 

      * If the interceptor makes asynchronous calls, it is recommended that you confirm that this request has not been
      * cancelled after returning by calling
      * {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#isPending()}
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java
index 67bc861bc5..962950c1ad 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java
@@ -151,7 +151,7 @@ public DispatchRequest undo(A action, R result, AsyncCallback callback,
      * Override this method to perform an action before the call is sent to the server. If the call returns a
      * non-{@code null} result then the action is never executed on the server and the returned value is used. If the
      * call returns {@code null} then the action is executed on the server.
-     * 

+     * 

      * You can use this method to fetch the {@code action} from the cache.
      *
      * @param action The action to be prefetched
@@ -162,7 +162,7 @@ public DispatchRequest undo(A action, R result, AsyncCallback callback,
     /**
      * Override this method to perform an action after the call to the server returns successfully or not. If the call
      * succeeded, the result will be passed, if it failed {@code null} will be passed in the {@code result} parameter.
-     * 

+     * 

      * You can use this method to add the result to cache, if it is {@code null} you should remove the {@code action}
      * from the cache.
      *
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java
index 828226b9fc..16db1b6ff8 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java
@@ -31,7 +31,7 @@
  * interfaces. Also every
  * {@link com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler ActionHandler} and
  * {@link com.gwtplatform.dispatch.rpc.server.actionvalidator.ActionValidator ActionValidator} will be loaded lazily.
- * 

+ * 

  * If you want to override the defaults ({@link DispatchImpl}, {@link LazyActionHandlerValidatorRegistryImpl} pass
  * the override values into the constructor for this module and ensure it is installed before any
  * {@link HandlerModule} instances.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java
index f09d14cf56..bc9469112a 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java
@@ -28,7 +28,7 @@
 /**
  * This is the server-side implementation of the {@link com.gwtplatform.dispatch.rpc.shared.DispatchService},
  * for which the client-side async service is {@link com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync}.
- * 

+ * 

  * This class is closely related to {@link DispatchImpl}, in theory the latter wouldn't be needed, but we use it to
  * workaround a GWT limitation described in {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java
index 9caa4bbfd5..9950aa184c 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java
@@ -32,17 +32,15 @@
 /**
  * This is the server-side implementation of the {@link Dispatch} service with an arbitrary action type, for which the
  * client-side async service is {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
- * 

- * This class is closely related to {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
+ * 

+ * This class is closely related to {@code com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
  * In fact, this class wouldn't be needed, but we use it to workaround a GWT limitation described in
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
  *
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchAsync
  * @see Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchService
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public abstract class AbstractDispatchImpl implements Dispatch {
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java
index a395cb0364..1fd86167a4 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java
@@ -30,16 +30,14 @@
 /**
  * This is the server-side implementation of the {@link DispatchService}, for which the client-side async service is
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync}.
- * 

+ * 

  * This class is closely related to {@link AbstractDispatchImpl}, in theory the latter wouldn't be needed, but we use it
  * to workaround a GWT limitation described in {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
  *
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchAsync
  * @see Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchService
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public abstract class AbstractDispatchServiceImpl extends RemoteServiceServlet implements DispatchService {
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java
index daefb56552..0bbfca0b10 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java
@@ -33,12 +33,12 @@
 /**
  * This filter will automatically inject a security cookie inside the request the first time the page is loaded. This
  * security cookie is a simple randomly generated number. To setup this filter, add the following line
- * before any other {@code serve} call in your own {@link com.google.inject.servlet.ServletModule#configureServlets}:
- * 

+ * before any other {@code serve} call in your own {@code com.google.inject.servlet.ServletModule#configureServlets}:
+ * 

  * 
  * filter("*.jsp").through(HttpSessionSecurityCookieFilter.class);
  * 

- * 

+ * 

  * You also have to use a {@code .jsp} file instead of a {@code .html} as your main GWT file.
  */
 public abstract class AbstractRandomSecurityCookieFilter implements Filter {
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java
index 739278e806..a36211e8d6 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java
@@ -23,9 +23,9 @@
 
 /**
  * The base class of the synchronous dispatcher service with an arbitrary action type. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl} and the async client-side version is
+ * {@code com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl} and the async client-side version is
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
- * 

+ * 

  * This class is closely related to {@link com.gwtplatform.dispatch.rpc.shared.DispatchService}. In fact, this class
  * wouldn't be needed, but we use it to workaround a GWT limitation described in
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java
index f2a5dcab03..7991817baf 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java
@@ -29,7 +29,7 @@ public class Utils {
     /**
      * Logs an entire stack trace to the logger, so that it can easily be viewed in the App Engine log. The exception
      * will be logged as a severe error.
-     * 

+     * 

      * See also {@link #logStackTrace(Logger, Level, Throwable)}.
      *
      * @param log The {@link Logger} to use.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java
index d2644c10b8..6f5d9e48ec 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java
@@ -23,7 +23,7 @@
 
 /**
  * Instances of this interface will handle specific types of {@link Action} classes.
- * 

+ * 

  * Important! Your action handlers must be thread safe since they will be bound as singletons. For details,
  * see 
  * http://code.google.com/p/google-guice/wiki/Scopes#Scopes_and_Concurrency.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java
index e26cbd706c..17ffb0d1cf 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java
@@ -26,7 +26,7 @@
  * whether or not the action can be executed. Doing so will often require session information, which can be done by
  * injecting a {@code Provider} into the validator and calling {@code httpSessionProvider.get()} within the
  * {@link #isValid} method.
- * 

+ * 

  * You should think of annotating your validators with {@code @RequestScoped} or {@code @Singleton}.
  */
 public interface ActionValidator {
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java
index 0153b34f73..636ca940cc 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java
@@ -19,7 +19,7 @@
 /**
  * A common use-case is returning a single value from an action. This provides a simple, type-safe superclass for such
  * results.
- * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java
index 59f0e2f8eb..f527af2d79 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java
@@ -20,13 +20,13 @@
 import com.gwtplatform.dispatch.shared.HasSecured;
 
 /**
- * An action represents a command sent to the {@link com.gwtplatform.dispatch.rpc.server.Dispatch}. It has a specific
+ * An action represents a command sent to the {@code com.gwtplatform.dispatch.rpc.server.Dispatch}. It has a specific
  * result type which is returned if the action is successful. Your implementation should override
  * {@link #getServiceName} to return a default service url. If you use a
  * {@link com.gwtplatform.dispatch.shared.SecurityCookie} to prevent XSRF attacks and you want this action to be secured
  * against such attacks (i.e. it's not meant to be an anonymous action) then you should override {@link #isSecured()} to
  * return {@code true}.
- * 

+ * 

  * You can usually inherit from {@link ActionImpl} or {@link UnsecuredActionImpl} instead.
  *
  * @param  The {@link Result} type.
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java
index d4d6837e8c..dfd79002e2 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java
@@ -18,12 +18,12 @@
 
 /**
  * Default Action using the base path as dispatch/className. The base abstract implementation is {@link Action}.
- * 

+ * 

  * An {@link Action} that uses the standard service name {@code "dispatch"}. Actions inheriting from this are secured
  * against XSRF attacks, but you need to configure a {@link com.gwtplatform.dispatch.shared.SecurityCookie}.
- * 

+ * 

  * Use {@link UnsecuredActionImpl} for secured set to off by default.
- * 

+ * 

  * Visit this page for more documentation.
  *
  * @param  The {@link Result} type.
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java
index 46fc2325a8..c94efebe24 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java
@@ -22,7 +22,7 @@
 /**
  * Contains the list of {@link Result}s from successful actions in the {@link BatchAction}. The order will match the
  * order of the original {@link Action}s listed in the {@link BatchAction}.
- * 

+ * 

  * If the {@link BatchAction} was specified to have an {@link BatchAction.OnException} value
  * of {@link BatchAction.OnException#CONTINUE}, failed actions will have a null value.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java
index dffd5af6a1..744ce00dc2 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java
@@ -21,18 +21,15 @@
 
 /**
  * The asynchronous client-side dispatcher service with an arbitrary action type. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl}.
- * 

+ * {@code com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl}.
+ * 

  * This class is closely related to {@link DispatchServiceAsync}. In theory this class wouldn't be needed, but we use it
  * to workaround a GWT limitation. In fact, GWT currently can't correctly handle having generic method templates in
- * method signatures (eg. <A> A create( Class type ))
+ * method signatures (eg. <A> A create( Class<A> type ))
  *
  * @see DispatchAsync
- * @see com.gwtplatform.dispatch.rpc.server.Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see DispatchService
  * @see DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public interface DispatchAsync {
     /**
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java
index afcbe56346..39b80969ed 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java
@@ -21,19 +21,15 @@
 
 /**
  * The base class of the synchronous dispatcher service. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl} and the async client-side version is
+ * {@code com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl} and the async client-side version is
  * {@link DispatchServiceAsync}.
- * 

- * This class is closely related to {@link com.gwtplatform.dispatch.rpc.server.Dispatch}, in theory the latter wouldn't
+ * 

+ * This class is closely related to {@code com.gwtplatform.dispatch.rpc.server.Dispatch}, in theory the latter wouldn't
  * be needed, but we use it to workaround a GWT limitation described in
- * {@link com.gwtplatform.dispatch.rpc.client.DispatchAsync}.
+ * {@code com.gwtplatform.dispatch.rpc.client.DispatchAsync}.
  *
- * @see com.gwtplatform.dispatch.rpc.client.DispatchAsync
- * @see com.gwtplatform.dispatch.rpc.server.Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see DispatchService
  * @see DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public interface DispatchService extends RemoteService {
     /**
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java
index 97b810a0f0..b4c1848fa7 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java
@@ -21,18 +21,14 @@
 
 /**
  * The asynchronous client-side dispatcher service. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
- * 

+ * {@code com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
+ * 

  * This class is closely related to {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}, in theory the latter
  * wouldn't be needed, but we use it to workaround a GWT limitation described in
- * {@link com.gwtplatform.dispatch.rpc.client.DispatchAsync}.
+ * {@code com.gwtplatform.dispatch.rpc.client.DispatchAsync}.
  *
- * @see com.gwtplatform.dispatch.client.DispatchAsync
- * @see com.gwtplatform.dispatch.rpc.server.Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchService
  * @see DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public interface DispatchServiceAsync {
     /**
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java
index d288780154..8485200c43 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java
@@ -21,7 +21,7 @@
 
 /**
  * A common use-case is returning a list value from an action. This provides a simple, type-safe class for such results.
- * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java
index e9c3e9ac7c..ce8dd7f847 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java
@@ -18,8 +18,8 @@
 
 /**
  * A common use-case is returning nothing from an action. This provides a simple, type-safe class for such results.
- * 

- * 

+ * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java
index 18e1d51576..cd92d9698c 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java
@@ -27,10 +27,9 @@
  * the RPC mechanism from generating a serializer for all classes
  * that implement Serializable.
  *
- * @see
- * {@link SimpleResult}

- * {@link MultipleResult}

- * {@link NoResult}

+ * @see SimpleResult
+ * @see MultipleResult
+ * @see NoResult
  *
  */
 public interface Result extends IsSerializable, Serializable {
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java
index 17ffab000c..4732763de1 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java
@@ -19,7 +19,7 @@
 /**
  * A common use-case is returning a single value from an action. This provides a simple, type-safe class for such
  * results.
- * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java
index cacd4835a5..827995a2ce 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java
@@ -18,11 +18,11 @@
 
 /**
  * Default Action using the base path as dispatch/className. The base abstract implementation is {@link Action}.
- * 

+ * 

  * An {@link Action} that uses the standard service name {@code "dispatch"}. Actions inheriting from this are not
  * secured against XSRF attacks, and they will work even if you do not configure a
  * {@link com.gwtplatform.dispatch.shared.SecurityCookie}.
- * 

+ * 

  * Use {@link ActionImpl} for secured set to on by default.
  *
  * @param  The {@link Result} type.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java
index 1c13e5f72f..2cc052e4a3 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java
@@ -28,7 +28,7 @@
  * 

  * If you do not bind this class then autobinding is controlled on a case-by-case
  * basis using the {@link HandlerContainerImpl}'s constructors.
- * 

+ * 

  * Disabling automatic binding can be useful in unit tests, for example.
  */
 @Singleton
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java
index 3aa24c8ac2..a5c234e6c1 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java
@@ -20,7 +20,7 @@
  * A class that can contain handlers. Handlers can be registered when
  * the object is being bound, or at any time while it is bound. They
  * will be automatically unregistered when the class is unbound.
- * 

+ * 

  * For details on the autobinding mechanism, see {@link HandlerContainerImpl}.
  */
 public interface HandlerContainer {
@@ -30,15 +30,15 @@ public interface HandlerContainer {
      * handlers. You should never call {@link #bind()} from the constructor
      * of a non-leaf class since it is meant to be called after the object has
      * been entirely constructed.
-     * 

+     * 

      * When automatic binding is used (see {@link HandlerContainerImpl}), this will
      * be called immediately after the object is constructed through Guice/GIN dependency
      * injection mechanism.
-     * 

+     * 

      * If you are not using automatic binding, or if you later call
      * {@link #unbind()} on this object, you will have to call {@link #bind()}
      * manually.
-     * 

+     * 

      * Multiple call to bind will not fail, the class will be bound once.
      */
     void bind();
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java
index 315b1d70b1..8ba864fa6d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java
@@ -25,7 +25,7 @@
 /**
  * The implementation of {@link HandlerContainer}. Inherit from this class if
  * you want subclasses that can contain handlers.
- * 

+ * 

  * Classes inheriting from {@link HandlerContainerImpl} and that participate in dependency
  * injection with Guice/GIN can use the automatic binding mechanism. See
  * {@link HandlerContainerImpl#HandlerContainerImpl()} and {@link #HandlerContainerImpl(boolean)}
@@ -52,7 +52,7 @@ private static class BindMonitor {
      * Creates a handler container class with automatic binding, unless
      * {@link AutobindDisable} is used to globally disable automatic
      * binding.
-     * 

+     * 

      * Autobinding requires the class to be instantiated by Guice/GIN.
      * If you are instantiating {@link HandlerContainerImpl} with {@code new},
      * autobinding will not work. It is recommended you document it by
@@ -70,7 +70,7 @@ public HandlerContainerImpl() {
      * injection mechanism, unless {@link AutobindDisable} is used to globally
      * disable automatic binding. Otherwise, the user is responsible for calling
      * {@link #bind()}.
-     * 

+     * 

      * Autobinding requires the class to be instantiated by Guice/GIN.
      * If you are instantiating {@link HandlerContainerImpl} with {@code new},
      * autobinding will not work. It is recommended you document it by
@@ -113,19 +113,19 @@ public void unbind() {
 
     /**
      * Lifecycle method called when binding the object.
-     * 

+     * 

      * Important : Make sure you call your parent class {@link #onBind()}. Also, do
      * not call directly, call {@link #bind()} instead.
-     * 

+     * 

      * Any event handler should be
      * initialised here rather than in the constructor. Also, it is good practice to
      * perform any costly initialisation here.
-     * 

+     * 

      * Handlers registered by calling
      * {@link #registerHandler(HandlerRegistration)} will be removed
      * when unbinding. Any other initialisation that takes place here (or as a
      * side-effect of what is done here) should be taken down in {@link #onUnbind()}.
-     * 

+     * 

      * This method will never be invoked more then once, or if it is, the second
      * time will necessarily be preceded by an invocation of {@link #onUnbind()}.
      */
@@ -134,15 +134,15 @@ protected void onBind() {
 
     /**
      * Lifecycle method called when unbinding the object.
-     * 

+     * 

      * Important : Make sure you call your parent class {@link #onUnbind()}.
      * Also, do not call directly, call {@link #unbind()} instead.
-     * 

+     * 

      * Any handler registration recorded with {@link #registerHandler (HandlerRegistration)}
      * will have
      * already been removed at this point. You should override this method to
      * take down any other initialisation that took place in {@link #onBind()}.
-     * 

+     * 

      * This method will never be invoked more then once, or if it is, the second
      * time will necessarily be preceded by an invocation of {@link #onBind()}.
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java
index be6db4923d..42189e0a0e 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java
@@ -21,10 +21,10 @@ public interface HasPopupSlot {
      * This method sets some popup content within the {@link Presenter} and centers it. The view associated with the
      * {@code content}'s presenter must inherit from {@link PopupView}. The popup will be visible and the corresponding
      * presenter will receive the lifecycle events as needed.
-     * 

+     * 

      * No {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent ResetPresentersEvent} is fired, so {@link
      * PresenterWidget#onReset()} is not invoked.
-     * 

+     * 

      *
      * @param child The popup child, a {@link PresenterWidget}.
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java
index 50afc7d1f7..dbdc95acdf 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java
@@ -29,7 +29,7 @@
 
 /**
  * Interface of objects containing slots in which {@link PresenterWidget} can be inserted.
- * 

+ * 

  * Slots are opaque objects and can be of any type. For slots meant to hold only {@link PresenterWidget}s, you will
  * usually declare a {@link IsSlot} constant within your presenter class:
  * 
@@ -45,10 +45,10 @@ public interface HasSlots {
     /**
      * This method adds some content in a specific slot of the {@link Presenter}. The attached {@link View} should
      * manage this slot when its {@link View#addToSlot(Object, IsWidget)} is called.
-     * 

+     * 

      * Contrary to the {@link #setInSlot} method, no {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent
      * ResetPresentersEvent} is fired, so {@link PresenterWidget#onReset()} is not invoked.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot into which the content is being added.
@@ -62,7 +62,7 @@ public interface HasSlots {
      * {@link View} should manage this slot when its {@link View#setInSlot(Object, IsWidget)} is called. It should also
      * clear the slot when the {@link View#setInSlot(Object, IsWidget)} method is called with {@code null} as a
      * parameter.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot to clear.
@@ -73,7 +73,7 @@ public interface HasSlots {
      * This method removes some content in a specific slot of the {@link Presenter}. No {@link
      * com.gwtplatform.mvp.client.proxy.ResetPresentersEvent ResetPresentersEvent} is fired. The attached {@link View}
      * should manage this slot when its {@link View#removeFromSlot(Object, IsWidget)} is called.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot for which the content is being removed.
@@ -85,7 +85,7 @@ public interface HasSlots {
      * This method sets some content in a specific slot of the {@link Presenter}. A {@link
      * com.gwtplatform.mvp.client.proxy.ResetPresentersEvent ResetPresentersEvent} will be fired after the top-most
      * visible presenter is revealed, resulting in a call to {@link PresenterWidget#onReset()}.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot for which the content is being set. The attached view should know what to do with this
@@ -98,7 +98,7 @@ public interface HasSlots {
      * This method sets some content in a specific slot of the {@link Presenter}. The attached {@link View} should
      * manage this slot when its {@link View#setInSlot(Object, IsWidget)} is called. It should also clear the slot when
      * the {@code setInSlot} method is called with {@code null} as a parameter.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot for which the content is being set.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java
index cfec80bc95..c88031ce37 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java
@@ -49,7 +49,7 @@ public interface PopupView extends View {
     /**
      * Important! Do not call this directly. Instead use {@link PresenterWidget#addToPopupSlot(PresenterWidget)},
      * passing this view's {@link PresenterWidget}.
-     * 

+     * 

      * Make sure the {@link PopupView} is visible. Will not reposition the popup before showing it.
      */
     void show();
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
index 69908e42ab..eae0992f0c 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
@@ -29,7 +29,7 @@
 /**
  * A simple implementation of {@link PopupView} that can be used when the widget returned by {@link #asWidget()}
  * inherits from {@link PopupPanel}.
- * 

+ * 

  * Also, this implementation simply disregards every call to {@link #setInSlot(Object, IsWidget)}, {@link
  * #addToSlot(Object, IsWidget)}, and {@link #removeFromSlot(Object, IsWidget)}.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java
index 27a0f57f07..c31c70cc75 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java
@@ -23,7 +23,7 @@
  * Base class for a {@link PopupView} that implements the {@link HasUiHandlers}
  * interface. You should always call {@link #setUiHandlers(UiHandlers)} from your
  * presenter 's constructor.
- * 

+ * 

  * Important! Never call {@link #getUiHandlers()} inside your constructor
  * since the {@link UiHandlers} are not yet set.
  *
@@ -59,7 +59,7 @@ protected PopupViewWithUiHandlers(EventBus eventBus, PopupPositioner positioner)
 
     /**
      * Access the {@link UiHandlers} associated with this {@link View}.
-     * 

+     * 

      * Important! Never call {@link #getUiHandlers()} inside your constructor
      * since the {@link UiHandlers} are not yet set.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java
index 17a6181ab4..0eb945b55a 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java
@@ -33,9 +33,9 @@
  * model-view-presenter architecture. Each logical page of your application will usually
  * correspond to a singleton {@link Presenter}. If you need to separate logic from view
  * in a simple graphical component, you might consider using a {@link PresenterWidget}.
- * 

+ * 

  * For more details on the hierarchical organization of presenters, see {@link PresenterWidget}.
- * 

+ * 

  * Each presenter is associated to a {@link Proxy} which is responsible for listening to the
  * various events of interest for this presenter. This makes it possible to lazily instantiate
  * the presenter and use GWT code splitting. Proxies are automatically generated for you
@@ -65,7 +65,7 @@
  * {@link com.gwtplatform.mvp.client.annotations.ProxyCodeSplit ProxyCodeSplit} or
  * {@link com.gwtplatform.mvp.client.annotations.ProxyCodeSplitBundle ProxyCodeSplitBundle}
  * must always annotate the {@link Proxy} interface.
- * 

+ * 

  * To reveal a presenter associated to a {@link com.gwtplatform.mvp.client.proxy.ProxyPlace ProxyPlace}
  * you can simply navigate to an hyperlink corresponding to this place's name token. The
  * {@link com.gwtplatform.mvp.client.proxy.PlaceManager PlaceManager} offers a number of method for building
@@ -86,13 +86,13 @@
  * order to enforce loose coupling. This event is then handled by the presenter
  * using the {@link com.gwtplatform.mvp.client.annotations.ProxyEvent ProxyEvent}
  * mechanism.
- * 

+ * 

  * If the presenter is revealed and is not currently visible, then its {@link #revealInParent()} method
  * will be called.
- * 

+ * 

  * To hide a presenter, you can reveal another one in the same slot or you can use
  * one of the methods described in {@link PresenterWidget}.
- * 

+ * 

  * A presenter has a number of lifecycle methods that you can hook on to:
  * 
    
  * 
  • {@link #onBind()}
@@ -109,7 +109,7 @@
  * 
  • The presenter's {@link #revealInParent()} is call and it asks to be set in one of its
  * parent slot by firing a
  * {@link com.gwtplatform.mvp.client.proxy.RevealContentEvent RevealContentEvent}
    • 
- * 
  • If a presenter already occupies this slot it is removed.
    • 
+ * 
  • If a presenter already occupies this slot it is removed.
  * 
    • If the presenter owning the slot is currently visible then
  * {@link #onHide()} is called on the removed presenter and, recursively,
  * on its children (bottom-up: first the children, then the parent)
      • 
@@ -118,7 +118,7 @@
  * too, this continues recursively until a visible presenter is reached, or until a presenter fires
  * {@link com.gwtplatform.mvp.client.proxy.RevealRootContentEvent RevealRootContentEvent}
  * or {@link com.gwtplatform.mvp.client.proxy.RevealRootLayoutContentEvent RevealRootLayoutContentEvent}
- * 
    
+ * 

  * 
  • When the above chain stops, {@link #onReveal} is called on all the presenters
  * that were traversed. (top down: first the parent, then the children);
    • 
  * 
  • Finally {@link #onReset()} is called on all the
@@ -302,7 +302,7 @@ public final Proxy_ getProxy() {
      * to edit client details is unusable until all the data for this user has been
      * received. Fetching this data should be done in the {@link #prepareFromRequest(PlaceRequest)}
      * method.
-     * 
    
+     * 
    
      * In order to use manual reveal, override this method to return {@code true}.
      * Then, in your {@link #prepareFromRequest}, you can either:
      * 
      
@@ -330,10 +330,10 @@ public boolean useManualReveal() {
      * to this {@link Presenter}. You should override the method to extract any
      * parameters you need from the request. Make sure you call your parent's
      * {@code #prepareFromRequest} method.
-     * 
      
+     * 
      
      * If your presenter needs to fetch some information from the server while
      * preparing itself, consider using manual reveal. See {@link #useManualReveal()}.
-     * 
      
+     * 
      
      * If your presenter does not handle any parameter and does not want to fetch
      * extra information, then there is no need to override this method.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java
index f9bb4746e4..6c49138c37 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java
@@ -44,7 +44,7 @@
 /**
  * A presenter that does not have to be a singleton. Pages from your
  * application will usually be singletons and extend the {@link Presenter} class.
- * 
      
+ * 
      
  * Choosing between a {@link Presenter} and {@link PresenterWidget} is a design decision that
  * requires some thought. For example, a {@link PresenterWidget} is useful when
  * you need a custom widget with extensive logic. For example, a chat box that can be instantiated
@@ -53,12 +53,12 @@
  * parent presenter, which increases coupling. Therefore, you should use a {@link Presenter} when
  * the parent is not expected to know its child. Moreover, only {@link Presenter} can be attached
  * to name tokens in order to support browser history.
- * 
      
+ * 
      
  * {@link PresenterWidget}s and {@link Presenter}s are organized in a hierarchy.
  * Internally, parent presenters have links to their currently attached children presenters. A
  * parent {@link Presenter} can contain either {@link Presenter}s or {@link PresenterWidget}s,
  * but a {@link PresenterWidget} can only contain {@link PresenterWidget}s.
- * 
      
+ * 
      
  * To reveal a {@link PresenterWidget} you should insert it within a {@link HasSlots slot} of its
  * containing presenter using one of the following methods:
  * 
        
@@ -68,7 +68,7 @@
  * 
      • {@link #addToPopupSlot(PresenterWidget)}
  * 
      
  * Revealing a {@link Presenter} is done differently, refer to the class documentation for more details.
- * 
      
+ * 
      
  * To hide a {@link PresenterWidget} or a {@link Presenter} you can use {@link #setInSlot} to place
  * another presenter in the same slot, or you can call one of the following methods:
  * 
        
@@ -77,7 +77,7 @@
  * 
      • {@link PopupView#hide()} if the presenter is a popup or a dialog box.
  * 
      
  * Hide a {@link Presenter} using these methods, but
- * 
      
+ * 
      
  * A presenter has a number of lifecycle methods that you can hook on to:
  * 
        
  * 
      • {@link #onBind()}
@@ -90,7 +90,7 @@
  * these lifecycle methods being called. For an example, here is what happens following
  * a call to {@link #setInSlot(IsSlot, PresenterWidget)}:
  * 
          
- * 
        • If a presenter already occupies this slot it is removed.
          • 
+ * 
        • If a presenter already occupies this slot it is removed.
  * 
          • If the presenter owning the slot is currently visible then
  * {@link #onHide()} is called on the removed presenter and, recursively,
  * on its children (bottom-up: first the children, then the parent)
            • 
@@ -98,7 +98,7 @@
  * set in one of its parent slot by firing a
  * {@link com.gwtplatform.mvp.client.proxy.RevealContentEvent RevealContentEvent}.
  * For more details, see the documentation for {@link Presenter}.
- * 
          
+ * 
        • 
  * 
      • If, at this point, the presenter owning the slot is not visible, then the
  * chain stops. Otherwise, {@link #onReveal()} is called on the {@link PresenterWidget} that
  * was just added.
        • 
@@ -178,10 +178,10 @@ public void addToPopupSlot(PresenterWidget child) {
     /**
      * This method adds some content in a specific slot of the {@link Presenter}. The attached {@link View} should
      * manage this slot when its {@link View#addToSlot(Object, IsWidget)} is called.
-     * 
        
+     * 
        
      * Contrary to the {@link #setInSlot(IsSlot, PresenterWidget)} method, no {@link ResetPresentersEvent} is fired, so
      * {@link PresenterWidget#onReset()} is not invoked.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot into which the content is being added.
@@ -214,7 +214,7 @@ public Widget asWidget() {
      * This method clears the content in a specific slot. No {@link ResetPresentersEvent} is fired. The attached {@link
      * View} should manage this slot when its {@link View#setInSlot(Object, IsWidget)} is called. It should also clear
      * the slot when called with {@code null} as a parameter.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot Specific slot to clear.
@@ -309,7 +309,7 @@ public void removeFromPopupSlot(PresenterWidget child) {
      * This method removes some content in a specific slot of the {@link Presenter}. No {@link ResetPresentersEvent} is
      * fired. The attached {@link View} should manage this slot when its {@link View#removeFromSlot(Object, IsWidget)}
      * is called.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot for which the content is being removed.
@@ -336,7 +336,7 @@ private void rawRemoveFromSlot(IsSlot slot, PresenterWidget child) {
      * This method sets some content in a specific slot of the {@link Presenter}. The attached {@link View} should
      * manage this slot when its {@link View#setInSlot(Object, IsWidget)} is called. It should also clear the slot when
      * the called with {@code null} as a parameter.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot for which the content is being set.
@@ -351,7 +351,7 @@ public > void setInSlot(IsSlot slot, T child) {
      * This method sets some content in a specific slot of the {@link Presenter}. The attached {@link View} should
      * manage this slot when its {@link View#setInSlot(Object, IsWidget)} is called. It should also clear the slot when
      * called with {@code null} as a parameter.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot for which the content is being set.
@@ -458,17 +458,17 @@ protected final EventBus getEventBus() {
     /**
      * Lifecycle method called whenever this presenter is about to be
      * hidden.
-     * 
        
+     * 
        
      * Important: Make sure you call your superclass {@code #onHide()} if
      * you override. Also, do not call directly, see {@link PresenterWidget}
      * for more details on lifecycle methods.
-     * 
        
+     * 
        
      * You should override this method to dispose of any object
      * created directly or indirectly during the call to {@link #onReveal()}.
-     * 
        
+     * 
        
      * This method will not be invoked a multiple times without {@link #onReveal()}
      * being called.
-     * 
        
+     * 
        
      * In a presenter hierarchy, this method is called bottom-up: first on the
      * child presenters, then on the parent.
      */
@@ -478,20 +478,20 @@ protected void onHide() {
     /**
      * Lifecycle method called on all visible presenters whenever a
      * presenter is revealed anywhere in the presenter hierarchy.
-     * 
        
+     * 
        
      * Important: Make sure you call your superclass {@code #onReset()} if
      * you override. Also, do not call directly, fire a {@link ResetPresentersEvent}
      * to perform a reset manually. See {@link PresenterWidget} for more details on
      * lifecycle methods.
-     * 
        
+     * 
        
      * This is one of the most frequently used lifecycle method. This is usually a good
      * place to refresh any information displayed by your presenter.
-     * 
        
+     * 
        
      * Note that {@code #onReset()} is not called only when using
      * {@link #addToSlot(MultiSlot, PresenterWidget)}, {@link #addToPopupSlot(PresenterWidget)}
      * or #setInSlot(Object, PresenterWidget, boolean)} with {@code false} as the third
      * parameter.
-     * 
        
+     * 
        
      * In a presenter hierarchy, this method is called top-down: first on the
      * parent presenters, then on the children.
      */
@@ -501,18 +501,18 @@ protected void onReset() {
     /**
      * Lifecycle method called whenever this presenter is about to be
      * revealed.
-     * 
        
+     * 
        
      * Important: Make sure you call your superclass {@code #onReveal()} if
      * you override. Also, do not call directly, see {@link PresenterWidget}
      * for more details on lifecycle methods.
-     * 
        
+     * 
        
      * You should override this method to perform any action or initialisation
      * that needs to be done when the presenter is revealed. Any initialisation
      * you perform here should be taken down in {@link #onHide()}.
-     * 
        
+     * 
        
      * Information that needs to be updated whenever the user navigates should
      * be refreshed in {@link #onReset()}.
-     * 
        
+     * 
        
      * In a presenter hierarchy, this method is called top-down: first on the
      * parent presenters, then on the children.
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java
index 7915e09e24..1da1ae0077 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java
@@ -45,7 +45,7 @@
  * from presenter widget, but it's just because it doesn't need a proxy has it
  * will be bound as an eager singleton. It sets content within GWT's
  * {@link RootPanel} and {@link RootLayoutPanel}.
- * 
        
+ * 
        
  * Fire a {@link RevealRootContentEvent} or {@link RevealRootLayoutContentEvent}
  * to set your presenter at the top level. The choice depends on whether your
  * presenter works as a {@link com.google.gwt.user.client.ui.Panel} or as a
@@ -132,7 +132,7 @@ public void unlockScreen() {
 
         /**
          * Return the RootPanel on which to add the content.
-         * 
        
+         * 
        
          * It returns the default RootPanel.
          * It can be overriden to return another RootPanel to allow embeding the application.
          * @return the RootPanel on which to add the content
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java
index a3a2eb4ba3..f515405c8a 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java
@@ -17,6 +17,7 @@
 package com.gwtplatform.mvp.client;
 
 import com.google.gwt.user.client.ui.IsWidget;
+import com.gwtplatform.mvp.client.presenter.slots.RemovableSlot;
 
 /**
  * The interface for view classes that handles all the UI-related code for a
@@ -26,13 +27,13 @@ public interface View extends IsWidget {
 
     /**
      * Requests the view to add content within a specific slot.
-     * 
        
+     * 
        
      * Override the default implementation and manage all the slots of your view
      * into which content can be added. You should also consider overriding
      * {@link #removeFromSlot(Object, IsWidget)}.
      * If the view doesn't know about this slot, it can silently ignore the request.
-     * 
        
-     * Used by {@link PresenterWidget#addToSlot(Object, PresenterWidget)}.
+     * 
        
+     * Used by {@link PresenterWidget#addToSlot(com.gwtplatform.mvp.client.presenter.slots.MultiSlot, PresenterWidget)}.
      *
      * @param slot    An opaque object indicating the slot to add into.
      * @param content The content to add, a {@link IsWidget}.
@@ -41,13 +42,13 @@ public interface View extends IsWidget {
 
     /**
      * Requests the view to remove content from a specific slot.
-     * 
        
+     * 
        
      * Override the default implementation and manage all the slots of your view
      * into which content can be added and removed. You should also override
      * {@link #addToSlot(Object, IsWidget)}.
      * If the view doesn't know about this slot, it can silently ignore the request.
-     * 
        
-     * Used by {@link PresenterWidget#removeFromSlot(Object, PresenterWidget)}.
+     * 
        
+     * Used by {@link PresenterWidget#removeFromSlot(RemovableSlot, PresenterWidget)}.
      *
      * @param slot    An opaque object indicating the slot to remove from.
      * @param content The content to remove, a {@link IsWidget}.
@@ -57,14 +58,14 @@ public interface View extends IsWidget {
     /**
      * Requests the view to set content within a specific slot, clearing anything
      * that was already contained there.
-     * 
        
+     * 
        
      * Override the default implementation and manage all the slots of your view
      * into which content can be placed. If the view doesn't know about this slot,
      * it can silently ignore the request. When {@code null} is passed, your
      * implementation should clear the slot.
-     * 
        
-     * Used by {@link PresenterWidget#setInSlot(Object, PresenterWidget)} and
-     * {@link PresenterWidget#clearSlot(Object)}.
+     * 
        
+     * Used by {@link PresenterWidget#setInSlot(com.gwtplatform.mvp.client.presenter.slots.IsSlot, PresenterWidget)}
+     * and {@link PresenterWidget#clearSlot(RemovableSlot)}.
      *
      * @param slot    An opaque object indicating the slot to add into.
      * @param content The content to add, a {@link IsWidget}. Pass {@code null} to
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java
index f61f0ad595..572732df09 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java
@@ -34,10 +34,10 @@
 /**
  * A simple implementation of {@link View} that simply disregard every call to {@link #setInSlot(Object, IsWidget)},
  * {@link #addToSlot(Object, IsWidget)}, and {@link #removeFromSlot(Object, IsWidget)}.
- * 
        
+ * 
        
  * Feel free not to inherit from this if you need another base class (such as {@link
  * com.google.gwt.user.client.ui.Composite Composite}), but you will have to define the above methods.
- * 
        
+ * 
        
  * * Important call {@link #initWidget(IsWidget)} in your {@link View}'s constructor.
  */
 public abstract class ViewImpl implements View {
@@ -127,7 +127,7 @@ public Widget asWidget() {
      * Link a {@link IsSingleSlot} sub-type to a container. The container must implement either {@link HasOneWidget} or
      * {@link HasWidgets}. Here we accept {@code Object} to prevent the hassle of of casting {@code container} if it
      * implements both interfaces.
-     * 
        
+     * 
        
      * {@link HasOneWidget} has checked first.
      *
      * @param slot      the slot
@@ -180,7 +180,7 @@ protected void initWidget(IsWidget widget) {
 
     /**
      * Method called after the view is attached to the DOM.
-     * 
        
+     * 
        
      * You should override this method to perform any ui related initialization that needs to be done after that the
      * view is attached and that the presenter doesn't have to be aware of (attach event handlers for instance)
      */
@@ -189,7 +189,7 @@ protected void onAttach() {
 
     /**
      * Method called after the view is detached to the DOM.
-     * 
        
+     * 
        
      * You should override this method to release any resources created directly or indirectly during the call to {@link
      * #onAttach()}
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java
index c26285b533..884d8b6b13 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java
@@ -22,7 +22,7 @@
  * Base class for a {@link View} that implements the {@link HasUiHandlers}
  * interface. You should always call {@link #setUiHandlers(UiHandlers)} from your
  * presenter's constructor.
- * 
        
+ * 
        
  * Important! Never call {@link #getUiHandlers()} inside your constructor
  * since the {@link UiHandlers} are not yet set.
  *
@@ -36,7 +36,7 @@ public abstract class ViewWithUiHandlers extends ViewImpl
 
     /**
      * Access the {@link UiHandlers} associated with this {@link View}.
-     * 
        
+     * 
        
      * Important! Never call {@link #getUiHandlers()} inside your constructor
      * since the {@link UiHandlers} are not yet set.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java
index 8aca01e0f3..a07e4a0b0d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java
@@ -28,14 +28,14 @@
  * com.gwtplatform.common.client.IndirectProvider provider} which is used to load the presenter behind the proxy. Using
  * a custom provider enables you to add steps which should happen before the presenter is loaded, instantiated
  * and processed by GIN.
- * 
        
+ * 
        
  * The class implementing {@code IndirectProvider} must provide a constructor which takes the original provider as the
  * single argument. For presenters which use {@link ProxyStandard @ProxyStandard} this is {@link jakarta.inject.Provider
- * Provider<T>}; for presenters which use {@link ProxyCodeSplit @ProxyCodeSplit} or {@link ProxyCodeSplitBundle
- * @ProxyCodeSplitBundle } this is {@link com.google.gwt.inject.client.AsyncProvider AsyncProvider<T>}
- * 
        
+ * Provider<T>}; for presenters which use {@link ProxyCodeSplit @ProxyCodeSplit} or {@link ProxyCodeSplitBundle}
+ * this is {@link com.google.gwt.inject.client.AsyncProvider AsyncProvider<T>}
+ * 
        
  * Here is an example use of {@code @CustomProvider}:
- * 
        
+ * 
        
  * 
          * @ProxyCodeSplit
  * @CustomProvider(SecurityContextProvider.class)
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java
index c2944335d5..0cc1589f51 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java
@@ -21,10 +21,10 @@
 
 /**
  * This annotation lets you define the parameters for a
- * {@link GatekeeperWithParams} to use for the
+ * {@code GatekeeperWithParams} to use for the
  * {@link com.gwtplatform.mvp.client.proxy.Place} associated
  * with your proxy. Your custom {@code Ginjector} must have a
- * method returning the {@link GatekeeperWithParams} specified
+ * method returning the {@code GatekeeperWithParams} specified
  * in this annotation.
  */
 @Target(ElementType.TYPE)
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java
index aa6938a57b..ff297ea071 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java
@@ -24,9 +24,9 @@
  * you want the associated {@link com.gwtplatform.mvp.client.Presenter} to sit
  * behind a split point. Thus the javascript code will be compiled into a new
  * javascript file and only be loaded from the webapplication server if needed.
- * 
        
+ * 
        
  * Here is an example use of {@link ProxyCodeSplit}:
- * 
        
+ * 
        
  * 
          * @ProxyCodeSplit
  * public interface MyProxy extends ProxyPlace<MyPresenter> {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java
index 257018ef00..30add63d94 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java
@@ -25,21 +25,21 @@
  * Use this annotation if you want to have certain {@link com.gwtplatform.mvp.client.proxy.Proxy Proxy}s and their
  * associated {@link com.gwtplatform.mvp.client.Presenter Presenter}s to sit behind one split point and to be compiled
  * into one javascript file separately from others.
- * 
        
+ * 
        
  * Use this annotation if you already have too much code splitting using {@link ProxyCodeSplit} and it is more efficient
  * to group {@link com.gwtplatform.mvp.client.Presenter Presenter}s because they share a bulk of their code. You will
  * also have to set up your own implementation of a {@link ProviderBundle}.
- * 
        
+ * 
        
  * ProviderBundles can be created manually or be generated by GWTP. For the manual approach the {@link
  * ProxyCodeSplitBundle#bundleClass()} and {@link ProxyCodeSplitBundle#id()} need to be defined.
- * 
        
+ * 
        
  * Here is an example use of {@link ProxyCodeSplitBundle} using manual declaration:
  * 
          * @ProxyCodeSplitBundle(bundleClass = MyPresenterBundle.class, id = MyPresenterBundle.ID_Object1)
  * public interface MyProxy extends ProxyPlace<Object1> {
  * }
  * 
        
- * If you use GWTP's generation of {@link com.gwtplatform.mvp.client.ApplicationController ApplicationController} all
+ * If you use GWTP's generation of {@code com.gwtplatform.mvp.client.ApplicationController} all
  * bundles will be automatically generated for you, all that you need are string identifiers for each unique bundle. The
  * best way to keep your bundles in order is to create an interface that identifies your bundles.
  * 
        
@@ -54,7 +54,7 @@
  * public interface MyProxy extends ProxyPlace<Object1> {
  * }
  * 
        
- * 
        
+ * 
        
  *
  * @see ProviderBundle
  * @see Code Splitting
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java
index 2bd0843779..9b192fa08f 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java
@@ -23,10 +23,10 @@
  * Use this to annotate an event-handling method that should be registered in
  * the proxy rather than being registered in the presenter. Handlers annotated
  * in this way should not be registered in the Presenter.
- * 
        
+ * 
        
  * The presenter will be instantiated as soon as the proxy intercepts the event, so
  * the presenter will handle the event even if it was not yet initialized.
- * 
        
+ * 
        
  * Methods annotated by {@code @ProxyEvent} must return {@code void} and accept
  * a single parameter derived from {@link com.google.web.bindery.event.shared.Event Event}.
  * This event class must have a static {@code getType} method returning a type
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java
index 34a4ee8dfd..ea1c61083e 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java
@@ -23,9 +23,9 @@
  * Use this annotation with a {@link com.gwtplatform.mvp.client.proxy.Proxy} if
  * you don't want the associated {@link com.gwtplatform.mvp.client.Presenter} to
  * sit behind a split point.
- * 
        
+ * 
        
  * Here is an example use of {@link ProxyStandard}:
- * 
        
+ * 
        
  * 
          * @ProxyStandard
  * public interface MyProxy extends ProxyPlace<MyPresenter> {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java
index c145085145..b5a62e6901 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java
@@ -32,7 +32,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using automatically generated proxy classes and non-singleton views.
-     * 
        
+     * 
        
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -80,7 +80,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using automatically generated proxy classes and non-singleton views.
-     * 
        
+     * 
        
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -125,7 +125,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using custom-made proxy classes and non-singleton views.
-     * 
        
+     * 
        
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -179,7 +179,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using custom-made proxy classes and non-singleton views.
-     * 
        
+     * 
        
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -284,7 +284,7 @@ protected  void bindPresenterWidgetFactory(Class
         presenterFactory,
 
     /**
      * Bind a view interface to its implementation in a non-singleton manner.
-     * 
        
+     * 
        
      * Important! This is only be meant to be used for presenter associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will use this method with
@@ -307,7 +307,7 @@ protected  void bindSharedView(Class view,
     /**
      * Convenience method for binding a singleton {@link PresenterWidget} with its
      * {@link View}.
-     * 
        
+     * 
        
      * Important! If you want to use the same {@link PresenterWidget} in
      * many different places, you should consider making it non-singleton with
      * {@link #bindPresenterWidget}. It is possible to use the same singleton
@@ -335,7 +335,7 @@ protected 
        , V extends View> void bindSingletonPrese
     /**
      * Convenience method for binding a singleton {@link PresenterWidget} with its
      * {@link View}.
-     * 
        
+     * 
        
      * Important! If you want to use the same {@link PresenterWidget} in
      * many different places, you should consider making it non-singleton with
      * {@link #bindPresenterWidget}. It is possible to use the same singleton
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java
index 83144b1bdf..2189147377 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java
@@ -131,7 +131,7 @@ String getDefaultPlace() {
      * When instantiating the module this way be sure to read {@link DefaultPlaceManager} and manually bind the required
      * constants. Consider using {@link DefaultModule.Builder} if you need to use a different implementation than the
      * default one for a binding.
-     * 
        
+     * 
        
      * Important! If you use this class, don't forget to bind {@link DefaultPlace}, {@link ErrorPlace} and {@link
      * UnauthorizedPlace} to name tokens associated to a presenter.
        
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java
index 30e96b9256..a20b89a6b3 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java
@@ -23,7 +23,7 @@
  * Use NestedSlot in classes extending {@link com.gwtplatform.mvp.client.Presenter}
  * to automatically display child presenters.
  *
- * @see: https://github.com/ArcBees/GWTP/wiki/Presenter-%22Slots%22
+ * see: https://github.com/ArcBees/GWTP/wiki/Presenter-%22Slots%22
  */
 public class NestedSlot extends GwtEvent.Type>
         implements IsSingleSlot>, RemovableSlot> {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java
index 93639eb96a..dea796f167 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java
@@ -29,15 +29,15 @@
 /**
  * This is a subtype of {@link com.gwtplatform.mvp.client.proxy.PlaceManagerImpl PlaceManagerImpl} that uses
  * custom name tokens to reveal default, error and unauthorized places.
- * 
        
+ * 
        
  * Important! If you use this class, don't forget to bind {@link DefaultPlace DefaultPlace},
  * {@link ErrorPlace ErrorPlace} and {@link UnauthorizedPlace UnauthorizedPlace} to valid name tokens.
- * 
        
+ * 
        
  * Note: The default, error and unauthorized places are revealed without updating the browser's URL (hence
  * the false value passed in {@link #revealPlace(PlaceRequest, boolean) revealPlace}).
  * This will avoid stepping into an infinite navigation loop if the user navigates back (using the browser's back
  * button).
- * 
        
+ * 
        
  * Here's an example of infinite navigation loop that we want to avoid:
  * 
          
  * 
        1. An unauthenticated hits #admin (a place reserved to authenticated admins)
          2. 
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java
index c0a7036c0a..017f1c7479 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java
@@ -39,7 +39,7 @@
  * You must also make sure that your custom Ginjector provides a {@code get}
  * method returning this {@link Gatekeeper} if you want to use it with the
  * {@link com.gwtplatform.mvp.client.annotations.UseGatekeeper @UseGatekeeper} annotation.
- * 
          
+ * 
          
  * You should usually bind your {@link Gatekeeper} as a singleton.
  */
 public interface Gatekeeper {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java
index 0beb67a617..860c342f6f 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java
@@ -19,7 +19,7 @@
 /**
  * Specialized {@link Gatekeeper} which needs additional parameters
  * in order to find out if the protected {@link Place} can be revealed.
- * 
        
+ * 
        
  * Example of use:
  * 
          * public class HasAllRolesGatekeeper implements GatekeeperWithParams {
@@ -44,12 +44,12 @@
  * }
  * }
  * 
        
- * 
        
+ * 
        
  * You must also make sure that your custom Ginjector provides a {@code get}
  * method returning this {@link GatekeeperWithParams} if you want to use it
  * with the {@link com.gwtplatform.mvp.client.annotations.GatekeeperParams}
  * annotation.
- * 
        
+ * 
        
  * You should usually bind your {@link GatekeeperWithParams} as a singleton.
  */
 public interface GatekeeperWithParams extends Gatekeeper {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java
index ce404477bb..b3005041bd 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java
@@ -23,10 +23,11 @@
  * This event is fired whenever interaction should be locked throughout the application,
  * usually because a navigation operation is taking place and interacting could cause
  * unexpected state switches.
- * 
        
+ * 
        
  * This event is typically fired by the {@link PlaceManager} whenever a navigation operation
  * starts or stops. It is handled by the default {@link com.gwtplatform.mvp.client.RootPresenter} implementation.
- * Override {@link com.gwtplatform.mvp.client.RootPresenter#lockInteraction(boolean)} to customize the behaviour.
+ * Override {@link com.gwtplatform.mvp.client.RootPresenter#onLockInteraction(LockInteractionEvent)} to customize
+ * the behaviour.
  */
 public class LockInteractionEvent extends GwtEvent {
     private static Type TYPE;
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java
index 5aa6a96ba3..60c0f9c8a2 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java
@@ -23,9 +23,9 @@
  * This implementation of {@link AsyncCallback} can be used when fetching data from the server within {@link
  * Presenter#prepareFromRequest(com.gwtplatform.mvp.shared.proxy.PlaceRequest)} for a presenter that uses manual reveal
  * (see {@link Presenter#useManualReveal()}.
- * 
        
+ * 
        
  * Use {@link #create(Presenter, AsyncCallback)} to attach that callback to your own.
- * 
        
+ * 
        
  * For more complex scenarios you can use {@link ProxyPlace#manualReveal(Presenter)}.
  *
  * @param  The type of the return value, see {@link AsyncCallback}.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java
index e4cdcb9259..498f63495d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java
@@ -24,7 +24,7 @@
  * Event fired after navigation has occurred. It will not be fired if navigation is
  * refused through {@link PlaceManager#setOnLeaveConfirmation}, instead
  * {@link NavigationRefusedEvent} will.
- * 
        
+ * 
        
  * Instead of registering your presenter towards this event, consider overriding
  * {@link com.gwtplatform.mvp.client.PresenterWidget#onReset()}. From there
  * you can call {@link PlaceManager#getCurrentPlaceRequest()} to get the
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java
index dba3a4444e..5644365489 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java
@@ -23,7 +23,7 @@
  * An implementation of {@link AsyncCallback} that sends events on the {@link EventBus} whenever
  * an async call starts, succeeds, or fails. The events fired are {@link AsyncCallStartEvent},
  * {@link AsyncCallSucceedEvent}, {@link AsyncCallFailEvent}.
- * 
        
+ * 
        
  * So the way to use {@link NotifyingAsyncCallback} is the following:
  * 
          *   NotifyingAsyncCallback callback = new NotifyingAsyncCallback(eventBus) { ... };
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java
index 77b0fd6537..cb9094b8f4 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java
@@ -21,7 +21,7 @@
 /**
  * Important: For simplicity, places do not participate in dependency
  * injection and can be created with new.
- * 
        
+ * 
        
  * A place represents a particular 'bookmark' or location inside the
  * application. A place is stateful - it may represent a location with it's
  * current settings, such as a particular ID value, or other unique indicators
@@ -32,7 +32,7 @@ public interface Place {
 
     /**
      * Checks if the associated presenter can be revealed.
-     * 
        
+     * 
        
      * The default implementation of this method always return true,
      * but subclasses should override this and check to make sure the current user
      * has the privileges to see the place. Make sure the places you request in
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java
index bb9b64ef42..87c9ffcfb4 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java
@@ -32,7 +32,7 @@ public interface PlaceManager extends HasHandlers {
      * Builds a string corresponding to the history token to reveal the specified
      * {@link com.gwtplatform.mvp.shared.proxy.PlaceRequest}. This can be used with a
      * {@link com.google.gwt.user.client.ui.Hyperlink}.
-     * 
        
+     * 
        
      * Invoking this history token will discard all the place hierarchy, effectively revealing the
      * request as a top-level place. To keep the place hierarchy, see
      * {@link #buildRelativeHistoryToken(com.gwtplatform.mvp.shared.proxy.PlaceRequest)},
@@ -49,7 +49,7 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Builds a string corresponding to the history token to reveal the specified place from the
      * current place hierarchy.
-     * 
        
+     * 
        
      * Examples, suppose the current hierarchy is {@code requestA > requestB > requestC}
      * 
          
      * 
        • Calling {@code revealRelativePlace(-1)} will make a link to
@@ -73,7 +73,7 @@ public interface PlaceManager extends HasHandlers {
      * Builds a string corresponding to the history token to reveal the specified {@link PlaceRequest}
      * as a child of the current place hierarchy. Identical to calling
      * {@link #buildRelativeHistoryToken(PlaceRequest, int)} with a level of {@code 0}.
-     * 
          
+     * 
          
      * To get the history token for revealing as a top-level place, see {@link #buildHistoryToken}. To
      * navigate back to a specific place in the hierarchy, see
      * {@link #buildRelativeHistoryToken(int)}.
@@ -88,11 +88,11 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Builds a string corresponding to the history token to reveal the specified {@link PlaceRequest}
      * relative to the other places in the current place hierarchy.
-     * 
          
+     * 
          
      * To get the history token for revealing as a top-level place, see {@link #buildHistoryToken}. To
      * navigate back to a specific place in the hierarchy, see
      * {@link #buildRelativeHistoryToken(int)}.
-     * 
          
+     * 
          
      * Examples, suppose the current hierarchy is {@code requestA > requestB > requestC}
      * 
            
      * 
          • Calling {@code buildRelativeHistoryToken(requestD, 0)} will make a link to
@@ -159,10 +159,10 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Updates History without firing a {@link com.google.gwt.event.logical.shared.ValueChangeEvent}.
      * Only the last {@link PlaceRequest} of the place request hierarchy is modified.
-     * 
            
+     * 
            
      * This method will only work if the passed {@link PlaceRequest} has the same name token as the
      * current place request (see {@link #getCurrentPlaceRequest()}.
-     * 
            
+     * 
            
      * If {@code true} is passed as a second parameter, then this method causes a new token to be
      * added to the browser history, affecting the behavior of the browser's back button.
      *
@@ -185,7 +185,7 @@ public interface PlaceManager extends HasHandlers {
      * with it. Consider passing {@code false} as the second parameter of {@code revealPlace},
      * otherwise a new token will be inserted in the browser's history and hitting the browser's
      * back button will not take the user out of the application.
-     * 
            
+     * 
            
      * Important! Make sure you build a valid {@link PlaceRequest} and that the user has access
      * to it, otherwise you might create an infinite loop.
      */
@@ -199,9 +199,9 @@ public interface PlaceManager extends HasHandlers {
      * second parameter of {@code revealPlace}, otherwise a new token will be inserted in the
      * browser's history and hitting the browser's back button will take the user back to the
      * invalid page he initially tried to access.
-     * 
            
+     * 
            
      * The default implementation is simply to call {@link #revealDefaultPlace()}.
-     * 
            
+     * 
            
      * Important! Make sure you build a valid {@link PlaceRequest} and that the user has access
      * to it, otherwise you might create an infinite loop.
      *
@@ -221,9 +221,9 @@ public interface PlaceManager extends HasHandlers {
      * be inserted in the browser's history and hitting the browser's back button will take
      * the user
      * back to the unauthorized page he initially tried to access.
-     * 
            
+     * 
            
      * The default implementation is simply to call {@link #revealErrorPlace(String)}.
-     * 
            
+     * 
            
      * Important! Make sure you build a valid {@link PlaceRequest} and that the user has access
      * to it, otherwise you might create an infinite loop.
      *
@@ -236,10 +236,10 @@ public interface PlaceManager extends HasHandlers {
      * current page. Navigating away can happen either occur by changing the program state (the
      * history token), by entering an external URL or by closing the window. All cases will be
      * handled.
-     * 
            
+     * 
            
      * If the user indicates that he doesn't accept the navigation, then the navigation will be
      * cancelled, {@link NavigationRefusedEvent} will be triggered and the current page will remain.
-     * 
            
+     * 
            
      *
      * @param question The question to display. Pass {@code null} to accept navigation directly,
      *                 without asking a question.
@@ -249,7 +249,7 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Programmatically reveals the specified place, updating the browser URL in the process. If you
      * don't want the browser's URL to be updated see {@link #revealPlace(PlaceRequest, boolean)}.
-     * 
            
+     * 
            
      * This discards the current place hierarchy, effectively revealing the request as a top-level
      * place. To keep the current place hierarchy, see {@link #revealRelativePlace(PlaceRequest)},
      * {@link #revealRelativePlace(PlaceRequest, int)} or {@link #revealRelativePlace(int)}. To reveal
@@ -262,7 +262,7 @@ public interface PlaceManager extends HasHandlers {
 
     /**
      * Programmatically reveals the specified place.
-     * 
            
+     * 
            
      * This discards the current place hierarchy, effectively revealing the request as a top-level
      * place. To keep the current place hierarchy, see {@link #revealRelativePlace(PlaceRequest)},
      * {@link #revealRelativePlace(PlaceRequest, int)} or {@link #revealRelativePlace(int)}. To reveal
@@ -278,7 +278,7 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Programmatically reveals the specified hierarchy of places place, updating the browser URL in
      * the process.
-     * 
            
+     * 
            
      * This discards the current place hierarchy, replacing it with the specified place hierarchy. To
      * keep the current place hierarchy, see {@link #revealRelativePlace(PlaceRequest)},
      * {@link #revealRelativePlace(PlaceRequest, int)} or {@link #revealRelativePlace(int)}. To reveal
@@ -288,7 +288,7 @@ public interface PlaceManager extends HasHandlers {
 
     /**
      * Programmatically reveals the specified place from the current place hierarchy.
-     * 
            
+     * 
            
      * Examples. Suppose the current hierarchy is {@code requestA > requestB > requestC}:
      * 
              
      * 
            • Calling {@code revealRelativePlace(-1)} makes it {@code requestA > requestB}
              • 
@@ -310,7 +310,7 @@ public interface PlaceManager extends HasHandlers {
      * Programmatically reveals the specified place as a child of the current place hierarchy.
      * Identical to calling {@link #revealRelativePlace(PlaceRequest, int)} with a level of {@code 0}.
      * This will result in a {@link PlaceRequestInternalEvent} being fired.
-     * 
              
+     * 
              
      * To reveal as a top-level place, see {@link #revealPlace}. To navigate back to a specific place
      * in the hierarchy, see {@link #revealRelativePlace(int)}.
      *
@@ -322,10 +322,10 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Programmatically reveals the specified place relative to the other places in the current place
      * hierarchy. This will result in a {@link PlaceRequestInternalEvent} being fired.
-     * 
              
+     * 
              
      * To reveal as a top-level place, see {@link #revealPlace}. To navigate back to a specific place
      * in the hierarchy, see {@link #revealRelativePlace(int)}.
-     * 
              
+     * 
              
      * Examples. Suppose the current hierarchy is {@code requestA > requestB > requestC}:
      * 
                
      * 
              • Calling {@code revealRelativePlace(requestD, 0)} makes it
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java
index c8c4c460ad..9a49766d67 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java
@@ -23,7 +23,7 @@
 /**
  * This event is fired by the {@link PlaceManager} whenever a new place is
  * requested, either by history navigation or directly.
- * 
                
+ * 
                
  * Important! You should never fire that event directly. Instead, build a
  * {@link com.gwtplatform.mvp.shared.proxy.PlaceRequest} and pass it to one of the following methods:
  * 
                  
@@ -57,7 +57,7 @@ class PlaceRequestInternalEvent extends GwtEvent {
     /**
      * Fires a {@link PlaceRequestInternalEvent}
      * into a source that has access to an {@com.google.web.bindery.event.shared.EventBus}.
-     * 
                  
+     * 
                  
      * Important! You should not fire that event directly, see
      * {@link PlaceRequestInternalEvent} for more details.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java
index 48b356ad9b..0a86923901 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java
@@ -24,9 +24,9 @@
  * before the full {@link Presenter} is instantiated. This include, among
  * others, the presenter's specific {@link RevealContentEvent} that needs the
  * presenter to reveal itself.
- * 
                  
+ * 
                  
  * The relationship between a presenter and its proxy is two-way.
- * 
                  
+ * 
                  
  * {@link Presenter} subclasses will usually define their own interface called
  * MyProxy and be derived from this one.
  *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java
index 3b1a024a9e..3ff441a47d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java
@@ -55,7 +55,7 @@ public void getRawPresenter(NotifyingAsyncCallback> callback) {
 
     /**
      * Injects the various resources and performs other bindings.
-     * 
                  
+     * 
                  
      * Never call directly, it should only be called by GIN. Method injection is
      * used instead of constructor injection, because the latter doesn't work well
      * with GWT generators.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java
index 4a0a1fd02d..1492413964 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java
@@ -31,11 +31,11 @@ public interface ProxyPlace
                  > extends Proxy
                  , Place {
      * called following one or more asynchronous server calls in
      * {@link Presenter#prepareFromRequest(com.gwtplatform.mvp.shared.proxy.PlaceRequest)}.
      * You should manually reveal your presenter exactly once, when all the data needed to use it is available.
-     * 
                  
+     * 
                  
      * If you failed to fetch the data or cannot reveal the presenter you must call
      * {@link #manualRevealFailed()} otherwise navigation will be blocked and your application
      * will appear to be frozen.
-     * 
                  
+     * 
                  
      * Also consider using {@link ManualRevealCallback}, which will automatically call
      * {@link #manualReveal(Presenter)} upon success and {@link #manualRevealFailed()} upon
      * failure.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java
index 844aac39cb..6c42a57674 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java
@@ -32,7 +32,7 @@
 /**
  * A useful mixing class to define a {@link Proxy} that is also a {@link Place}.
  * You can usually inherit from the simpler form {@link ProxyPlace}.
- * 
                  
+ * 
                  
  *
  * @param 
                        The Presenter's type.
  * @param  Type of the associated {@link Proxy}.
@@ -175,7 +175,7 @@ protected void setProxy(Proxy_ proxy) {
 
     /**
      * Injects the various resources and performs other bindings.
-     * 
                  
+     * 
                  
      * Never call directly, it should only be called by GIN. Method injection is
      * used instead of constructor injection, because the latter doesn't work well
      * with GWT generators.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java
index eb28426606..2a9aea1fed 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java
@@ -30,7 +30,7 @@ public interface ProxyRaw extends HasHandlers {
      * Get the associated {@link Presenter}. The presenter can only be obtained in
      * an asynchronous manner to support code splitting when needed. To access the
      * presenter, pass a callback.
-     * 
                  
+     * 
                  
      * The difference between this method and
      * {@link Proxy#getPresenter}
      * is that the latter one gets the specific parameterised {@link Presenter}
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java
index 9fdad96340..16cc181d5e 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java
@@ -23,7 +23,7 @@
  * This event is fired whenever all visible presenters should
  * be reset. This is fired automatically right after navigating to a
  * new place.
- * 
                  
+ * 
                  
  * The default implementation or {@link com.gwtplatform.mvp.client.RootPresenter} causes
  * {@link com.gwtplatform.mvp.client.PresenterWidget#onReset()}
  * to be called, starting from the top level presenter and going down.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java
index 1fe9166531..763f9a5e36 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java
@@ -25,7 +25,7 @@
  * This event is fired by a {@link Presenter} that desires to reveal itself within its parent. It is typically fired in
  * the {@link Presenter#revealInParent()} method. To reveal a presenter at the root of the application, fire either
  * {@link RevealRootContentEvent}, {@link RevealRootLayoutContentEvent} or {@link RevealRootPopupContentEvent} instead.
- * 
                  
+ * 
                  
  * This event is handled by {@link Proxy} classes. Upon handling this event, the proxy first sets the content
  * appropriately in the presenter, and then reveals the presenter.
  *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java
index 98b6b5fc50..5621c418e3 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java
@@ -24,7 +24,7 @@
  * This event is fired by a {@link Presenter} that desires to reveal itself
  * at the root of the application. It is typically fired in the {@link Presenter#revealInParent()}
  * method.
- * 
                  
+ * 
                  
  * This type of content is usually meant to use the browser like a regular webpage, adding a vertical
  * scrollbar as the content overflow.
  *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java
index c3a7a5f5a1..ec31be1949 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java
@@ -24,7 +24,7 @@
  * This event is fired by a {@link Presenter} that desires to reveal itself
  * at the root of the application. It is typically fired in the {@link Presenter#revealInParent()}
  * method.
- * 
                  
+ * 
                  
  * This type of content
  * is constrained to lie within the browser window, and to resize with it. You
  * will be responsible for adding your own scrollbars as content overflow,
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java
index 17e2b95dfb..5afed35c27 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java
+++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java
@@ -39,21 +39,21 @@
  * parameter or a value it is escaped using the {@code '\'} character by replacing {@code '/'} with
  * {@code '\0'}, {@code ';'} with {@code '\1'}, {@code '='} with {@code '\2'} and {@code '\'} with
  * {@code '\3'}.
- * 
                  
+ * 
                  
  * Before decoding a {@link String} URL fragment into a {@link PlaceRequest} or a
  * {@link PlaceRequest} hierarchy, {@link ParameterTokenFormatter} will first pass the
- * {@link String} through {@link URL#decodeQueryString(String)} so that if the URL was URL-encoded
+ * {@link String} through {@link UrlUtils#decodeQueryString(String)} so that if the URL was URL-encoded
  * by some user agent, like a mail user agent, it is still parsed correctly.
- * 
                  
+ * 
                  
  * For example, {@link ParameterTokenFormatter} would parse any of the following:
- * 
                  
+ * 
                  
  * 
                    * nameToken1%3Bparam1.1%3Dvalue1.1%3Bparam1.2%3Dvalue1.2%2FnameToken2%2FnameToken3%3Bparam3.1%3Dvalue%03%11
  * nameToken1;param1.1=value1.1;param1.2=value1.2/nameToken2/nameToken3;param3.1=value\03\21
  * 
                  
- * 
                  
+ * 
                  
  * Into the following hierarchy of {@link PlaceRequest}:
- * 
                  
+ * 
                  
  * 
                    * {
  *   { "nameToken1", { {"param1.1", "value1.1"}, {"parame1.2","value1.2"} },
@@ -61,9 +61,9 @@
  *     "nameToken3", { {"param3.1", "value/3=1"} } }
  * }
  * 
                  
- * 
                  
+ * 
                  
  * If you want to use different symbols as separator, use the
- * {@link #ParameterTokenFormatter(String, String, String)} constructor.
+ * {@link #ParameterTokenFormatter(UrlUtils, String, String, String)} constructor.
  */
 public class ParameterTokenFormatter implements TokenFormatter {
 
@@ -94,7 +94,7 @@ public ParameterTokenFormatter(UrlUtils urlUtils) {
     /**
      * This constructor makes it possible to use custom separators in your token formatter. The
      * separators must be 1-letter strings, they must all be different from one another, and they
-     * must be encoded when ran through {@link URL#encodeQueryString(String)}).
+     * must be encoded when ran through {@link UrlUtils#encodeQueryString(String)}).
      *
      * @param hierarchySeparator The symbol used to separate {@link PlaceRequest} in a hierarchy.
      *                           Must be a 1-character string and can't be {@code %}.
@@ -148,7 +148,7 @@ public PlaceRequest toPlaceRequest(String placeToken) throws TokenFormatExceptio
 
     /**
      * Converts an unescaped string to a place request. To unescape the hash fragment you must run it
-     * through {@link URL#decodeQueryString(String)}.
+     * through {@link UrlUtils#decodeQueryString(String)}.
      *
      * @param unescapedPlaceToken The unescaped string to convert to a place request.
      * @return The place request.
@@ -251,7 +251,7 @@ private String placeTokenToUnescapedString(PlaceRequest placeRequest)
     /**
      * Use our custom escaping mechanism to escape the provided string. This should be used on the
      * name token, and the parameter keys and values, before they are attached with the various
-     * separators. The string will also be passed through {@link URL#encodeQueryString}.
+     * separators. The string will also be passed through {@link UrlUtils#encodeQueryString}.
      * Visible for testing.
      *
      * @param string The string to escape.
@@ -287,9 +287,9 @@ String customEscape(String string) {
      * Use our custom escaping mechanism to unescape the provided string. This should be used on the
      * name token, and the parameter keys and values, after they have been split using the various
      * separators. The input string is expected to already be sent through
-     * {@link URL#decodeQueryString}.
+     * {@link UrlUtils#decodeQueryString}.
      *
-     * @param string The string to unescape, must have passed through {@link URL#decodeQueryString}.
+     * @param string The string to unescape, must have passed through {@link UrlUtils#decodeQueryString}.
      * @return The unescaped string.
      * @throws TokenFormatException if there is an error converting.
      */
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java
index 3b408defc8..2db3864ae8 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java
+++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java
@@ -25,16 +25,16 @@
  * This class represents a 'request' for a place location. It includes the 'id'
  * of the place as well as any parameter values. It can convert from and to
  * String tokens for use with the GWT History.
- * 
                  
- * 
                  
+ * 
                  
+ * 
                  
  * Place request tokens are formatted like this:
- * 
                  
+ * 
                  
  * #nameToken(;key=value)*
- * 
                  
- * 
                  
+ * 
                  
+ * 
                  
  * There is a mandatory 'nameToken' value, followed by 0 or more key/value
  * pairs, separated by semi-colons (';'). A few examples follow:
- * 
                  
+ * 
                  
  * 
                    
  * 
                  •  #users
                    • 
  * 
                  •  #user;name=j.blogs
                    • 
@@ -49,9 +49,9 @@ public class PlaceRequest {
 
     /**
      * Builds a request without any name token and without parameters. You should
-     * typically use {@link #PlaceRequest(String)} and specify the name token.
+     * typically use {@link #PlaceRequest(String, Map)} and specify the name token.
      * However, this version is acceptable when calling
-     * {@link com.gwtplatform.mvp.client.proxy.Proxy#reveal(PlaceRequest)}.
+     * {@code com.gwtplatform.mvp.client.proxy.Proxy#reveal(PlaceRequest)}.
      */
     public PlaceRequest() {
         this.nameToken = null;
@@ -174,7 +174,7 @@ public boolean matchesNameToken(String nameToken) {
 
     /**
      * Class for constructing {@link PlaceRequest}s. This class supports all currently
-     * existing constructors and the {@link PlaceRequest#with(String, String)} method.
+     * existing constructors and the {@link PlaceRequest.Builder#with(String, String)} method.
      * It is not checked if any of the builder parameters are set when calling the {@link #build()} method as is
      * currently also possible to construct an empty {@link PlaceRequest}
      * (see {@link PlaceRequest#PlaceRequest()})
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java
index 5d95cb942b..3f87b03043 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java
+++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java
@@ -38,7 +38,7 @@
  * 
                    
  * 
                    
  * Replace the default binding to {@link ParameterTokenFormatter} with {@link RouteTokenFormatter}. In case you use
- * GWTPs {@link com.gwtplatform.mvp.client.gin.DefaultModule DefaultModule}:
+ * GWTPs {@code com.gwtplatform.mvp.client.gin.DefaultModule}:
  * 
                    
  * 
                      * install(new DefaultModule(DefaultPlaceManager.class, RouteTokenFormatter.class));
@@ -114,7 +114,7 @@ public int compareTo(RouteMatch other) {
     private class RouteMatcher {
         /**
          * All matching routes of the place-token.
-         * 
                    
+         * 
                    
          * Sorted in ascending order by the number of static matches.
          */
         final TreeSet allMatches;
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java
index 270c029785..854313db32 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java
@@ -24,10 +24,10 @@
 
 /**
  * Annotation to generate Action and Result classes.
- * 
                    
- * 
                    
+ * 
                    
+ * 
                    
  * If you type:
- * 
                    
+ * 
                    
  * 
                      * 
  * {@literal @}GenDispatch
@@ -40,24 +40,24 @@
  * 
                    
  * gwt-platform will generate two classes, RetrieveFooAction and
  * RetrieveFooResult.
- * 
                    
+ * 
                    
  * @In specifies that fooKey will only be used in the action. The
  * number passed to @In specifies the order of the arguments to the constructor.
- * 
                    
+ * 
                    
  * @Out specifies that foo and bar will only be used in the result.
  * The number passed to @Out specifies the order of the arguments to the
  * constructor.
- * 
                    
+ * 
                    
  * RetrieveFooAction will have fields, getters, and a constructor for fooKey,
  * plus equals, hashCode, toString etc, for it to function correctly as an
  * Action.
- * 
                    
+ * 
                    
  * RetrieveFooResult will have fields, getters, and a constructor that accepts
  * food and good, for bar, plus equals, hashCode, toString etc, for it to
  * function correctly as an Result.
- * 
                    
+ * 
                    
  * Complex example:
- * 
                    
+ * 
                    
  * 
                      * public interface HasThing<T> {
  *   T getThing();
@@ -82,28 +82,28 @@
  * And the UpdateBarResult object will be able to be passed to something that
  * knows how about the HasThing interface, but does not know about
  * UpdateBarResult.
- * 
                    
+ * 
                    
  * Notes:
- * 
                    
+ * 
                    
  * There is no naming requirement for your class name. It will be appended with
  * Action and Result
- * 
                    
- * 
                    
- * 
                    
+ * 
                    
+ * 
                    
+ * 
                    
  * {@code isSecured} Specifies the value that the generated isSecured() method
  * should return. Defaults to true if not specified. See
  * {@link com.gwtplatform.dispatch.rpc.shared.Action} for more details.
- * 
                    
+ * 
                    
  * {@code serviceName} Specifies the value that the generated getServiceName()
  * method should return. Defaults to Action.DEFAULT_SERVICE_NAME +
  * "YourClassName" if not specified. See
  * {@link com.gwtplatform.dispatch.rpc.shared.Action} for more details.
- * 
                    
+ * 
                    
  * {@code extraActionInterfaces} A comma separated list of fully qualified
  * interfaces that the Action class will implement. Each of the
  * functions defined in the interface must match an function
  * autogenerated using the field domain.
- * 
                    
+ * 
                    
  * {@code extraResultInterfaces} A comma separated list of fully qualified
  * interfaces that the Result class will implement. Each of the
  * functions defined in the interface must match an function
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java
index 9a2d273a83..eeafe6e4fd 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java
@@ -25,9 +25,9 @@
 /**
  * Annotation to generate simple Data Transfer Object (DTO) classes solely for
  * transferring data between the client and the server.
- * 
                    
+ * 
                    
  * If you type:
- * 
                    
+ * 
                    
  * 
                      * 
  * {@literal}@GenDto
@@ -37,14 +37,14 @@
  * }
  * 
  * 
                    
- * 
                    
+ * 
                    
  * gwt-platform will generate a {@code LineItemDto} class.
- * 
                    
+ * 
                    
  * {@code LineItemDto} will have fields, getters, and a constructor that takes
  * {@code productKey} and quantity plus equals, hashCode, toString etc,
- * 
                    
+ * 
                    
  * {@code LineItemDto} could be used when creating an invoice.
- * 
                    
+ * 
                    
  * 
                      * 
  * {@literal}@GenDispatch
@@ -55,7 +55,7 @@
  * }
  * 
  * 
                    
- * 
                    
+ * 
                    
  * The alternative to using Dto classes would be to construct persistable
  * {@code LineItem} objects on the client and send them as part of the gwt-rpc call.
  * Using Dto classes is a better choice because:
@@ -65,14 +65,14 @@
  * probably have a price field. The server should ignore the price as it may
  * have been tampered with.
  * 
                  
- * 
                  
- * 
                  
+ * 
                  
+ * 
                  
  * Notes:
- * 
                  
+ * 
                  
  * There is no naming requirement for your class name. It will be appended with
  * Dto
- * 
                  
- * 
                  
+ * 
                  
+ * 
                  
  */
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java
index b4c0778656..213e697391 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java
@@ -24,9 +24,9 @@
 
 /**
  * Annotation to generate Event and Handler classes.
- * 
                  
+ * 
                  
  * If you type:
- * 
                  
+ * 
                  
  * 
                    * 
  * {@literal @}GenEvent
@@ -36,29 +36,29 @@
  * }
  * 
  * 
                  
- * 
                  
+ * 
                  
  * gwt-platform will generate two classes, {@code FooChangedEvent} and {@code FooChangedHandler}.
- * 
                  
+ * 
                  
  * {@code FooChangedEvent} will have fields, getters, and a constructor for foo and
  * originator, plus static {@code getType()}, instance dispatch, etc., for it to
  * function correctly as a {@link com.google.gwt.event.shared.GwtEvent}.
- * 
                  
+ * 
                  
  * {@code FooChangedHandler} will be an interface with a {@code onFooChanged} method that takes
  * a {@code FooChangedEvent} parameter.
- * 
                  
+ * 
                  
  * Notes:
- * 
                  
+ * 
                  
  * There is no naming requirement for your class name. It will be appended with
  * Event and Handler.
- * 
                  
+ * 
                  
  * Using @{@link Order}:
- * 
                  
+ * 
                  
  * The order the the fields can be optionally specified using the @{@link Order}
  * annotation. If @{@link Order} is not used, then the order of the parameters to the
  * constructor and to fire() is undefined.
- * 
                  
+ * 
                  
  * If you type:
- * 
                  
+ * 
                  
  * 
                    * 
  * {@literal @}GenEvent
@@ -70,7 +70,7 @@
  * 
  * 
                  
  * The following constructor and {@code fire} methods will be generated:
- * 
                  
+ * 
                  
  * 
                    * 
  *  ...
@@ -81,7 +81,7 @@
  * 
  * 
                  
  * Omitting the @{@link Order} annotations would yield:
- * 
                  
+ * 
                  
  * 
                    * 
  *  ...
@@ -91,13 +91,13 @@
  *  ...
  * 
  * 
                  
- * 
                  
- * 
                  
+ * 
                  
+ * 
                  
  * Using @{@link Optional}:
- * 
                  
+ * 
                  
  * If @{@link Optional} is used together with @{@link GenEvent}, an additional fire method is generated.
  * If you type:
- * 
                  
+ * 
                  
  * 
                    * 
  * {@literal @}GenEvent
@@ -109,7 +109,7 @@
  * 
  * 
                  
  * The following constructors and {@code fire} methods will be generated:
- * 
                  
+ * 
                  
  * 
                    * 
  *  ...
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java
index 58b017feae..a2b25cddd8 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java
@@ -90,16 +90,16 @@
 public @interface GenProxy {
     /**
      * Defines the output package.
-     * 
                  
+     * 
                  
      * 
                  
      * By default the output is generated to the same source folder.
      * 
                  
-     * 
                  
+     * 
                  
      * 
                  
      * If you are not using a custom target package, the processor will
      * automatically replace ".server" in your package name with ".shared".
      * 
                  
-     * 
                  
+     * 
                  
      * 
                  
      * 
      * {@code @GenProxy}(targetPackage = "com.example.package.server")
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java
index 012b3a9311..6c3fdf717b 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java
@@ -24,9 +24,9 @@
 
 /**
  * Use the @In(value) annotation on fields in an @GenDispatch class.
- * 
                  
+ * 
                  
  * See {@link GenDispatch} for an example.
- * 
                  
+ * 
                  
  * {@code value} Defines the order that fields should be specified in the
  * constructor of the generated action class.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java
index 8b0b0511d5..bc2cfd6cb3 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java
@@ -24,7 +24,7 @@
 
 /**
  * Use the @{@link Optional} annotation to specify optional fields.
- * 
                  
+ * 
                  
  * 
                  
  * If one or more fields are declared optional, the system generates an
  * additional pair of constructor and {@code fire} method that can be called
@@ -34,7 +34,7 @@
  * The omitted fields are not initialized and will contain
  * their default value (i.e. objects will be initialized to {@code null}).
  * 
                  
- * 
                  
+ * 
                  
  * 
                  
  * You can use this annotation with:
  * 
                  
@@ -43,7 +43,7 @@
  * 
                • @{@link GenDto}
                  • 
  * 
                • @{@link GenDispatch}
                  • 
  * 
                
- * 
                
+ * 
                
  * 
                
  * See the above annotations for specific behaviors with optional fields.
  * 
                
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java
index d0097518ff..01e2295a54 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java
@@ -25,10 +25,10 @@
 /**
  * Use with @GenEvent or @GenDto to specify the order
  * of the fields in the constructor parameter list.
- * 
                
+ * 
                
  * Fields with an @Order will be first, sorted numerically, and then fields
  * without an @Order will be afterwards in an undefined order.
- * 
                
+ * 
                
  * See {@link GenEvent} or {@link GenDto} for an example.
  */
 @Target({ElementType.FIELD})
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java
index 1862265ada..ea422ba75d 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java
@@ -24,9 +24,9 @@
 
 /**
  * Use the @Out(value) annotation on fields in an @GenDispatch class.
- * 
                
+ * 
                
  * See {@link GenDispatch} for an example.
- * 
                
+ * 
                
  * {@code value} Defines the order that fields should be specified in the
  * constructor of the generated result class.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java
index 92d40f6a87..9565845998 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java
@@ -28,7 +28,7 @@
  * 
                You should consider to use a builder when you are faced with many constructor
  * parameters. Specially mandatory and optional parameters. Here comes the
  * {@link BuilderGenerationHelper} into play.
                
- * 
                
+ * 
                
  * Instead of making the desired object directly, the client calls a constructor
  * (or static factory) with all of the required parameters and gets a builder
  * object. Then the client calls setter-like methods on the builder object to
@@ -36,7 +36,7 @@
  * parameterless build method to generate the object, which is immutable. The
  * builder is a static member class of the class it builds. This class offers a
  * method to generate a builder like this.
- * 
                
+ * 
                
  * Rules:
  * No optional fields - no Builder.
  * Has required fields and optional fields - Constructor for required fields + Builder.
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java
index 39b2f95bc1..7f17b48ab0 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java
@@ -37,11 +37,11 @@ public ClassGenerationHelper(Writer sourceWriter) {
 
     /**
      * Generates a class header. Pass null to skip the parent class.
-     * 
                
+     * 
                
      * 
                
      * Usage:
      * 
                
-     * 
                
+     * 
                
      * 
                      * 
      *  generateClassHeader(Foo.class.getSimpleName(),
@@ -53,7 +53,7 @@ public ClassGenerationHelper(Writer sourceWriter) {
      * 
                
      * Generated example:
      * 
                
-     * 
                
+     * 
                
      * 
                      * public class MyFoo extends Foo implements HasName, MyGenericInterface{@literal } {
                
      *
@@ -157,13 +157,13 @@ public void generateFieldAccessors(Collection fieldElements) {
 
     /**
      * Creates a default field assignment.
-     * 
                
+     * 
                
      * 
                
      * generateFieldAssignment(myNameIsTest, null)
      * 
                
-     * 
                
+     * 
                
      * Generates:
-     * 
                
+     * 
                
      * 
                
      *     this.test = null;
      * 
                
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java
index 3115937fdb..1076d85ccd 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java
@@ -70,7 +70,7 @@ public static String implode(Object[] segments, String delimiter) {
     /**
      * Replaces each placeholder of this string that matches a parameter index.
      * 
                Placeholder format: {int}
                
-     * 
                
+     * 
                
      * 
                Usage:
                
      * 
                replaceParameters("{0} int myField = {1};", "private", 20);
                
      *
@@ -166,11 +166,11 @@ public void generateFieldDeclarations(Collection collection) {
 
     /**
      * Generates a list of Fields.
-     * 
                
+     * 
                
      * 
                
      * Usage:
      * 
                
-     * 
                
+     * 
                
      * 
                      * generateFieldList(myList, true, false)
                
      *
@@ -204,11 +204,11 @@ public void generateFooter() {
 
     /**
      * Use null as import to separate import groups.
-     * 
                
+     * 
                
      * 
                
      * Usage:
      * 
                
-     * 
                
+     * 
                
      * 
                      * generateImports({@link EventHandler}.class, {@link GwtEvent}.class, null,
      * {@link GenEventProcessor}.class)
                
@@ -262,7 +262,7 @@ public String generateModifierList(Modifier... modifiers) {
 
     /**
      * Generates a package declaration.
-     * 
                
+     * 
                
      * 
                
      * Generated example:
      * 
                
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java
index 0fcf669dce..62ce0eb554 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java
@@ -33,17 +33,17 @@ public InterfaceGenerationHelper(Writer sourceWriter) {
 
     /**
      * Generates an empty method body.
-     * 
                
+     * 
                
      * If you type:
-     * 
                
+     * 
                
      * 
                      * 
      *    writer.generateEmptyMethodBody("MyEntity", "stableId");
      * 
      * 
                
-     * 
                
+     * 
                
      * The following method body will be generated:
-     * 
                
+     * 
                
      * 
                      * 
      *     MyEntity stableId();
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java
index 2f28d279c9..2719cdff67 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java
@@ -36,7 +36,7 @@
 
 /**
  * Processes {@link GenDispatch} annotations.
- * 
                
+ * 
                
  * {@link GenDispatchProcessor} should only ever be called by tool infrastructure. See
  * {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java
index ba96194ce3..73e4ce2844 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java
@@ -31,7 +31,7 @@
 
 /**
  * Processes {@link GenDto} annotations.
- * 
                
+ * 
                
  * {@link GenDtoProcessor} should only ever be called by tool infrastructure.
  * See {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java
index fa5ea18e6b..3f78ef0559 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java
@@ -32,7 +32,7 @@
 
 /**
  * Processes {@link GenEvent} annotations.
- * 
                
+ * 
                
  * {@link GenEventProcessor} should only ever be called by tool infrastructure.
  * See {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java
index 78c5c3b86c..fd388b37eb 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java
@@ -31,7 +31,7 @@
  * 
                
  * Abstract processor class for all {@code @GenX} annotations.
  * 
                
- * 
                
+ * 
                
  * Annotate your processor with @{@link SupportedAnnotationTypes} or override
  * {@link #getSupportedAnnotationTypes()} to receive elements, that are
  * annotated in the current environment with one of the given annotations. You
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java
index 978d989c13..a698e5396f 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java
@@ -38,7 +38,7 @@
 
 /**
  * Processes {@link GenProxy} annotations.
- * 
                
+ * 
                
  * {@link GenProxyProcessor} should only ever be called by tool infrastructure.
  * See {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java
index a831c90998..b6f7cbbfcc 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java
@@ -24,7 +24,7 @@
 
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
                
+ * 
                
  * TODO: Make a test suite with a couple of permutations (with/without Order, Optional, both...).
  */
 public class DispatchAnnotationProcessingTest {
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java
index 0e5c488e76..2967476812 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java
@@ -23,7 +23,7 @@
 
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
                
+ * 
                
  * TODO: Make a test suite with a couple of permutations (with/without Order, Optional, both...).
  */
 public class DtoAnnotationProcessingTest {
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java
index 384f70b2bf..1061168bf8 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java
@@ -26,7 +26,7 @@
 
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
                
+ * 
                
  * TODO: Make a test suite with a couple of permutations (with/without Order, Optional, both...).
  */
 public class EventAnnotationProcessingTest {
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java
index 7e2db877ca..f815e28a45 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java
@@ -36,7 +36,7 @@
 
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
                
+ * 
                
  */
 public class ProxyAnnotationProcessingTest {
 
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java
index 143a8869c1..287f78d752 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java
@@ -22,7 +22,7 @@
 /**
  * For use in test cases where an {@link AsyncProvider} is required to provide an object and the test case needs to
  * provide a mock of the object.
- * 
                
+ * 
                
  * Note that the same mock will be returned for every invocation of of {@link #get(AsyncCallback)} (it behaves as a
  * singleton) which may impact your tests, for example if you rely on {@code ==}.
  *
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java
index 13aab0023d..92705fca1d 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java
@@ -24,7 +24,7 @@
 /**
  * This class mimics GWT's {@link com.google.gwt.user.client.DeferredCommand DeferredCommand} but it can be used in test
  * cases without having to rely on a {@link com.google.gwt.junit.client.GWTTestCase GWTTestCase}.
- * 
                
+ * 
                
  * Use {@link #addCommand(Command)} to add deferred commands, then call {@link #pump()} to process all the deferred
  * commands.
  */
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java
index 92ec197aae..4cd38ef6e4 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java
@@ -19,10 +19,10 @@
 /**
  * Mocking factory that transfers the work of creating a mock object to any Mocking framework. User should create an
  * implementation to inject in their {@link MockingBinder} implementation.
- * 
                
+ * 
                
  * 
                  * public class MockitoMockFactory implements MockFactory {
- *   public  T mock(Class classToMock) {
+ *   public <T> T mock(Class<T> classToMock) {
  *     return Mockito.mock(classToMock);
  *   }
  * }
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java
index e7b357330f..f8efd44754 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java
@@ -21,7 +21,7 @@
 /**
  * For use in test cases where an {@link Provider} is required to provide an object and the test case needs to provide a
  * mock of the object.
- * 
                
+ * 
                
  * Note that the same mock will be returned for every invocation of {{@link #get()} (it behaves as a singleton) which
  * may impact your tests, for example if you rely on {@code ==}.
  *
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java
index 32b67abc81..d6c211475d 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java
@@ -24,10 +24,10 @@
 /**
  * {@link MockingBinder} makes testing view even easier by mocking every {@link UiField} and returning a mocked object
  * upon creation.
- * 
                
+ * 
                
  * To use it, you should build a small class that extends MockingBinder and bind that class inside your Guice test
  * module. You will have to provide a {@link MockFactory} to let MockingBinder mock everything.
- * 
                
+ * 
                
  * Ex:
  * 
                  * public static class Module extends JukitoModule {
@@ -45,7 +45,7 @@
  *  }
  * }
  * 
                
- * 
                
+ * 
                
  * Disarming GWT is important to unit test views.
  *
  * @param  Mock type returned by {@link UiBinder#createAndBindUi(Object)}.