Apache Solr open-source search software
SOLR-16840: Workaround HK2 DI bug (#1726)
Jason Gerlowski541380cdf528
diff --git a/solr/core/src/java/org/apache/solr/jersey/InjectionFactories.java b/solr/core/src/java/org/apache/solr/jersey/InjectionFactories.javaindex f84090d4250..8ba5c45b788 100644--- a/solr/core/src/java/org/apache/solr/jersey/InjectionFactories.java+++ b/solr/core/src/java/org/apache/solr/jersey/InjectionFactories.java@@ -20,49 +20,38 @@ package org.apache.solr.jersey;import static org.apache.solr.jersey.RequestContextKeys.SOLR_CORE;import static org.apache.solr.jersey.RequestContextKeys.SOLR_PARAMS;-import javax.inject.Inject;import javax.ws.rs.container.ContainerRequestContext;+import javax.ws.rs.core.Context;import org.apache.solr.common.params.SolrParams;import org.apache.solr.core.SolrCore;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.schema.IndexSchema;import org.glassfish.hk2.api.Factory;+import org.glassfish.hk2.api.ServiceLocator;public class InjectionFactories {- public static class SolrQueryRequestFactory implements Factory<SolrQueryRequest> {-- private final ContainerRequestContext containerRequestContext;-- @Inject- public SolrQueryRequestFactory(ContainerRequestContext containerRequestContext) {- this.containerRequestContext = containerRequestContext;- }+ public static class SolrQueryRequestFactory extends RequestContextBasedFactory+ implements Factory<SolrQueryRequest> {@Overridepublic SolrQueryRequest provide() {return (SolrQueryRequest)- containerRequestContext.getProperty(RequestContextKeys.SOLR_QUERY_REQUEST);+ getRequestContext().getProperty(RequestContextKeys.SOLR_QUERY_REQUEST);}@Overridepublic void dispose(SolrQueryRequest instance) {}}- public static class SolrQueryResponseFactory implements Factory<SolrQueryResponse> {-- private final ContainerRequestContext containerRequestContext;-- @Inject- public SolrQueryResponseFactory(ContainerRequestContext containerRequestContext) {- this.containerRequestContext = containerRequestContext;- }+ public static class SolrQueryResponseFactory extends RequestContextBasedFactory+ implements Factory<SolrQueryResponse> {@Overridepublic SolrQueryResponse provide() {return (SolrQueryResponse)- containerRequestContext.getProperty(RequestContextKeys.SOLR_QUERY_RESPONSE);+ getRequestContext().getProperty(RequestContextKeys.SOLR_QUERY_RESPONSE);}@Override@@ -70,18 +59,12 @@ public class InjectionFactories {}/** Fetch the (existing) SolrCore from the request context */- public static class ReuseFromContextSolrCoreFactory implements Factory<SolrCore> {-- private final ContainerRequestContext containerRequestContext;-- @Inject- public ReuseFromContextSolrCoreFactory(ContainerRequestContext containerRequestContext) {- this.containerRequestContext = containerRequestContext;- }+ public static class ReuseFromContextSolrCoreFactory extends RequestContextBasedFactory+ implements Factory<SolrCore> {@Overridepublic SolrCore provide() {- return (SolrCore) containerRequestContext.getProperty(SOLR_CORE);+ return (SolrCore) getRequestContext().getProperty(SOLR_CORE);}@Override@@ -89,16 +72,14 @@ public class InjectionFactories {}public static class ReuseFromContextIndexSchemaFactory implements Factory<IndexSchema> {-- private final SolrCore solrCore;-- @Inject- public ReuseFromContextIndexSchemaFactory(SolrCore solrCore) {- this.solrCore = solrCore;- }+ @Context ServiceLocator serviceLocator;@Overridepublic IndexSchema provide() {+ return doProvide(serviceLocator.getService(SolrCore.class));+ }++ private IndexSchema doProvide(SolrCore solrCore) {return solrCore.getLatestSchema();}@@ -106,24 +87,32 @@ public class InjectionFactories {public void dispose(IndexSchema instance) {}}- public static class ReuseFromContextSolrParamsFactory implements Factory<SolrParams> {-- private final ContainerRequestContext containerRequestContext;-- @Inject- public ReuseFromContextSolrParamsFactory(ContainerRequestContext containerRequestContext) {- this.containerRequestContext = containerRequestContext;- }+ public static class ReuseFromContextSolrParamsFactory extends RequestContextBasedFactory+ implements Factory<SolrParams> {@Overridepublic SolrParams provide() {- return (SolrParams) containerRequestContext.getProperty(SOLR_PARAMS);+ return (SolrParams) getRequestContext().getProperty(SOLR_PARAMS);}@Overridepublic void dispose(SolrParams instance) {}}+ /**+ * Allows access to a {@link ContainerRequestContext} via a {@link ServiceLocator}+ *+ * <p>ServiceLocator must be used util https://github.com/eclipse-ee4j/jersey/issues/3503 is+ * resolved.+ */+ public static class RequestContextBasedFactory {+ @Context ServiceLocator serviceLocator;++ public ContainerRequestContext getRequestContext() {+ return serviceLocator.getService(ContainerRequestContext.class);+ }+ }+public static class SingletonFactory<T> implements Factory<T> {private final T singletonVal;