Skip to content

Commit b26ae0a

Browse files
committed
!!! TASK: Remove driver for Elasticsearch Version 1 and Version 2
Both Versions are EOL and not longer supported by Elastic. Removing the support for this versions makes testing and improving the package a lot easier
1 parent 0631409 commit b26ae0a

35 files changed

Lines changed: 299 additions & 1265 deletions

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ addons:
99
- oracle-java8-set-default
1010
matrix:
1111
include:
12-
- php: 7.2
13-
env: ES=1
14-
- php: 7.2
15-
env: ES=2
1612
- php: 7.2
1713
env: ES=5
1814

1915
before_install:
2016
- export NEOS_TARGET_VERSION=4.0
2117
- cd ..
22-
- if [ "$ES" = 1 ]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.6.zip && unzip elasticsearch-1.7.6.zip && mv elasticsearch-1.7.6 elasticsearch; fi
23-
- if [ "$ES" = 2 ]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.6.zip && unzip elasticsearch-2.4.6.zip && mv elasticsearch-2.4.6 elasticsearch; fi
2418
- if [ "$ES" = 5 ]; then wget --no-check-certificate https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.8.zip && unzip elasticsearch-5.6.8.zip && mv elasticsearch-5.6.8 elasticsearch; fi
2519
- cd elasticsearch
2620
- bin/elasticsearch -d
@@ -36,6 +30,4 @@ install:
3630
- cd neos-base-distribution
3731
script:
3832
- bin/phpunit --colors -c Build/BuildEssentials/PhpUnit/UnitTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Unit
39-
- if [ "$ES" = 1 ]; then FLOW_CONTEXT="Testing/ElasticVersion1" bin/phpunit --colors --stop-on-failure -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional; fi
40-
- if [ "$ES" = 2 ]; then FLOW_CONTEXT="Testing/ElasticVersion2" bin/phpunit --colors --stop-on-failure -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional; fi
4133
- if [ "$ES" = 5 ]; then FLOW_CONTEXT="Testing/ElasticVersion5" bin/phpunit --colors --stop-on-failure -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional; fi

Classes/Driver/AbstractIndexerDriver.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,20 @@
1111
* source code.
1212
*/
1313

14+
use Neos\Flow\Annotations as Flow;
1415
use Neos\ContentRepository\Domain\Model\NodeInterface;
1516

1617
/**
1718
* Abstract Fulltext Indexer Driver
1819
*/
1920
abstract class AbstractIndexerDriver extends AbstractDriver
2021
{
22+
/**
23+
* @Flow\Inject
24+
* @var NodeTypeMappingBuilderInterface
25+
*/
26+
protected $nodeTypeMappingBuilder;
27+
2128
/**
2229
* Whether the node is configured as fulltext root.
2330
*

Classes/Driver/Version1/DocumentDriver.php

Lines changed: 0 additions & 74 deletions
This file was deleted.

Classes/Driver/Version1/IndexDriver.php

Lines changed: 0 additions & 65 deletions
This file was deleted.

Classes/Driver/Version1/IndexerDriver.php

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)