Merge pull request #31 from skurfuerst/master

[FEATURE] allow to configure the full ElasticSearch Mapping via API

Author: skurfuerst

Classes/Flowpack/ElasticSearch/Domain/Model/Mapping.php

@@ -12,6 +12,7 @@
  *                                                                        */
 
 use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Flow\Utility\Arrays;
 
 /**
  * Reflects a Mapping of Elasticsearch
@@ -34,6 +35,15 @@ class Mapping {
 	 */
 	protected $dynamicTemplates = array();
 
+	/**
+	 * This is the full / raw ElasticSearch mapping which is merged with the properties and dynamicTemplates.
+	 *
+	 * It can be used to specify arbitrary ElasticSearch mapping options, like f.e. configuring the _all field.
+	 *
+	 * @var array
+	 */
+	protected $fullMapping = array();
+
 	/**
 	 * @param \Flowpack\ElasticSearch\Domain\Model\AbstractType $type
 	 */
@@ -82,10 +92,10 @@ public function getType() {
 	 * @return array
 	 */
 	public function asArray() {
-		return array($this->type->getName() => array(
+		return array($this->type->getName() => Arrays::arrayMergeRecursiveOverrule(array(
 			'dynamic_templates' => $this->getDynamicTemplates(),
 			'properties' => $this->getProperties()
-		));
+		), $this->fullMapping));
 	}
 
 	/**
@@ -116,4 +126,23 @@ public function addDynamicTemplate($dynamicTemplateName, array $mappingConfigura
 			$dynamicTemplateName => $mappingConfiguration
 		);
 	}
+
+	/**
+	 * This is the full / raw ElasticSearch mapping which is merged with the properties and dynamicTemplates.
+	 *
+	 * It can be used to specify arbitrary ElasticSearch mapping options, like f.e. configuring the _all field.
+	 *
+	 * @param array $fullMapping
+	 */
+	public function setFullMapping(array $fullMapping) {
+		$this->fullMapping = $fullMapping;
+	}
+
+	/**
+	 * see {@link setFullMapping} for documentation
+	 * @return array
+	 */
+	public function getFullMapping() {
+		return $this->fullMapping;
+	}
 }