Skip to content

Commit 5f69640

Browse files
blizzzblizzz
authored
Merge pull request #41446 from nextcloud/fix/noid/moving-metadataquery
moving IMetadataQuery
2 parents 70acf44 + 380b813 commit 5f69640

10 files changed

+15
-14
lines changed

‎apps/dav/lib/Files/FileSearchBackend.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
use OCP\Files\Search\ISearchOrder;
4444
use OCP\Files\Search\ISearchQuery;
4545
use OCP\FilesMetadata\IFilesMetadataManager;
46-
use OCP\FilesMetadata\Model\IMetadataQuery;
46+
use OCP\FilesMetadata\IMetadataQuery;
4747
use OCP\FilesMetadata\Model\IMetadataValueWrapper;
4848
use OCP\IUser;
4949
use OCP\Share\IManager;

‎lib/composer/composer/autoload_classmap.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@
295295
'OCP\\FilesMetadata\\Exceptions\\FilesMetadataNotFoundException' => $baseDir . '/lib/public/FilesMetadata/Exceptions/FilesMetadataNotFoundException.php',
296296
'OCP\\FilesMetadata\\Exceptions\\FilesMetadataTypeException' => $baseDir . '/lib/public/FilesMetadata/Exceptions/FilesMetadataTypeException.php',
297297
'OCP\\FilesMetadata\\IFilesMetadataManager' => $baseDir . '/lib/public/FilesMetadata/IFilesMetadataManager.php',
298+
'OCP\\FilesMetadata\\IMetadataQuery' => $baseDir . '/lib/public/FilesMetadata/IMetadataQuery.php',
298299
'OCP\\FilesMetadata\\Model\\IFilesMetadata' => $baseDir . '/lib/public/FilesMetadata/Model/IFilesMetadata.php',
299-
'OCP\\FilesMetadata\\Model\\IMetadataQuery' => $baseDir . '/lib/public/FilesMetadata/Model/IMetadataQuery.php',
300300
'OCP\\FilesMetadata\\Model\\IMetadataValueWrapper' => $baseDir . '/lib/public/FilesMetadata/Model/IMetadataValueWrapper.php',
301301
'OCP\\Files\\AlreadyExistsException' => $baseDir . '/lib/public/Files/AlreadyExistsException.php',
302302
'OCP\\Files\\AppData\\IAppDataFactory' => $baseDir . '/lib/public/Files/AppData/IAppDataFactory.php',
@@ -1312,8 +1312,8 @@
13121312
'OC\\FilesMetadata\\Job\\UpdateSingleMetadata' => $baseDir . '/lib/private/FilesMetadata/Job/UpdateSingleMetadata.php',
13131313
'OC\\FilesMetadata\\Listener\\MetadataDelete' => $baseDir . '/lib/private/FilesMetadata/Listener/MetadataDelete.php',
13141314
'OC\\FilesMetadata\\Listener\\MetadataUpdate' => $baseDir . '/lib/private/FilesMetadata/Listener/MetadataUpdate.php',
1315+
'OC\\FilesMetadata\\MetadataQuery' => $baseDir . '/lib/private/FilesMetadata/MetadataQuery.php',
13151316
'OC\\FilesMetadata\\Model\\FilesMetadata' => $baseDir . '/lib/private/FilesMetadata/Model/FilesMetadata.php',
1316-
'OC\\FilesMetadata\\Model\\MetadataQuery' => $baseDir . '/lib/private/FilesMetadata/Model/MetadataQuery.php',
13171317
'OC\\FilesMetadata\\Model\\MetadataValueWrapper' => $baseDir . '/lib/private/FilesMetadata/Model/MetadataValueWrapper.php',
13181318
'OC\\FilesMetadata\\Service\\IndexRequestService' => $baseDir . '/lib/private/FilesMetadata/Service/IndexRequestService.php',
13191319
'OC\\FilesMetadata\\Service\\MetadataRequestService' => $baseDir . '/lib/private/FilesMetadata/Service/MetadataRequestService.php',

‎lib/composer/composer/autoload_static.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
328328
'OCP\\FilesMetadata\\Exceptions\\FilesMetadataNotFoundException' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Exceptions/FilesMetadataNotFoundException.php',
329329
'OCP\\FilesMetadata\\Exceptions\\FilesMetadataTypeException' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Exceptions/FilesMetadataTypeException.php',
330330
'OCP\\FilesMetadata\\IFilesMetadataManager' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/IFilesMetadataManager.php',
331+
'OCP\\FilesMetadata\\IMetadataQuery' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/IMetadataQuery.php',
331332
'OCP\\FilesMetadata\\Model\\IFilesMetadata' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Model/IFilesMetadata.php',
332-
'OCP\\FilesMetadata\\Model\\IMetadataQuery' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Model/IMetadataQuery.php',
333333
'OCP\\FilesMetadata\\Model\\IMetadataValueWrapper' => __DIR__ . '/../../..' . '/lib/public/FilesMetadata/Model/IMetadataValueWrapper.php',
334334
'OCP\\Files\\AlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/Files/AlreadyExistsException.php',
335335
'OCP\\Files\\AppData\\IAppDataFactory' => __DIR__ . '/../../..' . '/lib/public/Files/AppData/IAppDataFactory.php',
@@ -1345,8 +1345,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
13451345
'OC\\FilesMetadata\\Job\\UpdateSingleMetadata' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Job/UpdateSingleMetadata.php',
13461346
'OC\\FilesMetadata\\Listener\\MetadataDelete' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Listener/MetadataDelete.php',
13471347
'OC\\FilesMetadata\\Listener\\MetadataUpdate' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Listener/MetadataUpdate.php',
1348+
'OC\\FilesMetadata\\MetadataQuery' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/MetadataQuery.php',
13481349
'OC\\FilesMetadata\\Model\\FilesMetadata' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Model/FilesMetadata.php',
1349-
'OC\\FilesMetadata\\Model\\MetadataQuery' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Model/MetadataQuery.php',
13501350
'OC\\FilesMetadata\\Model\\MetadataValueWrapper' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Model/MetadataValueWrapper.php',
13511351
'OC\\FilesMetadata\\Service\\IndexRequestService' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Service/IndexRequestService.php',
13521352
'OC\\FilesMetadata\\Service\\MetadataRequestService' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Service/MetadataRequestService.php',

