From 66ff70c4271dde6339121a209f779e6d659dd0ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:54:55 +0100 Subject: [PATCH] XWIKI-22807: Livedata REST result have inconsistent results when called concurrently (#3825) (#3832) (cherry picked from commit 187e5459fa31df7d0dc9d4e0fef22418a027921f) Co-authored-by: Manuel Leduc --- .../annotation/rest/internal/AnnotationsRESTResource.java | 2 -- .../rest/internal/AnnotationsTranslationRESTResource.java | 2 -- .../rest/internal/SingleAnnotationRESTResource.java | 2 -- .../internal/rest/DefaultLiveDataEntriesResource.java | 6 ++---- .../internal/rest/DefaultLiveDataEntryPropertyResource.java | 4 +--- .../internal/rest/DefaultLiveDataEntryResource.java | 6 ++---- .../internal/rest/DefaultLiveDataPropertiesResource.java | 4 +--- .../internal/rest/DefaultLiveDataPropertyResource.java | 4 +--- .../internal/rest/DefaultLiveDataPropertyTypeResource.java | 4 +--- .../internal/rest/DefaultLiveDataPropertyTypesResource.java | 4 +--- .../internal/rest/DefaultLiveDataSourceResource.java | 4 +--- .../internal/rest/DefaultLiveDataSourcesResource.java | 4 +--- .../netflux/internal/rest/DefaultPageChannelsResource.java | 4 +--- .../internal/resources/ExtensionRESTResource.java | 2 -- .../resources/ExtensionVersionFileRESTResource.java | 2 -- .../internal/resources/ExtensionVersionRESTResource.java | 2 -- .../internal/resources/ExtensionVersionsRESTResource.java | 2 -- .../internal/resources/ExtensionsRESTResource.java | 2 -- .../internal/resources/RepositoryRESTResource.java | 2 -- .../repository/internal/resources/SearchRESTResource.java | 2 -- 20 files changed, 12 insertions(+), 52 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsRESTResource.java b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsRESTResource.java index 4eb0205491f3..938f85c6fe6f 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsRESTResource.java @@ -20,7 +20,6 @@ package org.xwiki.annotation.rest.internal; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.Encoded; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -41,7 +40,6 @@ @Component @Named("org.xwiki.annotation.rest.internal.AnnotationsRESTResource") @Path("/wikis/{wikiName}/spaces/{spaceName: .+}/pages/{pageName}/annotations") -@Singleton public class AnnotationsRESTResource extends AbstractAnnotationsRESTResource { /** diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsTranslationRESTResource.java b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsTranslationRESTResource.java index a4ee36055511..015561febc2d 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsTranslationRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AnnotationsTranslationRESTResource.java @@ -22,7 +22,6 @@ import java.util.Locale; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.Encoded; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -45,7 +44,6 @@ @Component @Named("org.xwiki.annotation.rest.internal.AnnotationsTranslationRESTResource") @Path("/wikis/{wikiName}/spaces/{spaceName: .+}/pages/{pageName}/translations/{language}/annotations") -@Singleton public class AnnotationsTranslationRESTResource extends AbstractAnnotationsRESTResource { /** diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/SingleAnnotationRESTResource.java b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/SingleAnnotationRESTResource.java index d46eed56864f..a65eda68a63e 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/SingleAnnotationRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/SingleAnnotationRESTResource.java @@ -24,7 +24,6 @@ import java.util.Map; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.DELETE; import javax.ws.rs.Encoded; import javax.ws.rs.PUT; @@ -54,7 +53,6 @@ @Component @Named("org.xwiki.annotation.rest.internal.SingleAnnotationRESTResource") @Path("/wikis/{wikiName}/spaces/{spaceName: .+}/pages/{pageName}/annotation/{id}") -@Singleton public class SingleAnnotationRESTResource extends AbstractAnnotationRESTResource { /** diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntriesResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntriesResource.java index 6adae25aa909..ba8df992539e 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntriesResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntriesResource.java @@ -29,7 +29,6 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -55,13 +54,12 @@ /** * Default implementation of {@link LiveDataEntriesResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataEntriesResource") -@Singleton public class DefaultLiveDataEntriesResource extends AbstractLiveDataResource implements LiveDataEntriesResource { private static final String FILTERS_PREFIX = "filters."; @@ -181,7 +179,7 @@ private Entries createEntries(LiveData liveData, String idProperty, LiveDataQuer private LiveDataConfiguration initConfig(String sourceId, List properties, List matchAll, List sort, List descending, long offset, int limit) throws LiveDataException { - // Workaround for https://github.com/restlet/restlet-framework-java/issues/922 (JaxRs multivalue + // Workaround for https://github.com/restlet/restlet-framework-java/issues/922 (JaxRs multivalue // query-params gives list with null element). List actualProperties = properties.stream().filter(Objects::nonNull).collect(Collectors.toList()); List actualMatchAll = matchAll.stream().filter(Objects::nonNull).collect(Collectors.toList()); diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryPropertyResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryPropertyResource.java index 45534f5e99e7..fdead1f77c6c 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryPropertyResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryPropertyResource.java @@ -22,7 +22,6 @@ import java.util.Optional; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -36,13 +35,12 @@ /** * Default implementation of {@link LiveDataEntryPropertyResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataEntryPropertyResource") -@Singleton public class DefaultLiveDataEntryPropertyResource extends AbstractLiveDataResource implements LiveDataEntryPropertyResource { diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryResource.java index 43f7922eee71..5af9e3fa8fe4 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataEntryResource.java @@ -23,7 +23,6 @@ import java.util.Optional; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -38,13 +37,12 @@ /** * Default implementation of {@link LiveDataEntryResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataEntryResource") -@Singleton public class DefaultLiveDataEntryResource extends AbstractLiveDataResource implements LiveDataEntryResource { @Override @@ -78,7 +76,7 @@ public Response updateEntry(String sourceId, String namespace, String entryId, E try { values = entryStore.get(updatedEntryId.get()); } catch (UnsupportedOperationException e) { - // Returns a success response without an entity when the entry store does not implement the get + // Returns a success response without an entity when the entry store does not implement the get // operation (for instance the liveTable source). return Response.status(Status.ACCEPTED).build(); } diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertiesResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertiesResource.java index a27dcf1e6b77..1546d26bbb92 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertiesResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertiesResource.java @@ -26,7 +26,6 @@ import java.util.stream.Collectors; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -45,13 +44,12 @@ /** * Default implementation of {@link LiveDataPropertiesResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataPropertiesResource") -@Singleton public class DefaultLiveDataPropertiesResource extends AbstractLiveDataResource implements LiveDataPropertiesResource { @Override diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyResource.java index b2405fcc04b6..102086148f27 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyResource.java @@ -22,7 +22,6 @@ import java.util.Optional; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -36,13 +35,12 @@ /** * Default implementation of {@link LiveDataPropertyResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataPropertyResource") -@Singleton public class DefaultLiveDataPropertyResource extends AbstractLiveDataResource implements LiveDataPropertyResource { @Override diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypeResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypeResource.java index 91da3bae66a5..10e9dcc2165f 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypeResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypeResource.java @@ -23,7 +23,6 @@ import java.util.Optional; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -36,13 +35,12 @@ /** * Default implementation of {@link LiveDataPropertyTypeResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataPropertyTypeResource") -@Singleton public class DefaultLiveDataPropertyTypeResource extends AbstractLiveDataResource implements LiveDataPropertyTypeResource { diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypesResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypesResource.java index 8db754c9b5e3..df7cd6adbf71 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypesResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataPropertyTypesResource.java @@ -25,7 +25,6 @@ import java.util.stream.Collectors; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -43,13 +42,12 @@ /** * Default implementation of {@link LiveDataPropertyTypesResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataPropertyTypesResource") -@Singleton public class DefaultLiveDataPropertyTypesResource extends AbstractLiveDataResource implements LiveDataPropertyTypesResource { diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourceResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourceResource.java index 7c7a7bdef737..cde200454597 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourceResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourceResource.java @@ -22,7 +22,6 @@ import java.util.Optional; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -34,13 +33,12 @@ /** * Default implementation of {@link LiveDataSourceResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataSourceResource") -@Singleton public class DefaultLiveDataSourceResource extends AbstractLiveDataResource implements LiveDataSourceResource { @Override diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourcesResource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourcesResource.java index b8e556817c5a..f53377669f42 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourcesResource.java +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/src/main/java/org/xwiki/livedata/internal/rest/DefaultLiveDataSourcesResource.java @@ -25,7 +25,6 @@ import java.util.stream.Collectors; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -38,13 +37,12 @@ /** * Default implementation of {@link LiveDataSourcesResource}. - * + * * @version $Id$ * @since 12.10 */ @Component @Named("org.xwiki.livedata.internal.rest.DefaultLiveDataSourcesResource") -@Singleton public class DefaultLiveDataSourcesResource extends AbstractLiveDataResource implements LiveDataSourcesResource { @Override diff --git a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/src/main/java/org/xwiki/netflux/internal/rest/DefaultPageChannelsResource.java b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/src/main/java/org/xwiki/netflux/internal/rest/DefaultPageChannelsResource.java index aed9e35d1c95..04102234b33e 100644 --- a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/src/main/java/org/xwiki/netflux/internal/rest/DefaultPageChannelsResource.java +++ b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/src/main/java/org/xwiki/netflux/internal/rest/DefaultPageChannelsResource.java @@ -29,7 +29,6 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response.Status; @@ -47,13 +46,12 @@ /** * Default implementation of {@link PageChannelsResource}. - * + * * @version $Id$ * @since 13.9RC1 */ @Component @Named("org.xwiki.netflux.internal.rest.DefaultPageChannelsResource") -@Singleton public class DefaultPageChannelsResource extends XWikiResource implements PageChannelsResource { private static final String PATH_SEPARATOR = "/"; diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionRESTResource.java index fce7df44d6fe..49b6a16ef4ac 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionRESTResource.java @@ -21,7 +21,6 @@ package org.xwiki.repository.internal.resources; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -41,7 +40,6 @@ @Component @Named("org.xwiki.repository.internal.resources.ExtensionRESTResource") @Path(Resources.EXTENSION) -@Singleton public class ExtensionRESTResource extends AbstractExtensionRESTResource { @GET diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionFileRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionFileRESTResource.java index 51cabac6b056..c877d709a6d9 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionFileRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionFileRESTResource.java @@ -27,7 +27,6 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -77,7 +76,6 @@ @Component @Named("org.xwiki.repository.internal.resources.ExtensionVersionFileRESTResource") @Path(Resources.EXTENSION_VERSION_FILE) -@Singleton public class ExtensionVersionFileRESTResource extends AbstractExtensionRESTResource { @Inject diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionRESTResource.java index 373c8d896d01..b5d7af615247 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionRESTResource.java @@ -21,7 +21,6 @@ package org.xwiki.repository.internal.resources; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -41,7 +40,6 @@ @Component @Named("org.xwiki.repository.internal.resources.ExtensionVersionRESTResource") @Path(Resources.EXTENSION_VERSION) -@Singleton public class ExtensionVersionRESTResource extends AbstractExtensionRESTResource { @GET diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionsRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionsRESTResource.java index 1775c38852ec..ede02ee92eb5 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionsRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionsRESTResource.java @@ -29,7 +29,6 @@ import java.util.Map; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -55,7 +54,6 @@ @Component @Named("org.xwiki.repository.internal.resources.ExtensionVersionsRESTResource") @Path(Resources.EXTENSION_VERSIONS) -@Singleton public class ExtensionVersionsRESTResource extends AbstractExtensionRESTResource { @GET diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionsRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionsRESTResource.java index 96ee98af6861..9649bce608fa 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionsRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionsRESTResource.java @@ -21,7 +21,6 @@ package org.xwiki.repository.internal.resources; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -40,7 +39,6 @@ @Component @Named("org.xwiki.repository.internal.resources.ExtensionsRESTResource") @Path(Resources.EXTENSIONS) -@Singleton public class ExtensionsRESTResource extends AbstractExtensionRESTResource { @GET diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/RepositoryRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/RepositoryRESTResource.java index 3edd991e23e2..6db2b7f916a7 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/RepositoryRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/RepositoryRESTResource.java @@ -21,7 +21,6 @@ package org.xwiki.repository.internal.resources; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -36,7 +35,6 @@ @Component @Named("org.xwiki.repository.internal.resources.RepositoryRESTResource") @Path(Resources.ENTRYPOINT) -@Singleton public class RepositoryRESTResource extends AbstractExtensionRESTResource { /** diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/SearchRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/SearchRESTResource.java index 27d301df657f..3c39d86b8537 100644 --- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/SearchRESTResource.java +++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/SearchRESTResource.java @@ -24,7 +24,6 @@ import java.util.List; import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -55,7 +54,6 @@ @Component @Named("org.xwiki.repository.internal.resources.SearchRESTResource") @Path(Resources.SEARCH) -@Singleton public class SearchRESTResource extends AbstractExtensionRESTResource { /**