Skip to content

Commit c2b937c

Browse files
committed
[TASK] update naming according to TYPO3.TYPO3CR.Search
1 parent 5951598 commit c2b937c

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeIndexCommandController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use TYPO3\Flow\Annotations as Flow;
1515
use TYPO3\Flow\Cli\CommandController;
1616
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
17-
use TYPO3\TYPO3CR\SearchCommons\Indexer\NodeIndexingManager;
17+
use TYPO3\TYPO3CR\Search\Indexer\NodeIndexingManager;
1818

1919
/**
2020
* Provides CLI features for index handling

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use TYPO3\Eel\ProtectedContextAwareInterface;
1717
use TYPO3\Flow\Annotations as Flow;
1818
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
19-
use TYPO3\TYPO3CR\SearchCommons\Search\QueryBuilderInterface;
19+
use TYPO3\TYPO3CR\Search\Search\QueryBuilderInterface;
2020

2121
/**
2222
* Query Builder for ElasticSearch Queries

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/ElasticSearchClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ElasticSearchClient extends \Flowpack\ElasticSearch\Domain\Model\Client {
4747
*/
4848
public function initializeObject($cause) {
4949
if ($cause === \TYPO3\Flow\Object\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
50-
$settings = $this->configurationManager->getConfiguration(\TYPO3\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.TYPO3CR.SearchCommons');
50+
$settings = $this->configurationManager->getConfiguration(\TYPO3\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.TYPO3CR.Search');
5151
$this->indexName = $settings['elasticSearch']['indexName'];
5252
}
5353
}

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use TYPO3\Flow\Annotations as Flow;
2020
use TYPO3\TYPO3CR\Domain\Model\Node;
2121
use TYPO3\TYPO3CR\Domain\Service\NodeTypeManager;
22-
use TYPO3\TYPO3CR\SearchCommons\Indexer\AbstractNodeIndexer;
22+
use TYPO3\TYPO3CR\Search\Indexer\AbstractNodeIndexer;
2323

2424
/*
2525
* Yes, dirty as hell. But the function is just too helpful...

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Mapping/NodeTypeMappingBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class NodeTypeMappingBuilder {
5757
*/
5858
public function initializeObject($cause) {
5959
if ($cause === \TYPO3\Flow\Object\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
60-
$settings = $this->configurationManager->getConfiguration(\TYPO3\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.TYPO3CR.SearchCommons');
60+
$settings = $this->configurationManager->getConfiguration(\TYPO3\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.TYPO3CR.Search');
6161
$this->defaultConfigurationPerType = $settings['defaultConfigurationPerType'];
6262
}
6363
}

Configuration/Objects.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandControll
1414
fileBackend: 'TYPO3\Flow\Log\Backend\FileBackend'
1515
ansiConsoleBackend: 'TYPO3\Flow\Log\Backend\AnsiConsoleBackend'
1616
4:
17-
setting: TYPO3.TYPO3CR.SearchCommons.elasticSearch.log.backendOptions
17+
setting: TYPO3.TYPO3CR.Search.elasticSearch.log.backendOptions
1818

1919
Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface:
2020
scope: singleton

Configuration/Settings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TYPO3:
22
TYPO3CR:
3-
SearchCommons:
3+
Search:
44

55
elasticSearch:
66

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ main functionalities:
1111

1212
Relevant Packages:
1313

14-
* `TYPO3.TYPO3CR.SearchCommons`: provides common functionality for searching TYPO3CR nodes,
14+
* `TYPO3.TYPO3CR.Search`: provides common functionality for searching TYPO3CR nodes,
1515
does not contain a search backend
1616

1717
* `Flowpack.ElasticSearch.ContentRepositoryAdaptor`: this package
@@ -25,15 +25,15 @@ Relevant Packages:
2525
## Version 2 vs Version 1
2626

2727
* Version 1 is the initial, productive version of the Neos ElasticSearch adapter.
28-
* Version 2 has a dependency on TYPO3.TYPO3CR.SearchCommons; which contains base functionality
28+
* Version 2 has a dependency on TYPO3.TYPO3CR.Search; which contains base functionality
2929
which is also relevant for other search implementations (like the SQLite based SimpleSearch).
3030

3131
The configuration from Version 1 to Version 2 has changed; here's what to change:
3232

3333
**Settings.yaml**
3434

3535
1. Change the base namespace for configuration from `Flowpack.ElasticSearch.ContentRepositoryAdaptor`
36-
to `TYPO3.TYPO3CR.SearchCommons`. All further adjustments are made underneath this namespace:
36+
to `TYPO3.TYPO3CR.Search`. All further adjustments are made underneath this namespace:
3737

3838
2. (If it exists in your configuration:) Move `indexName` to `elasticSearch.indexName`
3939

@@ -179,7 +179,7 @@ of `__typeAndSupertypes` containing `TYPO3.Neos:Document`.
179179
**Normally, this does not need to be touched, as this package supports all TYPO3 Neos data types natively.**
180180

181181
Indexing of properties is configured at two places. The defaults per-data-type are configured
182-
inside `TYPO3.TYPO3CR.SearchCommons.defaultConfigurationPerType` of `Settings.yaml`.
182+
inside `TYPO3.TYPO3CR.Search.defaultConfigurationPerType` of `Settings.yaml`.
183183
Furthermore, this can be overridden using the `properties.[....].search` path inside
184184
`NodeTypes.yaml`.
185185

@@ -194,7 +194,7 @@ Example (from the default configuration):
194194
# Settings.yaml
195195
TYPO3:
196196
TYPO3CR:
197-
SearchCommons:
197+
Search:
198198
defaultConfigurationPerType:
199199
200200
# strings should, by default, not be included in the _all field; and

0 commit comments

Comments
 (0)