Refactor to the max!

pimcore · Apr 25, 2024 · 1ed3568 · 1ed3568
1 parent 95b8e54
commit 1ed3568
Show file tree

Hide file tree

Showing 49 changed files with 100 additions and 107 deletions.
diff --git a/config/pimcore/config.yaml b/config/pimcore/config.yaml
@@ -4,5 +4,5 @@ pimcore:
             - studio
 
 pimcore_studio_backend:
-    openApiScanPaths:
+    open_api_scan_paths:
         - "%kernel.project_dir%/vendor/pimcore/studio-api-bundle/src"
diff --git a/config/services.yaml b/config/services.yaml
@@ -12,15 +12,6 @@ services:
         arguments:
             $bundle: "@=service('kernel').getBundle('PimcoreStudioBackendBundle')"
 
-    # controllers are imported separately to make sure they're public
-    # and have a tag that allows actions to type-hint services
-    Pimcore\Bundle\StudioBackendBundle\Controller\:
-        resource: '../src/Controller'
-        public: true
-        tags: [ 'controller.service_arguments' ]
-
-
-
 
 
 

diff --git a/src/Response/Asset.php → src/Asset/Schema/Asset.php b/src/Response/Asset.php → src/Asset/Schema/Asset.php
@@ -14,12 +14,13 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema;
 
 use OpenApi\Attributes\Items;
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Permissions;
+use Pimcore\Bundle\StudioBackendBundle\Response\Element;
 
 /**
  * @internal

diff --git a/src/Response/Asset/Archive.php → src/Asset/Schema/Type/Archive.php b/src/Response/Asset/Archive.php → src/Asset/Schema/Type/Archive.php
@@ -14,10 +14,10 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Archive',

diff --git a/src/Response/Asset/Audio.php → src/Asset/Schema/Type/Audio.php b/src/Response/Asset/Audio.php → src/Asset/Schema/Type/Audio.php
@@ -14,10 +14,10 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Audio',

diff --git a/src/Response/Asset/Document.php → src/Asset/Schema/Type/Document.php b/src/Response/Asset/Document.php → src/Asset/Schema/Type/Document.php
@@ -14,11 +14,11 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Document',

diff --git a/src/Response/Asset/Folder.php → src/Asset/Schema/Type/Folder.php b/src/Response/Asset/Folder.php → src/Asset/Schema/Type/Folder.php
@@ -14,10 +14,10 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Folder',

diff --git a/src/Response/Asset/Image.php → src/Asset/Schema/Type/Image.php b/src/Response/Asset/Image.php → src/Asset/Schema/Type/Image.php
@@ -14,11 +14,11 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Image',

diff --git a/src/Response/Asset/MetaData.php → src/Asset/Schema/Type/MetaData.php b/src/Response/Asset/MetaData.php → src/Asset/Schema/Type/MetaData.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;

diff --git a/src/Response/Asset/Permissions.php → src/Asset/Schema/Type/Permissions.php b/src/Response/Asset/Permissions.php → src/Asset/Schema/Type/Permissions.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;

diff --git a/src/Response/Asset/Text.php → src/Asset/Schema/Type/Text.php b/src/Response/Asset/Text.php → src/Asset/Schema/Type/Text.php
@@ -14,10 +14,10 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Text',

diff --git a/src/Response/Asset/Unknown.php → src/Asset/Schema/Type/Unknown.php b/src/Response/Asset/Unknown.php → src/Asset/Schema/Type/Unknown.php
@@ -14,10 +14,10 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Unknown',

diff --git a/src/Response/Asset/Video.php → src/Asset/Schema/Type/Video.php b/src/Response/Asset/Video.php → src/Asset/Schema/Type/Video.php
@@ -14,11 +14,11 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset;
 
 #[Schema(
     title: 'Video',

diff --git a/src/DataIndex/Adapter/AssetSearchAdapter.php b/src/DataIndex/Adapter/AssetSearchAdapter.php
@@ -18,10 +18,10 @@
 
 use Exception;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\Search\SearchService\Asset\AssetSearchServiceInterface;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchResult;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\AssetHydratorServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
 
 final readonly class AssetSearchAdapter implements AssetSearchAdapterInterface
 {

diff --git a/src/DataIndex/Adapter/AssetSearchAdapterInterface.php b/src/DataIndex/Adapter/AssetSearchAdapterInterface.php
@@ -16,9 +16,9 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter;
 
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchResult;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
 
 interface AssetSearchAdapterInterface
 {

diff --git a/src/DataIndex/Adapter/DataObjectSearchAdapter.php b/src/DataIndex/Adapter/DataObjectSearchAdapter.php
@@ -21,8 +21,8 @@
 use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolver;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchResult;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
+use Pimcore\Bundle\StudioBackendBundle\DataObject\Schema\DataObject;
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidSearchException;
-use Pimcore\Bundle\StudioBackendBundle\Response\DataObject;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\Element\ElementInterface;
 

diff --git a/src/DataIndex/AssetSearchResult.php b/src/DataIndex/AssetSearchResult.php
@@ -16,15 +16,15 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex;
 
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video;
 
 final readonly class AssetSearchResult
 {

diff --git a/src/DataIndex/AssetSearchService.php b/src/DataIndex/AssetSearchService.php
@@ -16,17 +16,17 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex;
 
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\AssetSearchAdapterInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video;
 
 final readonly class AssetSearchService implements AssetSearchServiceInterface
 {

diff --git a/src/DataIndex/AssetSearchServiceInterface.php b/src/DataIndex/AssetSearchServiceInterface.php
@@ -16,16 +16,16 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex;
 
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video;
 
 interface AssetSearchServiceInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php b/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php
@@ -17,9 +17,9 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive;
 
 final readonly class ArchiveHydrator implements ArchiveHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php b/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive;
 
 interface ArchiveHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/AudioHydrator.php b/src/DataIndex/Hydrator/Asset/AudioHydrator.php
@@ -17,9 +17,9 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio;
 
 final readonly class AudioHydrator implements AudioHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php b/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio;
 
 interface AudioHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/DocumentHydrator.php b/src/DataIndex/Hydrator/Asset/DocumentHydrator.php
@@ -17,9 +17,9 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document;
 
 final readonly class DocumentHydrator implements DocumentHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php b/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document;
 
 interface DocumentHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/FolderHydrator.php b/src/DataIndex/Hydrator/Asset/FolderHydrator.php
@@ -17,9 +17,9 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder;
 
 final readonly class FolderHydrator implements FolderHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php b/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder;
 
 interface FolderHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/ImageHydrator.php b/src/DataIndex/Hydrator/Asset/ImageHydrator.php
@@ -17,9 +17,9 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image;
 
 final readonly class ImageHydrator implements ImageHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php b/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
 
 interface ImageHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php b/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetMetaData;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\MetaData;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\MetaData;
 
 final class MetaDataHydrator implements MetaDataHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php b/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset;
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetMetaData;
-use Pimcore\Bundle\StudioBackendBundle\Response\Asset\MetaData;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\MetaData;
 
 interface MetaDataHydratorInterface
 {