IBX-1696: Removed class parameters from ibexa/solr repository (#17)

Dropped .class parameters which have been deprecated since Symfony 3.x
ibexa · Jan 28, 2022 · 3a01e35 · 3a01e35
1 parent 78fa875
commit 3a01e35
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 205 deletions.
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
@@ -1,16 +1,12 @@
 parameters:
-    ezpublish.solr.engine_factory.class: Ibexa\Bundle\Solr\ApiLoader\SolrEngineFactory
-    ezpublish.solr.boost_factor_provider_factory.class: Ibexa\Bundle\Solr\ApiLoader\BoostFactorProviderFactory
-    ezpublish.solr.indexing_depth_provider_factory.class: Ibexa\Bundle\Solr\ApiLoader\IndexingDepthProviderFactory
     ibexa.solr.default_connection: ~
 
 services:
     Ibexa\Bundle\Solr\ApiLoader\SolrEngineFactory:
-        class: "%ezpublish.solr.engine_factory.class%"
         arguments:
             $repositoryConfigurationProvider: '@Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider'
             $defaultConnection: "%ibexa.solr.default_connection%"
-            $searchEngineClass: "%ezpublish.spi.search.solr.class%"
+            $searchEngineClass: Ibexa\Solr\Handler
             $gatewayRegistry: '@Ibexa\Solr\Gateway\GatewayRegistry'
             $coreFilterRegistry: '@Ibexa\Solr\CoreFilter\CoreFilterRegistry'
             $contentHandler: '@Ibexa\Contracts\Core\Persistence\Content\Handler'
@@ -19,25 +15,23 @@ services:
             $locationResultExtractor: '@ibexa.solr.result_extractor.location'
 
     Ibexa\Bundle\Solr\ApiLoader\BoostFactorProviderFactory:
-        class: "%ezpublish.solr.boost_factor_provider_factory.class%"
         arguments:
             - '@Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider'
             - "%ibexa.solr.default_connection%"
-            - "%ezpublish.search.solr.boost_factor_provider.class%"
+            - Ibexa\Solr\FieldMapper\BoostFactorProvider
         calls:
             - [setContainer, ["@service_container"]]
 
     Ibexa\Bundle\Solr\ApiLoader\IndexingDepthProviderFactory:
-        class: "%ezpublish.solr.indexing_depth_provider_factory.class%"
         arguments:
             - '@Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider'
             - "%ibexa.solr.default_connection%"
-            - "%ezpublish.search.solr.indexing_depth_provider.class%"
+            - Ibexa\Solr\FieldMapper\IndexingDepthProvider
         calls:
             - [setContainer, ["@service_container"]]
 
     Ibexa\Solr\FieldMapper\IndexingDepthProvider:
-        class: "%ezpublish.search.solr.field_mapper.indexing_depth_provider.class%"
+        class: \Ibexa\Solr\FieldMapper\IndexingDepthProvider
         factory: ['@Ibexa\Bundle\Solr\ApiLoader\IndexingDepthProviderFactory', 'buildService']
 
     ibexa.solr.gateway.distribution_strategy.abstract_standalone:

diff --git a/src/lib/Resources/config/container/solr.yml b/src/lib/Resources/config/container/solr.yml
@@ -10,17 +10,6 @@ imports:
 
 parameters:
     ezpublish.search.solr.connection.server: http://localhost:8983/solr/core0
-    ezpublish.spi.search.solr.class: Ibexa\Solr\Handler
-    ezpublish.search.solr.gateway.native.class: Ibexa\Solr\Gateway\Native
-    ezpublish.search.solr.gateway.endpoint_registry.class: Ibexa\Solr\Gateway\EndpointRegistry
-    ezpublish.search.solr.gateway.endpoint_resolver.native.class: Ibexa\Solr\Gateway\EndpointResolver\NativeEndpointResolver
-    ezpublish.search.solr.gateway.update_serializer.class: Ibexa\Solr\Gateway\UpdateSerializer
-    ezpublish.search.solr.core_filter.native.class: Ibexa\Solr\CoreFilter\NativeCoreFilter
-    ezpublish.search.solr.document_mapper.native.class: Ibexa\Solr\DocumentMapper\NativeDocumentMapper
-    ezpublish.search.solr.result_extractor.native.class: Ibexa\Solr\ResultExtractor\NativeResultExtractor
-    ezpublish.search.solr.query_converter.class: Ibexa\Solr\Query\Common\QueryConverter\NativeQueryConverter
-    ezpublish.search.solr.boost_factor_provider.class: Ibexa\Solr\FieldMapper\BoostFactorProvider
-    ezpublish.search.solr.indexing_depth_provider.class: Ibexa\Solr\FieldMapper\IndexingDepthProvider
     # Endpoint resolver arguments must be set in order to be overrideable
     ezpublish.search.solr.entry_endpoints: []
     ezpublish.search.solr.cluster_endpoints: []
@@ -30,11 +19,10 @@ parameters:
 services:
     Ibexa\Solr\Gateway\GatewayRegistry: ~
 
-    Ibexa\Solr\Gateway\EndpointRegistry:
-        class: "%ezpublish.search.solr.gateway.endpoint_registry.class%"
+    Ibexa\Solr\Gateway\EndpointRegistry: ~
 
     ibexa.solr.gateway.endpoint_resolver.native:
-        class: "%ezpublish.search.solr.gateway.endpoint_resolver.native.class%"
+        class: Ibexa\Solr\Gateway\EndpointResolver\NativeEndpointResolver
         arguments:
             - "%ezpublish.search.solr.entry_endpoints%"
             - "%ezpublish.search.solr.cluster_endpoints%"
@@ -47,15 +35,14 @@ services:
     Ibexa\Solr\CoreFilter\CoreFilterRegistry: ~
 
     ibexa.solr.core_filter.native:
-        class: "%ezpublish.search.solr.core_filter.native.class%"
+        class: Ibexa\Solr\CoreFilter\NativeCoreFilter
         arguments:
             - '@ibexa.solr.gateway.endpoint_resolver.native'
 
     ibexa.solr.core_filter:
         alias: ibexa.solr.core_filter.native
 
     Ibexa\Solr\DocumentMapper\NativeDocumentMapper:
-        class: "%ezpublish.search.solr.document_mapper.native.class%"
         arguments:
             - '@ibexa.solr.field_mapper.block'
             - '@ibexa.solr.field_mapper.block_translation'
@@ -68,22 +55,22 @@ services:
         alias: Ibexa\Solr\DocumentMapper\NativeDocumentMapper
 
     ibexa.solr.result_extractor.native:
-        class: "%ezpublish.search.solr.result_extractor.native.class%"
+        class: Ibexa\Solr\ResultExtractor\NativeResultExtractor
         arguments:
             - '@ibexa.solr.query.content.facet_builder_visitor.aggregate'
             - '@ibexa.solr.query.content.aggregation_result_extractor.dispatcher'
             - '@Ibexa\Solr\Gateway\EndpointRegistry'
         deprecated: 'The "%service_id%" service is deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0., use ezpublish.search.solr.result_extractor.content.native or ezpublish.search.solr.result_extractor.location.native instead.'
 
     ibexa.solr.result_extractor.content.native:
-        class: "%ezpublish.search.solr.result_extractor.native.class%"
+        class: Ibexa\Solr\ResultExtractor\NativeResultExtractor
         arguments:
             - '@ibexa.solr.query.content.facet_builder_visitor.aggregate'
             - '@ibexa.solr.query.content.aggregation_result_extractor.dispatcher'
             - '@Ibexa\Solr\Gateway\EndpointRegistry'
 
     ibexa.solr.result_extractor.location.native:
-        class: "%ezpublish.search.solr.result_extractor.native.class%"
+        class: Ibexa\Solr\ResultExtractor\NativeResultExtractor
         arguments:
             - '@ibexa.solr.query.content.facet_builder_visitor.aggregate'
             - '@ibexa.solr.query.location.aggregation_result_extractor.dispatcher'
@@ -100,23 +87,22 @@ services:
         alias: ibexa.solr.result_extractor.location.native
 
     ibexa.solr.query_converter.content:
-        class: "%ezpublish.search.solr.query_converter.class%"
+        class: Ibexa\Solr\Query\Common\QueryConverter\NativeQueryConverter
         arguments:
             - '@ibexa.solr.query.content.criterion_visitor.aggregate'
             - '@ibexa.solr.query.content.sort_clause_visitor.aggregate'
             - '@ibexa.solr.query.content.facet_builder_visitor.aggregate'
             - '@ibexa.solr.query.content.aggregation_visitor.dispatcher'
 
     ibexa.solr.query_converter.location:
-        class: "%ezpublish.search.solr.query_converter.class%"
+        class: Ibexa\Solr\Query\Common\QueryConverter\NativeQueryConverter
         arguments:
             - '@ibexa.solr.query.location.criterion_visitor.aggregate'
             - '@ibexa.solr.query.location.sort_clause_visitor.aggregate'
             - '@ibexa.solr.query.location.facet_builder_visitor.aggregate'
             - '@ibexa.solr.query.location.aggregation_visitor.dispatcher'
 
     Ibexa\Solr\Gateway\UpdateSerializer:
-        class: "%ezpublish.search.solr.gateway.update_serializer.class%"
         arguments:
             - '@Ibexa\Core\Search\Common\FieldValueMapper\Aggregate'
             - '@Ibexa\Core\Search\Common\FieldNameGenerator'
@@ -128,7 +114,7 @@ services:
             - '@ibexa.solr.gateway.endpoint_resolver'
 
     ibexa.solr.gateway.native:
-        class: "%ezpublish.search.solr.gateway.native.class%"
+        class: Ibexa\Solr\Gateway\Native
         arguments:
             - '@Ibexa\Solr\Gateway\HttpClient\Stream'
             - '@ibexa.solr.gateway.endpoint_resolver'
@@ -142,7 +128,6 @@ services:
         alias: ibexa.solr.gateway.native
 
     Ibexa\Solr\Handler:
-        class: "%ezpublish.spi.search.solr.class%"
         arguments:
             - '@ibexa.solr.gateway'
             - '@Ibexa\Contracts\Core\Persistence\Content\Handler'