Exclude namespace in type and items (#10)

Author: bajdzun

src/Merger/SchemaMerger.php

@@ -132,7 +132,12 @@ public function merge(
             } catch (SchemaMergerException $e) {
                 throw $e;
             }
-            $this->exportSchema($resolvedTemplate, $prefixWithNamespace, $useTemplateName);
+            $this->exportSchema(
+                $resolvedTemplate,
+                $prefixWithNamespace,
+                $useTemplateName,
+                $optimizeSubSchemaNamespaces
+            );
             ++$mergedFiles;
         }
 
@@ -148,7 +153,8 @@ public function merge(
     public function exportSchema(
         SchemaTemplateInterface $rootSchemaTemplate,
         bool $prefixWithNamespace = false,
-        bool $useTemplateName = false
+        bool $useTemplateName = false,
+        bool $optimizeSubSchemaNamespaces = false
     ): void {
         $rootSchemaDefinition = $this->transformExportSchemaDefinition(
             json_decode($rootSchemaTemplate->getSchemaDefinition(), true)
@@ -170,8 +176,14 @@ public function exportSchema(
             mkdir($this->getOutputDirectory());
         }
 
+        /** @var string $fileContents */
         $fileContents = json_encode($rootSchemaDefinition);
 
+        if (true === $optimizeSubSchemaNamespaces) {
+            $embeddedSchemaNamespace = $rootSchemaDefinition['namespace'] . '.';
+            $fileContents = str_replace($embeddedSchemaNamespace, '', $fileContents);
+        }
+
         file_put_contents($this->getOutputDirectory() . '/' . $schemaFilename, $fileContents);
     }
 

tests/Unit/Merger/SchemaMergerTest.php

@@ -368,14 +368,42 @@ public function testExportSchema()
             ->willReturn('{"name": "test"}');
         $schemaRegistry = $this->getMockForAbstractClass(SchemaRegistryInterface::class);
 
-
         $merger = new SchemaMerger($schemaRegistry);
         $merger->exportSchema($schemaTemplate);
 
         self::assertFileExists('/tmp/test.avsc');
         unlink('/tmp/test.avsc');
     }
 
+    public function testExportSchemaWithExcludingNamespaces()
+    {
+        $mergedSchema = '{"type":"record","name":"schema","namespace":"root.level.entity","schema_level":"root","fields":[{"name":"rootField1","type":{"type":"record","name":"embeddedSchema","fields":[{"name":"embeddedField","type":["null","string"],"default":null}]}},{"name":"rootField2","type":["null","root.level.entity.embeddedSchema"],"default":null}]}';
+
+        $expectedSchema = '{"type":"record","name":"schema","namespace":"root.level.entity","fields":[{"name":"rootField1","type":{"type":"record","name":"embeddedSchema","fields":[{"name":"embeddedField","type":["null","string"],"default":null}]}},{"name":"rootField2","type":["null","embeddedSchema"],"default":null}]}';
+
+        $schemaTemplate = $this->getMockForAbstractClass(SchemaTemplateInterface::class);
+        $schemaTemplate
+            ->expects(self::once())
+            ->method('getSchemaDefinition')
+            ->willReturn($mergedSchema);
+
+        $schemaTemplate
+            ->expects(self::once())
+            ->method('getFilename')
+            ->willReturn('test.avsc');
+
+        $schemaRegistry = $this->getMockForAbstractClass(SchemaRegistryInterface::class);
+
+        $merger = new SchemaMerger($schemaRegistry);
+        $merger->exportSchema($schemaTemplate, false, true, true);
+        file_put_contents('/tmp/test_expected_schema.avsc', $expectedSchema);
+
+        self::assertFileExists('/tmp/test.avsc');
+        self::assertFileEquals('/tmp/test_expected_schema.avsc', '/tmp/test.avsc');
+        unlink('/tmp/test_expected_schema.avsc');
+        unlink('/tmp/test.avsc');
+    }
+
     public function testExportSchemaPrimitiveWithWrongOptions()
     {
         $schemaTemplate = $this->getMockForAbstractClass(SchemaTemplateInterface::class);