Skip to content

Commit 05ebe9b

Browse files
author
Andrew Stucki
committed
Update file structure
1 parent ac1799d commit 05ebe9b

File tree

6 files changed

+19
-37
lines changed

6 files changed

+19
-37
lines changed

modules/ingest-common/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ dependencies {
1818
compileOnly project(':modules:lang-painless')
1919
api project(':libs:elasticsearch-grok')
2020
api project(':libs:elasticsearch-dissect')
21+
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
22+
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
2123
}
2224

2325
restResources {

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/IngestCommonPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
8181
entry(UriPartsProcessor.TYPE, new UriPartsProcessor.Factory()),
8282
entry(NetworkDirectionProcessor.TYPE, new NetworkDirectionProcessor.Factory()),
8383
entry(CommunityIdProcessor.TYPE, new CommunityIdProcessor.Factory()),
84-
entry(FingerprintProcessor.TYPE, new FingerprintProcessor.Factory())
84+
entry(FingerprintProcessor.TYPE, new FingerprintProcessor.Factory()),
85+
entry(RegisteredDomainProcessor.TYPE, new RegisteredDomainProcessor.Factory())
8586
);
8687
}
8788

x-pack/plugin/ingest/src/main/java/org/elasticsearch/xpack/ingest/RegisteredDomainProcessor.java renamed to modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RegisteredDomainProcessor.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License;
4-
* you may not use this file except in compliance with the Elastic License.
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
57
*/
68

7-
package org.elasticsearch.xpack.ingest;
9+
package org.elasticsearch.ingest.common;
810

911
import org.apache.http.conn.util.PublicSuffixMatcher;
1012
import org.apache.http.conn.util.PublicSuffixMatcherLoader;
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License;
4-
* you may not use this file except in compliance with the Elastic License.
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
57
*/
68

7-
package org.elasticsearch.xpack.ingest;
9+
package org.elasticsearch.ingest.common;
810

911
import org.elasticsearch.ElasticsearchParseException;
1012
import org.elasticsearch.test.ESTestCase;

x-pack/plugin/ingest/src/test/java/org/elasticsearch/xpack/ingest/RegisteredDomainProcessorTests.java renamed to modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License;
4-
* you may not use this file except in compliance with the Elastic License.
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
57
*/
68

7-
package org.elasticsearch.xpack.ingest;
9+
package org.elasticsearch.ingest.common;
810

911
import org.elasticsearch.ingest.IngestDocument;
1012
import org.elasticsearch.test.ESTestCase;

x-pack/plugin/ingest/src/main/java/org/elasticsearch/xpack/ingest/IngestPlugin.java

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

0 commit comments

Comments
 (0)