Complete provider, finder, transformers and configuration refactoring
This commit is contained in:
parent
7be25f92bb
commit
0db0490be5
17 changed files with 444 additions and 320 deletions
|
|
@ -91,19 +91,33 @@ class Configuration
|
|||
->children()
|
||||
->scalarNode('driver')->end()
|
||||
->scalarNode('model')->end()
|
||||
->scalarNode('identifier')->defaultValue('id')->end()
|
||||
->scalarNode('identifier')->defaultValue('id')->end()
|
||||
->arrayNode('provider')
|
||||
->children()
|
||||
->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
|
||||
->scalarNode('batch_size')->defaultValue(100)->end()
|
||||
->scalarNode('clear_object_manager')->defaultTrue()->end()
|
||||
->scalarNode('service')->end()
|
||||
->end()
|
||||
->end()
|
||||
->arrayNode('finder')
|
||||
->children()
|
||||
->scalarNode('hydrate')->defaultTrue()->end()
|
||||
->scalarNode('service')->end()
|
||||
->end()
|
||||
->end()
|
||||
->arrayNode('elastica_to_model_transformer')
|
||||
->addDefaultsIfNotSet()
|
||||
->children()
|
||||
->scalarNode('hydrate')->defaultTrue()->end()
|
||||
->scalarNode('service')->end()
|
||||
->end()
|
||||
->end()
|
||||
->arrayNode('model_to_elastica_transformer')
|
||||
->addDefaultsIfNotSet()
|
||||
->children()
|
||||
->scalarNode('service')->end()
|
||||
->end()
|
||||
->end()
|
||||
->end()
|
||||
->end()
|
||||
->end()
|
||||
|
|
|
|||
|
|
@ -14,201 +14,250 @@ use InvalidArgumentException;
|
|||
|
||||
class FOQElasticaExtension extends Extension
|
||||
{
|
||||
protected $supportedProviderDrivers = array('mongodb', 'orm');
|
||||
protected $typeMappings = array();
|
||||
protected $loadedDoctrineDrivers = array();
|
||||
protected $supportedProviderDrivers = array('mongodb', 'orm');
|
||||
protected $typeMappings = array();
|
||||
protected $loadedDoctrineDrivers = array();
|
||||
|
||||
public function load(array $configs, ContainerBuilder $container)
|
||||
{
|
||||
$configuration = new Configuration();
|
||||
$processor = new Processor();
|
||||
$config = $processor->process($configuration->getConfigTree(), $configs);
|
||||
public function load(array $configs, ContainerBuilder $container)
|
||||
{
|
||||
$configuration = new Configuration();
|
||||
$processor = new Processor();
|
||||
$config = $processor->process($configuration->getConfigTree(), $configs);
|
||||
|
||||
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
|
||||
$loader->load('config.xml');
|
||||
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
|
||||
$loader->load('config.xml');
|
||||
|
||||
if (empty($config['clients']) || empty($config['indexes'])) {
|
||||
throw new InvalidArgumentException('You must define at least one client and one index');
|
||||
}
|
||||
if (empty($config['clients']) || empty($config['indexes'])) {
|
||||
throw new InvalidArgumentException('You must define at least one client and one index');
|
||||
}
|
||||
|
||||
if (empty($config['default_client'])) {
|
||||
$keys = array_keys($config['clients']);
|
||||
$config['default_client'] = reset($keys);
|
||||
}
|
||||
if (empty($config['default_client'])) {
|
||||
$keys = array_keys($config['clients']);
|
||||
$config['default_client'] = reset($keys);
|
||||
}
|
||||
|
||||
if (empty($config['default_index'])) {
|
||||
$keys = array_keys($config['indexes']);
|
||||
$config['default_index'] = reset($keys);
|
||||
}
|
||||
if (empty($config['default_index'])) {
|
||||
$keys = array_keys($config['indexes']);
|
||||
$config['default_index'] = reset($keys);
|
||||
}
|
||||
|
||||
$clientIdsByName = $this->loadClients($config['clients'], $container);
|
||||
$indexIdsByName = $this->loadIndexes($config['indexes'], $container, $clientIdsByName, $config['default_client']);
|
||||
$indexDefsByName = array_map(function($id) use ($container) {
|
||||
return $container->getDefinition($id);
|
||||
}, $indexIdsByName);
|
||||
$clientIdsByName = $this->loadClients($config['clients'], $container);
|
||||
$indexIdsByName = $this->loadIndexes($config['indexes'], $container, $clientIdsByName, $config['default_client']);
|
||||
$indexDefsByName = array_map(function($id) use ($container) {
|
||||
return $container->getDefinition($id);
|
||||
}, $indexIdsByName);
|
||||
|
||||
$this->loadIndexManager($indexDefsByName, $container->getDefinition($indexIdsByName[$config['default_index']]), $container);
|
||||
$this->loadMappingSetter($this->typeMappings, $container);
|
||||
$this->loadIndexManager($indexDefsByName, $container->getDefinition($indexIdsByName[$config['default_index']]), $container);
|
||||
$this->loadMappingSetter($this->typeMappings, $container);
|
||||
|
||||
$container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
|
||||
$container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index']));
|
||||
}
|
||||
$container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
|
||||
$container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index']));
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the configured clients.
|
||||
*
|
||||
* @param array $config An array of clients configurations
|
||||
* @param ContainerBuilder $container A ContainerBuilder instance
|
||||
*/
|
||||
protected function loadClients(array $clients, ContainerBuilder $container)
|
||||
{
|
||||
$clientIds = array();
|
||||
foreach ($clients as $name => $client) {
|
||||
$clientDefArgs = array(
|
||||
isset($client['host']) ? $client['host'] : null,
|
||||
isset($client['port']) ? $client['port'] : array(),
|
||||
);
|
||||
$clientDef = new Definition('%foq_elastica.client.class%', $clientDefArgs);
|
||||
$clientId = sprintf('foq_elastica.client.%s', $name);
|
||||
$container->setDefinition($clientId, $clientDef);
|
||||
$clientIds[$name] = $clientId;
|
||||
}
|
||||
/**
|
||||
* Loads the configured clients.
|
||||
*
|
||||
* @param array $config An array of clients configurations
|
||||
* @param ContainerBuilder $container A ContainerBuilder instance
|
||||
*/
|
||||
protected function loadClients(array $clients, ContainerBuilder $container)
|
||||
{
|
||||
$clientIds = array();
|
||||
foreach ($clients as $name => $client) {
|
||||
$clientDefArgs = array(
|
||||
isset($client['host']) ? $client['host'] : null,
|
||||
isset($client['port']) ? $client['port'] : array(),
|
||||
);
|
||||
$clientDef = new Definition('%foq_elastica.client.class%', $clientDefArgs);
|
||||
$clientId = sprintf('foq_elastica.client.%s', $name);
|
||||
$container->setDefinition($clientId, $clientDef);
|
||||
$clientIds[$name] = $clientId;
|
||||
}
|
||||
|
||||
return $clientIds;
|
||||
}
|
||||
return $clientIds;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the configured indexes.
|
||||
*
|
||||
* @param array $config An array of indexes configurations
|
||||
* @param ContainerBuilder $container A ContainerBuilder instance
|
||||
*/
|
||||
protected function loadIndexes(array $indexes, ContainerBuilder $container, array $clientIdsByName, $defaultClientName)
|
||||
{
|
||||
$indexIds = array();
|
||||
foreach ($indexes as $name => $index) {
|
||||
if (isset($index['client'])) {
|
||||
$clientName = $index['client'];
|
||||
if (!isset($clientIdsByName[$clientName])) {
|
||||
throw new InvalidArgumentException(sprintf('The elastica client with name "%s" is not defined', $clientName));
|
||||
}
|
||||
} else {
|
||||
$clientName = $defaultClientName;
|
||||
}
|
||||
$clientId = $clientIdsByName[$clientName];
|
||||
$clientDef = $container->getDefinition($clientId);
|
||||
$indexId = sprintf('foq_elastica.index.%s', $name);
|
||||
$indexDefArgs = array($name);
|
||||
$indexDef = new Definition('%foq_elastica.index.class%', $indexDefArgs);
|
||||
$indexDef->setFactoryService($clientId);
|
||||
$indexDef->setFactoryMethod('getIndex');
|
||||
$container->setDefinition($indexId, $indexDef);
|
||||
$this->loadTypes(isset($index['types']) ? $index['types'] : array(), $container, $name, $indexId);
|
||||
$indexIds[$name] = $indexId;
|
||||
}
|
||||
/**
|
||||
* Loads the configured indexes.
|
||||
*
|
||||
* @param array $config An array of indexes configurations
|
||||
* @param ContainerBuilder $container A ContainerBuilder instance
|
||||
*/
|
||||
protected function loadIndexes(array $indexes, ContainerBuilder $container, array $clientIdsByName, $defaultClientName)
|
||||
{
|
||||
$indexIds = array();
|
||||
foreach ($indexes as $name => $index) {
|
||||
if (isset($index['client'])) {
|
||||
$clientName = $index['client'];
|
||||
if (!isset($clientIdsByName[$clientName])) {
|
||||
throw new InvalidArgumentException(sprintf('The elastica client with name "%s" is not defined', $clientName));
|
||||
}
|
||||
} else {
|
||||
$clientName = $defaultClientName;
|
||||
}
|
||||
$clientId = $clientIdsByName[$clientName];
|
||||
$clientDef = $container->getDefinition($clientId);
|
||||
$indexId = sprintf('foq_elastica.index.%s', $name);
|
||||
$indexDefArgs = array($name);
|
||||
$indexDef = new Definition('%foq_elastica.index.class%', $indexDefArgs);
|
||||
$indexDef->setFactoryService($clientId);
|
||||
$indexDef->setFactoryMethod('getIndex');
|
||||
$container->setDefinition($indexId, $indexDef);
|
||||
$this->loadTypes(isset($index['types']) ? $index['types'] : array(), $container, $name, $indexId);
|
||||
$indexIds[$name] = $indexId;
|
||||
}
|
||||
|
||||
return $indexIds;
|
||||
}
|
||||
return $indexIds;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the configured types.
|
||||
*
|
||||
* @param array $config An array of types configurations
|
||||
* @param ContainerBuilder $container A ContainerBuilder instance
|
||||
*/
|
||||
protected function loadTypes(array $types, ContainerBuilder $container, $indexName, $indexId)
|
||||
{
|
||||
foreach ($types as $name => $type) {
|
||||
$typeId = sprintf('%s.%s', $indexId, $name);
|
||||
$typeDefArgs = array($name);
|
||||
$typeDef = new Definition('%foq_elastica.type.class%', $typeDefArgs);
|
||||
$typeDef->setFactoryService($indexId);
|
||||
$typeDef->setFactoryMethod('getType');
|
||||
$container->setDefinition($typeId, $typeDef);
|
||||
if (isset($type['mappings'])) {
|
||||
$this->typeMappings[] = array(
|
||||
new Reference($typeId),
|
||||
$type['mappings']
|
||||
);
|
||||
}
|
||||
if (isset($type['doctrine'])) {
|
||||
$this->loadTypeDoctrineIntegration($type['doctrine'], $container, $typeDef, $indexName, $name);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Loads the configured types.
|
||||
*
|
||||
* @param array $config An array of types configurations
|
||||
* @param ContainerBuilder $container A ContainerBuilder instance
|
||||
*/
|
||||
protected function loadTypes(array $types, ContainerBuilder $container, $indexName, $indexId)
|
||||
{
|
||||
foreach ($types as $name => $type) {
|
||||
$typeId = sprintf('%s.%s', $indexId, $name);
|
||||
$typeDefArgs = array($name);
|
||||
$typeDef = new Definition('%foq_elastica.type.class%', $typeDefArgs);
|
||||
$typeDef->setFactoryService($indexId);
|
||||
$typeDef->setFactoryMethod('getType');
|
||||
$container->setDefinition($typeId, $typeDef);
|
||||
if (isset($type['mappings'])) {
|
||||
$this->typeMappings[] = array(new Reference($typeId), $type['mappings']);
|
||||
}
|
||||
if (isset($type['doctrine'])) {
|
||||
$this->loadTypeDoctrineIntegration($type['doctrine'], $container, $typeDef, $indexName, $name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the optional provider and finder for a type
|
||||
*
|
||||
* @return null
|
||||
**/
|
||||
public function loadTypeDoctrineIntegration(array $config, ContainerBuilder $container, Definition $typeDef, $indexName, $typeName)
|
||||
{
|
||||
if (!in_array($config['driver'], $this->supportedProviderDrivers)) {
|
||||
throw new InvalidArgumentException(sprintf('The provider driver "%s" is not supported'));
|
||||
}
|
||||
$this->loadDoctrineDriver($container, $config['driver']);
|
||||
if (isset($config['provider'])) {
|
||||
$abstractProviderId = sprintf('foq_elastica.provider.prototype.%s', $config['driver']);
|
||||
$providerId = sprintf('foq_elastica.provider.%s.%s', $indexName, $typeName);
|
||||
$providerDef = new DefinitionDecorator($abstractProviderId);
|
||||
$providerDef->replaceArgument(0, $typeDef);
|
||||
$providerDef->replaceArgument(3, $config['model']);
|
||||
$providerDef->replaceArgument(4, array_merge($config['provider'], array(
|
||||
'identifier' => $config['identifier']
|
||||
)));
|
||||
$container->setDefinition($providerId, $providerDef);
|
||||
$container->getDefinition('foq_elastica.populator')
|
||||
->addMethodCall('addProvider', array($providerId, new Reference($providerId)));
|
||||
}
|
||||
if (isset($config['finder'])) {
|
||||
$abstractMapperId = sprintf('foq_elastica.mapper.prototype.%s', $config['driver']);
|
||||
$mapperId = sprintf('foq_elastica.mapper.%s.%s', $indexName, $typeName);
|
||||
$mapperDef = new DefinitionDecorator($abstractMapperId);
|
||||
$mapperDef->replaceArgument(1, $config['model']);
|
||||
$mapperDef->replaceArgument(2, array_merge($config['finder'], array(
|
||||
'identifier' => $config['identifier']
|
||||
)));
|
||||
$container->setDefinition($mapperId, $mapperDef);
|
||||
$abstractFinderId = 'foq_elastica.finder.prototype';
|
||||
$finderId = sprintf('foq_elastica.finder.%s.%s', $indexName, $typeName);
|
||||
$finderDef = new DefinitionDecorator($abstractFinderId);
|
||||
$finderDef->replaceArgument(0, $typeDef);
|
||||
$finderDef->replaceArgument(1, new Reference($mapperId));
|
||||
$container->setDefinition($finderId, $finderDef);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Loads the optional provider and finder for a type
|
||||
*
|
||||
* @return null
|
||||
**/
|
||||
protected function loadTypeDoctrineIntegration(array $typeConfig, ContainerBuilder $container, Definition $typeDef, $indexName, $typeName)
|
||||
{
|
||||
if (!in_array($typeConfig['driver'], $this->supportedProviderDrivers)) {
|
||||
throw new InvalidArgumentException(sprintf('The provider driver "%s" is not supported'));
|
||||
}
|
||||
$this->loadDoctrineDriver($container, $typeConfig['driver']);
|
||||
|
||||
/**
|
||||
* Loads the index manager
|
||||
*
|
||||
* @return null
|
||||
**/
|
||||
public function loadIndexManager(array $indexDefs, $defaultIndexId, ContainerBuilder $container)
|
||||
{
|
||||
$managerDef = $container->getDefinition('foq_elastica.index_manager');
|
||||
$managerDef->replaceArgument(0, $indexDefs);
|
||||
$managerDef->replaceArgument(1, new Reference('foq_elastica.index'));
|
||||
}
|
||||
$elasticaToModelTransformerId = $this->loadElasticaToModelTransformer($typeConfig, $container, $indexName, $typeName);
|
||||
$modelToElasticaTransformerId = $this->loadModelToElasticaTransformer($typeConfig, $container, $indexName, $typeName);
|
||||
|
||||
/**
|
||||
* Loads the mapping setter
|
||||
*
|
||||
* @return null
|
||||
**/
|
||||
public function loadMappingSetter(array $mappings, ContainerBuilder $container)
|
||||
{
|
||||
$managerDef = $container->getDefinition('foq_elastica.mapping_setter');
|
||||
$managerDef->replaceArgument(0, $mappings);
|
||||
}
|
||||
if (isset($typeConfig['provider'])) {
|
||||
$providerId = $this->loadTypeProvider($typeConfig, $container, $modelToElasticaTransformerId, $typeDef, $indexName, $typeName);
|
||||
$container->getDefinition('foq_elastica.populator')->addMethodCall('addProvider', array($providerId, new Reference($providerId)));
|
||||
}
|
||||
if (isset($typeConfig['finder'])) {
|
||||
$this->loadTypeFinder($typeConfig, $container, $elasticaToModelTransformerId, $typeDef, $indexName, $typeName);
|
||||
}
|
||||
}
|
||||
|
||||
protected function loadDoctrineDriver(ContainerBuilder $container, $driver)
|
||||
{
|
||||
if (in_array($driver, $this->loadedDoctrineDrivers)) {
|
||||
return;
|
||||
}
|
||||
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
|
||||
$loader->load($driver.'.xml');
|
||||
$this->loadedDoctrineDrivers[] = $driver;
|
||||
}
|
||||
protected function loadElasticaToModelTransformer(array $typeConfig, ContainerBuilder $container, $indexName, $typeName)
|
||||
{
|
||||
if (isset($typeConfig['elastica_to_model_transformer']['service'])) {
|
||||
return $typeConfig['elastica_to_model_transformer']['service'];
|
||||
}
|
||||
$abstractId = sprintf('foq_elastica.elastica_to_model_transformer.prototype.%s', $typeConfig['driver']);
|
||||
$serviceId = sprintf('foq_elastica.elastica_to_model_transformer.%s.%s', $indexName, $typeName);
|
||||
$serviceDef = new DefinitionDecorator($abstractId);
|
||||
$serviceDef->replaceArgument(1, $typeConfig['model']);
|
||||
$serviceDef->replaceArgument(2, array(
|
||||
'identifier' => $typeConfig['identifier'],
|
||||
'hydrate' => $typeConfig['elastica_to_model_transformer']['hydrate']
|
||||
));
|
||||
$container->setDefinition($serviceId, $serviceDef);
|
||||
|
||||
return $serviceId;
|
||||
}
|
||||
|
||||
protected function loadModelToElasticaTransformer(array $typeConfig, ContainerBuilder $container, $indexName, $typeName)
|
||||
{
|
||||
if (isset($typeConfig['model_to_elastica_transformer']['service'])) {
|
||||
return $typeConfig['model_to_elastica_transformer']['service'];
|
||||
}
|
||||
$abstractId = sprintf('foq_elastica.model_to_elastica_transformer.prototype.auto');
|
||||
$serviceId = sprintf('foq_elastica.model_to_elastica_transformer.%s.%s', $indexName, $typeName);
|
||||
$serviceDef = new DefinitionDecorator($abstractId);
|
||||
$serviceDef->replaceArgument(0, array(
|
||||
'identifier' => $typeConfig['identifier']
|
||||
));
|
||||
$container->setDefinition($serviceId, $serviceDef);
|
||||
|
||||
return $serviceId;
|
||||
}
|
||||
|
||||
protected function loadTypeProvider(array $typeConfig, ContainerBuilder $container, $modelToElasticaTransformerId, $typeDef, $indexName, $typeName)
|
||||
{
|
||||
if (isset($typeConfig['provider']['service'])) {
|
||||
return $typeConfig['provider']['service'];
|
||||
}
|
||||
$abstractProviderId = sprintf('foq_elastica.provider.prototype.%s', $typeConfig['driver']);
|
||||
$providerId = sprintf('foq_elastica.provider.%s.%s', $indexName, $typeName);
|
||||
$providerDef = new DefinitionDecorator($abstractProviderId);
|
||||
$providerDef->replaceArgument(0, $typeDef);
|
||||
$providerDef->replaceArgument(2, new Reference($modelToElasticaTransformerId));
|
||||
$providerDef->replaceArgument(3, $typeConfig['model']);
|
||||
$providerDef->replaceArgument(4, array(
|
||||
'query_builder_method' => $typeConfig['provider']['query_builder_method'],
|
||||
'batch_size' => $typeConfig['provider']['batch_size'],
|
||||
'clear_object_manager' => $typeConfig['provider']['clear_object_manager']
|
||||
));
|
||||
$container->setDefinition($providerId, $providerDef);
|
||||
|
||||
return $providerId;
|
||||
}
|
||||
|
||||
protected function loadTypeFinder(array $typeConfig, ContainerBuilder $container, $elasticaToModelId, $typeDef, $indexName, $typeName)
|
||||
{
|
||||
if (isset($typeConfig['finder']['service'])) {
|
||||
return $typeConfig['finder']['service'];
|
||||
}
|
||||
$abstractFinderId = 'foq_elastica.finder.prototype';
|
||||
$finderId = sprintf('foq_elastica.finder.%s.%s', $indexName, $typeName);
|
||||
$finderDef = new DefinitionDecorator($abstractFinderId);
|
||||
$finderDef->replaceArgument(0, $typeDef);
|
||||
$finderDef->replaceArgument(1, new Reference($elasticaToModelId));
|
||||
$container->setDefinition($finderId, $finderDef);
|
||||
|
||||
return $finderId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the index manager
|
||||
*
|
||||
* @return null
|
||||
**/
|
||||
protected function loadIndexManager(array $indexDefs, $defaultIndexId, ContainerBuilder $container)
|
||||
{
|
||||
$managerDef = $container->getDefinition('foq_elastica.index_manager');
|
||||
$managerDef->replaceArgument(0, $indexDefs);
|
||||
$managerDef->replaceArgument(1, new Reference('foq_elastica.index'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the mapping setter
|
||||
*
|
||||
* @return null
|
||||
**/
|
||||
protected function loadMappingSetter(array $mappings, ContainerBuilder $container)
|
||||
{
|
||||
$managerDef = $container->getDefinition('foq_elastica.mapping_setter');
|
||||
$managerDef->replaceArgument(0, $mappings);
|
||||
}
|
||||
|
||||
protected function loadDoctrineDriver(ContainerBuilder $container, $driver)
|
||||
{
|
||||
if (in_array($driver, $this->loadedDoctrineDrivers)) {
|
||||
return;
|
||||
}
|
||||
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
|
||||
$loader->load($driver.'.xml');
|
||||
$this->loadedDoctrineDrivers[] = $driver;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue