[Feature] New module geospatial-client for cross-plugin IP enrichme…

…nt (#700) (#705) * Common module Signed-off-by: Andy Kwok <[email protected]> * POC Signed-off-by: Andy Kwok <[email protected]> * Consolidate interface Signed-off-by: Andy Kwok <[email protected]> * Consolidate interface Signed-off-by: Andy Kwok <[email protected]> * Remove common module Signed-off-by: Andy Kwok <[email protected]> * Gradle cleanup Signed-off-by: Andy Kwok <[email protected]> * Lombok Signed-off-by: Andy Kwok <[email protected]> * Java doc - 1 Signed-off-by: Andy Kwok <[email protected]> * Java doc Signed-off-by: Andy Kwok <[email protected]> * API Signature Signed-off-by: Andy Kwok <[email protected]> * Fetch default data source Signed-off-by: Andy Kwok <[email protected]> * Logger Signed-off-by: Andy Kwok <[email protected]> * Initial test cases Signed-off-by: Andy Kwok <[email protected]> * Add test-cases Signed-off-by: Andy Kwok <[email protected]> * Test-cases: Client Signed-off-by: Andy Kwok <[email protected]> * Update tests Signed-off-by: Andy Kwok <[email protected]> * Update code style Signed-off-by: Andy Kwok <[email protected]> * Style fix Signed-off-by: Andy Kwok <[email protected]> * Update deps Signed-off-by: Andy Kwok <[email protected]> * Spotless Signed-off-by: Andy Kwok <[email protected]> * Spotless Signed-off-by: Andy Kwok <[email protected]> * Code refactor Signed-off-by: Andy Kwok <[email protected]> * Serialisation attempt Signed-off-by: Andy Kwok <[email protected]> * Remove custom serialisation support Signed-off-by: Andy Kwok <[email protected]> * Address code comments Signed-off-by: Andy Kwok <[email protected]> * Update test infra Signed-off-by: Andy Kwok <[email protected]> * Remove unused test-cases Signed-off-by: Andy Kwok <[email protected]> * Add lombok config Signed-off-by: Andy Kwok <[email protected]> * Update test Signed-off-by: Andy Kwok <[email protected]> * Update changelog Signed-off-by: Andy Kwok <[email protected]> * Update gradle Signed-off-by: Andy Kwok <[email protected]> * Update Gradle build Signed-off-by: Andy Kwok <[email protected]> * Update artifact info Signed-off-by: Andy Kwok <[email protected]> * Minimise diff Signed-off-by: Andy Kwok <[email protected]> * Style fix Signed-off-by: Andy Kwok <[email protected]> * Code comments Signed-off-by: Andy Kwok <[email protected]> --------- Signed-off-by: Andy Kwok <[email protected]> (cherry picked from commit eb8aba6) Co-authored-by: Andy Kwok <[email protected]>
opensearch-project · Dec 9, 2024 · fe6101a · fe6101a
1 parent dd4a4af
commit fe6101a
Show file tree

Hide file tree

Showing 17 changed files with 818 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on ho
 
 ## [Unreleased 2.x](https://github.com/opensearch-project/geospatial/compare/2.17...2.x)
 ### Features
+- Introduce new Java artifact geospatial-client to facilitate cross plugin communication. ([#700](https://github.com/opensearch-project/geospatial/pull/700))
 ### Enhancements
 ### Bug Fixes
 ### Infrastructure

diff --git a/build.gradle b/build.gradle
@@ -162,6 +162,7 @@ configurations {
 dependencies {
     implementation "org.opensearch.plugin:geo:${opensearch_version}"
     api project(":libs:h3")
+    api project(":geospatial-client")
     yamlRestTestRuntimeOnly "org.apache.logging.log4j:log4j-core:${versions.log4j}"
     testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
     testImplementation 'org.json:json:20231013'

diff --git a/client/LICENSE.txt b/client/LICENSE.txt
@@ -0,0 +1,204 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+This project is based on a modification of https://github.com/uber/h3 which is licensed under the Apache 2.0 License.
diff --git a/client/NOTICE.txt b/client/NOTICE.txt
@@ -0,0 +1,2 @@
+OpenSearch (https://opensearch.org)
+Copyright OpenSearch Contributors
diff --git a/client/build.gradle b/client/build.gradle
@@ -0,0 +1,80 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'opensearch.build'
+apply plugin: 'io.freefair.lombok'
+apply plugin: "com.diffplug.spotless"
+
+
+group = opensearch_group
+version = "${opensearch_build}"
+description = 'OpenSearch Geospatial client'
+
+project.loggerUsageCheck.enabled = false
+project.testingConventions.enabled = false
+project.forbiddenApisTest.enabled = false
+
+repositories {
+    mavenLocal()
+    maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
+    mavenCentral()
+    maven { url "https://plugins.gradle.org/m2/" }
+}
+
+compileJava {
+    options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])
+}
+compileTestJava {
+    options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])
+}
+
+
+dependencies {
+    compileOnly "${group}:opensearch:${opensearch_version}"
+
+    testImplementation "junit:junit:${versions.junit}"
+    testImplementation "org.mockito:mockito-core:${versions.mockito}"
+    testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
+    testImplementation "net.bytebuddy:byte-buddy:${versions.bytebuddy}"
+    testImplementation "net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}"
+}
+
+licenseFile = "LICENSE.txt"
+noticeFile = "NOTICE.txt"
+
+spotless {
+    java {
+        removeUnusedImports()
+        importOrder 'java', 'javax', 'org', 'com'
+        eclipse().configFile rootProject.file('formatterConfig.xml')
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+}
+
+publishing {
+    publications {
+        pluginZip(MavenPublication) { publication ->
+            pom {
+                name = "opensearch-geospatial-client"
+                description = 'OpenSearch Geospatial client'
+                licenses {
+                    license {
+                        name = "The Apache License, Version 2.0"
+                        url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+                    }
+                }
+                developers {
+                    developer {
+                        name = "OpenSearch"
+                        url = "https://github.com/opensearch-project/geospatial"
+                    }
+                }
+            }
+        }
+    }
+}
+
+
diff --git a/client/lombok.config b/client/lombok.config
@@ -0,0 +1,5 @@
+# tell lombok this is your root directory
+config.stopBubbling = true
+# add @lombok.Generated annotations to all generated nodes where possible
+# to skip code coverage for auto generated code
+lombok.addLombokGeneratedAnnotation = true
diff --git a/client/src/main/java/org/opensearch/geospatial/action/IpEnrichmentAction.java b/client/src/main/java/org/opensearch/geospatial/action/IpEnrichmentAction.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.geospatial.action;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.core.action.ActionResponse;
+
+/**
+ * An ActionType registered on OpenSearch registry, for inter-cluster transportAction call,
+ * to resolve GeoLocation for IP String.
+ */
+public class IpEnrichmentAction extends ActionType<ActionResponse> {
+
+    public static final IpEnrichmentAction INSTANCE = new IpEnrichmentAction();
+
+    public static final String NAME = "cluster:admin/geospatial/ipenrichment/get";
+
+    public IpEnrichmentAction() {
+        super(NAME, IpEnrichmentResponse::new);
+    }
+}
diff --git a/client/src/main/java/org/opensearch/geospatial/action/IpEnrichmentActionClient.java b/client/src/main/java/org/opensearch/geospatial/action/IpEnrichmentActionClient.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.geospatial.action;
+
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.core.action.ActionResponse;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+
+/**
+ * Facade to provide GeoLocation enrichment for other plugins.
+ */
+@Log4j2
+@AllArgsConstructor
+public class IpEnrichmentActionClient {
+
+    final private NodeClient nodeClient;
+
+    /**
+     * Client facing method, which read an IP in String form and return a map instance which contain the associated GeoLocation data.
+     * @param ipString IP v4 || v6 address in String form.
+     * @param datasourceName datasourceName in String form.
+     * @return A map instance which contain GeoLocation data for the given Ip address.
+     */
+    public Map<String, Object> getGeoLocationData(String ipString, String datasourceName) throws ExecutionException, InterruptedException {
+        // Composite the request object.
+        ActionFuture<ActionResponse> responseActionFuture = nodeClient.execute(
+            IpEnrichmentAction.INSTANCE,
+            new IpEnrichmentRequest(ipString, datasourceName)
+        );
+        // Send out the request and process the response.
+        ActionResponse genericActionResponse = responseActionFuture.get();
+        IpEnrichmentResponse enrichmentResponse = IpEnrichmentResponse.fromActionResponse(genericActionResponse);
+        return enrichmentResponse.getGeoLocationData();
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		OpenSearch (https://opensearch.org)
		Copyright OpenSearch Contributors