small updates and fixes

Author: Simonas Šerlinskas

DependencyInjection/Compiler/MappingPass.php

@@ -23,6 +23,7 @@ class MappingPass implements CompilerPassInterface
 {
     /**
      * {@inheritdoc}
+     * @throws \Exception
      */
     public function process(ContainerBuilder $container)
     {

Mapping/DocumentParser.php

@@ -17,7 +17,7 @@
 use ONGR\ElasticsearchBundle\Annotation\Embedded;
 use ONGR\ElasticsearchBundle\Annotation\HashMap;
 use ONGR\ElasticsearchBundle\Annotation\MetaField;
-use ONGR\ElasticsearchBundle\Annotation\Nested;
+use ONGR\ElasticsearchBundle\Annotation\NestedType;
 use ONGR\ElasticsearchBundle\Annotation\ParentDocument;
 use ONGR\ElasticsearchBundle\Annotation\Property;
 use ONGR\ElasticsearchBundle\Exception\MissingDocumentAnnotationException;
@@ -30,8 +30,8 @@ class DocumentParser
     const PROPERTY_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Property';
     const EMBEDDED_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Embedded';
     const DOCUMENT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Document';
-    const OBJECT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Object';
-    const NESTED_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Nested';
+    const OBJECT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\ObjectType';
+    const NESTED_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\NestedType';
 
     // Meta fields
     const ID_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Id';
@@ -398,8 +398,8 @@ private function registerAnnotations()
             'Document',
             'Property',
             'Embedded',
-            'Object',
-            'Nested',
+            'ObjectType',
+            'NestedType',
             'Id',
             'ParentDocument',
             'Routing',
@@ -547,7 +547,7 @@ private function getProperties(\ReflectionClass $reflectionClass, $properties =
             // HashMap object
             if ($type instanceof HashMap) {
                 $map = array_replace_recursive($map, [
-                    'type' => Nested::NAME,
+                    'type' => NestedType::NAME,
                     'dynamic' => true,
                 ]);
             }
@@ -595,7 +595,7 @@ private function getObjectMapping($className, $directory)
             default:
                 throw new \LogicException(
                     sprintf(
-                        '%s should have @Object or @Nested annotation to be used as embeddable object.',
+                        '%s should have @ObjectType or @NestedType annotation to be used as embeddable object.',
                         $className
                     )
                 );

Resources/doc/mapping.md

@@ -275,7 +275,7 @@ namespace AppBundle\Document;
 use ONGR\ElasticsearchBundle\Annotation as ES;
 
 /**
- * @ES\Object
+ * @ES\ObjectType
  */
 class CategoryObject
 {
@@ -399,7 +399,7 @@ namespace AppBundle\Document;
 use ONGR\ElasticsearchBundle\Annotation as ES;
 
 /**
- * @ES\Object
+ * @ES\ObjectType
  */
 class VariantObject
 {
@@ -434,9 +434,9 @@ Insert action will look like this:
 
 > There is no bounds to define other objects within objects.
 
-> Nested types can be defined the same way as objects, except `@ES\Nested` annotation must be used.
+> Nested types can be defined the same way as objects, except `@ES\NestedType` annotation must be used.
 
-The difference between `@ES\Embedded` and `@ES\Nested` is in the way that the Elasticsearch indexes them.
+The difference between `@ES\Embedded` and `@ES\NestedType` is in the way that the Elasticsearch indexes them.
 While the values of the fields in embedded objects are extracted and put into the same array with all the other
 values of other embedded objects in the same field, during the indexation process, the values of the fields of
 nested objects stored separately. This introduces differences when querying and filtering the index.

Result/Converter.php

@@ -12,8 +12,8 @@
 namespace ONGR\ElasticsearchBundle\Result;
 
 use Doctrine\Common\Collections\Collection;
-use ONGR\ElasticsearchBundle\Annotation\Nested;
-use ONGR\ElasticsearchBundle\Annotation\Object;
+use ONGR\ElasticsearchBundle\Annotation\NestedType;
+use ONGR\ElasticsearchBundle\Annotation\ObjectType;
 use ONGR\ElasticsearchBundle\Mapping\MetadataCollector;
 use ONGR\ElasticsearchBundle\Service\Manager;
 
@@ -104,8 +104,8 @@ public function assignArrayToObject(array $array, $object, array $aliases)
                             $value = new \DateTime($value);
                         }
                         break;
-                    case Object::NAME:
-                    case Nested::NAME:
+                    case ObjectType::NAME:
+                    case NestedType::NAME:
                         if ($aliases[$name]['multiple']) {
                             $value = new ObjectIterator($this, $value, $aliases[$name]);
                         } else {

Service/ManagerFactory.php

@@ -102,7 +102,7 @@ public function createManager($managerName, $connection, $analysis, $managerConf
 
         $client = ClientBuilder::create();
         $client->setHosts($connection['hosts']);
-        $client->setTracer($this->tracer);
+        $this->tracer && $client->setTracer($this->tracer);
 
         if ($this->logger && $managerConfig['logger']['enabled']) {
             $client->setLogger($this->logger);