‎lib/private/Files/Cache/CacheQueryBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
use OC\SystemConfig;
3131
use OCP\DB\QueryBuilder\IQueryBuilder;
3232
use OCP\FilesMetadata\IFilesMetadataManager;
33-
use OCP\FilesMetadata\Model\IMetadataQuery;
33+
use OCP\FilesMetadata\IMetadataQuery;
3434
use OCP\IDBConnection;
3535
use Psr\Log\LoggerInterface;
3636

‎lib/private/Files/Cache/QuerySearchHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
use OCP\Files\Search\ISearchBinaryOperator;
4040
use OCP\Files\Search\ISearchQuery;
4141
use OCP\FilesMetadata\IFilesMetadataManager;
42-
use OCP\FilesMetadata\Model\IMetadataQuery;
42+
use OCP\FilesMetadata\IMetadataQuery;
4343
use OCP\IDBConnection;
4444
use OCP\IGroupManager;
4545
use OCP\IUser;

‎lib/private/Files/Cache/SearchBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
use OCP\Files\Search\ISearchComparison;
3434
use OCP\Files\Search\ISearchOperator;
3535
use OCP\Files\Search\ISearchOrder;
36-
use OCP\FilesMetadata\Model\IMetadataQuery;
36+
use OCP\FilesMetadata\IMetadataQuery;
3737

3838
/**
3939
* Tools for transforming search queries into database queries

‎lib/private/FilesMetadata/FilesMetadataManager.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
use OC\FilesMetadata\Listener\MetadataDelete;
3131
use OC\FilesMetadata\Listener\MetadataUpdate;
3232
use OC\FilesMetadata\Model\FilesMetadata;
33-
use OC\FilesMetadata\Model\MetadataQuery;
3433
use OC\FilesMetadata\Service\IndexRequestService;
3534
use OC\FilesMetadata\Service\MetadataRequestService;
3635
use OCP\BackgroundJob\IJobList;
@@ -48,8 +47,8 @@
4847
use OCP\FilesMetadata\Exceptions\FilesMetadataException;
4948
use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException;
5049
use OCP\FilesMetadata\IFilesMetadataManager;
50+
use OCP\FilesMetadata\IMetadataQuery;
5151
use OCP\FilesMetadata\Model\IFilesMetadata;
52-
use OCP\FilesMetadata\Model\IMetadataQuery;
5352
use OCP\FilesMetadata\Model\IMetadataValueWrapper;
5453
use OCP\IConfig;
5554
use Psr\Log\LoggerInterface;

‎lib/private/FilesMetadata/Model/MetadataQuery.php ‎lib/private/FilesMetadata/MetadataQuery.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
*
2424
*/
2525

26-
namespace OC\FilesMetadata\Model;
26+
namespace OC\FilesMetadata;
2727

28+
use OC\FilesMetadata\Model\FilesMetadata;
2829
use OC\FilesMetadata\Service\IndexRequestService;
2930
use OC\FilesMetadata\Service\MetadataRequestService;
3031
use OCP\DB\QueryBuilder\IQueryBuilder;
3132
use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException;
3233
use OCP\FilesMetadata\Exceptions\FilesMetadataTypeException;
34+
use OCP\FilesMetadata\IMetadataQuery;
3335
use OCP\FilesMetadata\Model\IFilesMetadata;
34-
use OCP\FilesMetadata\Model\IMetadataQuery;
3536
use OCP\FilesMetadata\Model\IMetadataValueWrapper;
3637

3738
/**

‎lib/public/FilesMetadata/IFilesMetadataManager.php

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
use OCP\FilesMetadata\Exceptions\FilesMetadataException;
3131
use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException;
3232
use OCP\FilesMetadata\Model\IFilesMetadata;
33-
use OCP\FilesMetadata\Model\IMetadataQuery;
3433

3534
/**
3635
* Manager for FilesMetadata; manage files' metadata.

‎lib/public/FilesMetadata/Model/IMetadataQuery.php ‎lib/public/FilesMetadata/IMetadataQuery.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
*
2424
*/
2525

26-
namespace OCP\FilesMetadata\Model;
26+
namespace OCP\FilesMetadata;
27+
28+
use OCP\FilesMetadata\Model\IFilesMetadata;
2729

2830
/**
2931
* Model that help building queries with metadata and metadata indexes

0 commit comments

Comments
 (0)