From f2ae66ee0461b4f0f214740b607ed7e50066c238 Mon Sep 17 00:00:00 2001 From: jzonthemtn Date: Fri, 23 Feb 2024 17:13:30 -0500 Subject: [PATCH] #63 Renaming to UBI. --- Dockerfile | 4 ++-- README.md | 10 ++++------ build.gradle | 14 ++++++------- docker-compose.yaml | 2 +- settings.gradle | 2 +- .../{ubl => ubi}/HeaderConstants.java | 10 +++++----- .../{ubl => ubi}/SettingsConstants.java | 6 +++--- .../UserBehaviorInsightsPlugin.java} | 20 +++++++++---------- .../UserBehaviorInsightsActionFilter.java} | 18 ++++++++--------- .../UserBehaviorInsightsRestHandler.java} | 18 ++++++++--------- .../{ubl => ubi}/backends/Backend.java | 7 +++---- .../backends/OpenSearchBackend.java | 12 +++++------ .../events/AbstractEventManager.java | 7 +++---- .../opensearch/{ubl => ubi}/events/Event.java | 2 +- .../events/OpenSearchEventManager.java | 2 +- .../events/queues/EventQueue.java | 5 ++--- .../events/queues/InternalQueue.java | 4 ++-- .../{ubl => ubi}/model/QueryRequest.java | 2 +- .../{ubl => ubi}/model/QueryResponse.java | 2 +- .../{ubl => ubi}/backends/events-mapping.json | 0 .../backends/queries-mapping.json | 0 .../api/_plugins.search_relevance.json | 2 +- .../_plugins.search_relevance/10_basic.yml | 2 +- 23 files changed, 73 insertions(+), 78 deletions(-) rename src/main/java/org/opensearch/{ubl => ubi}/HeaderConstants.java (72%) rename src/main/java/org/opensearch/{ubl => ubi}/SettingsConstants.java (62%) rename src/main/java/org/opensearch/{ubl/UserBehaviorLoggingPlugin.java => ubi/UserBehaviorInsightsPlugin.java} (88%) rename src/main/java/org/opensearch/{ubl/action/UserBehaviorLoggingActionFilter.java => ubi/action/UserBehaviorInsightsActionFilter.java} (90%) rename src/main/java/org/opensearch/{ubl/action/UserBehaviorLoggingRestHandler.java => ubi/action/UserBehaviorInsightsRestHandler.java} (84%) rename src/main/java/org/opensearch/{ubl => ubi}/backends/Backend.java (76%) rename src/main/java/org/opensearch/{ubl => ubi}/backends/OpenSearchBackend.java (95%) rename src/main/java/org/opensearch/{ubl => ubi}/events/AbstractEventManager.java (76%) rename src/main/java/org/opensearch/{ubl => ubi}/events/Event.java (94%) rename src/main/java/org/opensearch/{ubl => ubi}/events/OpenSearchEventManager.java (98%) rename src/main/java/org/opensearch/{ubl => ubi}/events/queues/EventQueue.java (72%) rename src/main/java/org/opensearch/{ubl => ubi}/events/queues/InternalQueue.java (89%) rename src/main/java/org/opensearch/{ubl => ubi}/model/QueryRequest.java (96%) rename src/main/java/org/opensearch/{ubl => ubi}/model/QueryResponse.java (96%) rename src/main/resources/org/opensearch/{ubl => ubi}/backends/events-mapping.json (100%) rename src/main/resources/org/opensearch/{ubl => ubi}/backends/queries-mapping.json (100%) diff --git a/Dockerfile b/Dockerfile index 5c40d67..4908aca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM opensearchproject/opensearch:2.11.1 -COPY ./build/distributions/opensearch-ubl.zip /tmp/ +COPY ./build/distributions/opensearch-ubi.zip /tmp/ -RUN /usr/share/opensearch/bin/opensearch-plugin install file:/tmp/opensearch-ubl.zip +RUN /usr/share/opensearch/bin/opensearch-plugin install file:/tmp/opensearch-ubi.zip diff --git a/README.md b/README.md index cdcd072..01c2a61 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# OpenSearch User Behavior Logging - -This project is getting a new name! See the voting - https://forum.opensearch.org/t/vote-user-behavior-logging-and-insights/17838 +# OpenSearch User Behavior Insights OpenSearch RFC - https://github.com/opensearch-project/OpenSearch/issues/12084 @@ -23,13 +21,13 @@ Start the containers: Initialize the `awesome` search relevance index: ``` -curl -X PUT http://localhost:9200/_plugins/ubl/awesome +curl -X PUT http://localhost:9200/_plugins/ubi/awesome ``` Send an event to the `awesome` store: ``` -curl -X POST http://localhost:9200/_plugins/ubl/awesome -H "Content-Type: application/json" -d @./scripts/instant-search.json +curl -X POST http://localhost:9200/_plugins/ubi/awesome -H "Content-Type: application/json" -d @./scripts/instant-search.json ``` Get events: @@ -51,5 +49,5 @@ curl -s http://localhost:9200/.awesome_queries/_search -H "X-ubi-store: awesome" Delete the store: ``` -curl -X DELETE http://localhost:9200/_plugins/ubl/awesome +curl -X DELETE http://localhost:9200/_plugins/ubi/awesome ``` \ No newline at end of file diff --git a/build.gradle b/build.gradle index 955a601..6020cd8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ apply plugin: 'opensearch.yaml-rest-test' apply plugin: 'maven-publish' opensearchplugin { - name 'opensearch-ubl' - description 'OpenSearch User Behavior Logging Plugin' - classname 'org.opensearch.ubl.UserBehaviorLoggingPlugin' + name 'opensearch-ubi' + description 'OpenSearch User Behavior Insights Plugin' + classname 'org.opensearch.ubi.UserBehaviorInsightsPlugin' licenseFile rootProject.file('LICENSE.txt') noticeFile rootProject.file('NOTICE.txt') } @@ -44,7 +44,7 @@ publishing { repositories { maven { name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/o19s/opensearch-ubl") + url = uri("https://maven.pkg.github.com/o19s/opensearch-ubi") credentials { username = System.getenv("GITHUB_ACTOR") password = System.getenv("GITHUB_TOKEN") @@ -54,8 +54,8 @@ publishing { publications { pluginZip(MavenPublication) { publication -> pom { - name = "opensearch-ubl" - description = "Provides User Behavior Logging for OpenSearch" + name = "opensearch-ubi" + description = "Provides User Behavior Insights for OpenSearch" groupId = "org.opensearch" licenses { license { @@ -66,7 +66,7 @@ publishing { developers { developer { name = "OpenSearch" - url = "https://github.com/o19s/opensearch-ubl" + url = "https://github.com/o19s/opensearch-ubi" } } } diff --git a/docker-compose.yaml b/docker-compose.yaml index 00d51a4..1bb22d0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,7 +16,7 @@ services: http.cors.allow-methods: OPTIONS,HEAD,GET,POST,PUT,DELETE http.cors.allow-credentials: true http.cors.allow-headers: X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization - plugins.ubl.indices: "awesome" + plugins.ubi.indices: "awesome" logger.level: info ulimits: memlock: diff --git a/settings.gradle b/settings.gradle index 6919fa6..c904fd9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,4 +7,4 @@ * in the user manual at https://docs.gradle.org/6.5.1/userguide/multi_project_builds.html */ -rootProject.name = 'user-behavior-logging-plugin' +rootProject.name = 'user-behavior-insights-plugin' diff --git a/src/main/java/org/opensearch/ubl/HeaderConstants.java b/src/main/java/org/opensearch/ubi/HeaderConstants.java similarity index 72% rename from src/main/java/org/opensearch/ubl/HeaderConstants.java rename to src/main/java/org/opensearch/ubi/HeaderConstants.java index ba41e6f..e8b7d03 100644 --- a/src/main/java/org/opensearch/ubl/HeaderConstants.java +++ b/src/main/java/org/opensearch/ubi/HeaderConstants.java @@ -6,14 +6,14 @@ * compatible open source license. */ -package org.opensearch.ubl; +package org.opensearch.ubi; public enum HeaderConstants { - QUERY_ID_HEADER("X-ubl-query-id"), - EVENT_STORE_HEADER("X-ubl-store"), - USER_ID_HEADER("X-ubl-user-id"), - SESSION_ID_HEADER("X-ubl-session-id"); + QUERY_ID_HEADER("X-ubi-query-id"), + EVENT_STORE_HEADER("X-ubi-store"), + USER_ID_HEADER("X-ubi-user-id"), + SESSION_ID_HEADER("X-ubi-session-id"); private final String header; diff --git a/src/main/java/org/opensearch/ubl/SettingsConstants.java b/src/main/java/org/opensearch/ubi/SettingsConstants.java similarity index 62% rename from src/main/java/org/opensearch/ubl/SettingsConstants.java rename to src/main/java/org/opensearch/ubi/SettingsConstants.java index a8794b5..d4811e9 100644 --- a/src/main/java/org/opensearch/ubl/SettingsConstants.java +++ b/src/main/java/org/opensearch/ubi/SettingsConstants.java @@ -6,11 +6,11 @@ * compatible open source license. */ -package org.opensearch.ubl; +package org.opensearch.ubi; public class SettingsConstants { - public static final String INDEX_NAMES = "plugins.ubl.indices"; - public static final String VERSION_SETTING = "index.ublstore.version"; + public static final String INDEX_NAMES = "plugins.ubi.indices"; + public static final String VERSION_SETTING = "index.ubistore.version"; } diff --git a/src/main/java/org/opensearch/ubl/UserBehaviorLoggingPlugin.java b/src/main/java/org/opensearch/ubi/UserBehaviorInsightsPlugin.java similarity index 88% rename from src/main/java/org/opensearch/ubl/UserBehaviorLoggingPlugin.java rename to src/main/java/org/opensearch/ubi/UserBehaviorInsightsPlugin.java index 81aaf85..1f5744c 100644 --- a/src/main/java/org/opensearch/ubl/UserBehaviorLoggingPlugin.java +++ b/src/main/java/org/opensearch/ubi/UserBehaviorInsightsPlugin.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl; +package org.opensearch.ubi; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,11 +28,11 @@ import org.opensearch.rest.RestHeaderDefinition; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; -import org.opensearch.ubl.action.UserBehaviorLoggingActionFilter; -import org.opensearch.ubl.action.UserBehaviorLoggingRestHandler; -import org.opensearch.ubl.backends.Backend; -import org.opensearch.ubl.backends.OpenSearchBackend; -import org.opensearch.ubl.events.OpenSearchEventManager; +import org.opensearch.ubi.action.UserBehaviorInsightsActionFilter; +import org.opensearch.ubi.action.UserBehaviorInsightsRestHandler; +import org.opensearch.ubi.backends.Backend; +import org.opensearch.ubi.backends.OpenSearchBackend; +import org.opensearch.ubi.events.OpenSearchEventManager; import org.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; @@ -44,9 +44,9 @@ import static java.util.Collections.singletonList; -public class UserBehaviorLoggingPlugin extends Plugin implements ActionPlugin { +public class UserBehaviorInsightsPlugin extends Plugin implements ActionPlugin { - private static final Logger LOGGER = LogManager.getLogger(UserBehaviorLoggingPlugin.class); + private static final Logger LOGGER = LogManager.getLogger(UserBehaviorInsightsPlugin.class); private Backend backend; private ActionFilter userBehaviorLoggingFilter; @@ -80,7 +80,7 @@ public List getRestHandlers(final Settings settings, final IndexNameExpressionResolver indexNameExpressionResolver, final Supplier nodesInCluster) { - return singletonList(new UserBehaviorLoggingRestHandler(backend)); + return singletonList(new UserBehaviorInsightsRestHandler(backend)); } @@ -119,7 +119,7 @@ public Collection createComponents( ) { this.backend = new OpenSearchBackend(client); - this.userBehaviorLoggingFilter = new UserBehaviorLoggingActionFilter(backend, environment.settings(), threadPool); + this.userBehaviorLoggingFilter = new UserBehaviorInsightsActionFilter(backend, environment.settings(), threadPool); LOGGER.info("Creating scheduled task"); diff --git a/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingActionFilter.java b/src/main/java/org/opensearch/ubi/action/UserBehaviorInsightsActionFilter.java similarity index 90% rename from src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingActionFilter.java rename to src/main/java/org/opensearch/ubi/action/UserBehaviorInsightsActionFilter.java index 41e30fa..e6f7084 100644 --- a/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingActionFilter.java +++ b/src/main/java/org/opensearch/ubi/action/UserBehaviorInsightsActionFilter.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl.action; +package org.opensearch.ubi.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -20,24 +20,24 @@ import org.opensearch.core.action.ActionResponse; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; -import org.opensearch.ubl.HeaderConstants; -import org.opensearch.ubl.backends.Backend; -import org.opensearch.ubl.model.QueryRequest; -import org.opensearch.ubl.model.QueryResponse; +import org.opensearch.ubi.HeaderConstants; +import org.opensearch.ubi.backends.Backend; +import org.opensearch.ubi.model.QueryRequest; +import org.opensearch.ubi.model.QueryResponse; import java.util.LinkedList; import java.util.List; import java.util.UUID; -public class UserBehaviorLoggingActionFilter implements ActionFilter { +public class UserBehaviorInsightsActionFilter implements ActionFilter { - private static final Logger LOGGER = LogManager.getLogger(UserBehaviorLoggingActionFilter.class); + private static final Logger LOGGER = LogManager.getLogger(UserBehaviorInsightsActionFilter.class); private final Backend backend; private final Settings settings; private final ThreadPool threadPool; - public UserBehaviorLoggingActionFilter(final Backend backend, final Settings settings, ThreadPool threadPool) { + public UserBehaviorInsightsActionFilter(final Backend backend, final Settings settings, ThreadPool threadPool) { this.backend = backend; this.settings = settings; this.threadPool = threadPool; @@ -111,7 +111,7 @@ public void onResponse(Response response) { //} final long elapsedTime = System.currentTimeMillis() - startTime; - LOGGER.info("UBL search request filter took {} ms", elapsedTime); + LOGGER.info("UBI search request filter took {} ms", elapsedTime); } diff --git a/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingRestHandler.java b/src/main/java/org/opensearch/ubi/action/UserBehaviorInsightsRestHandler.java similarity index 84% rename from src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingRestHandler.java rename to src/main/java/org/opensearch/ubi/action/UserBehaviorInsightsRestHandler.java index 7cc3036..44c0af0 100644 --- a/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingRestHandler.java +++ b/src/main/java/org/opensearch/ubi/action/UserBehaviorInsightsRestHandler.java @@ -6,14 +6,14 @@ * compatible open source license. */ -package org.opensearch.ubl.action; +package org.opensearch.ubi.action; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.client.node.NodeClient; import org.opensearch.core.rest.RestStatus; -import org.opensearch.ubl.backends.Backend; +import org.opensearch.ubi.backends.Backend; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; @@ -22,13 +22,13 @@ import static org.opensearch.rest.RestRequest.Method.*; -public class UserBehaviorLoggingRestHandler extends BaseRestHandler { +public class UserBehaviorInsightsRestHandler extends BaseRestHandler { - private static final Logger LOGGER = LogManager.getLogger(UserBehaviorLoggingRestHandler.class); + private static final Logger LOGGER = LogManager.getLogger(UserBehaviorInsightsRestHandler.class); private final Backend backend; - public UserBehaviorLoggingRestHandler(final Backend backend) { + public UserBehaviorInsightsRestHandler(final Backend backend) { this.backend = backend; } @@ -40,10 +40,10 @@ public String getName() { @Override public List routes() { return List.of( - new Route(PUT, "/_plugins/ubl/{store}"), // Initializes the store. - new Route(DELETE, "/_plugins/ubl/{store}"), // Deletes a store. - new Route(GET, "/_plugins/ubl"), // Lists all stores - new Route(POST, "/_plugins/ubl/{store}")); // Indexes events into the store. + new Route(PUT, "/_plugins/ubi/{store}"), // Initializes the store. + new Route(DELETE, "/_plugins/ubi/{store}"), // Deletes a store. + new Route(GET, "/_plugins/ubi"), // Lists all stores + new Route(POST, "/_plugins/ubi/{store}")); // Indexes events into the store. } @Override diff --git a/src/main/java/org/opensearch/ubl/backends/Backend.java b/src/main/java/org/opensearch/ubi/backends/Backend.java similarity index 76% rename from src/main/java/org/opensearch/ubl/backends/Backend.java rename to src/main/java/org/opensearch/ubi/backends/Backend.java index ac3639e..18c66c4 100644 --- a/src/main/java/org/opensearch/ubl/backends/Backend.java +++ b/src/main/java/org/opensearch/ubi/backends/Backend.java @@ -6,11 +6,10 @@ * compatible open source license. */ -package org.opensearch.ubl.backends; +package org.opensearch.ubi.backends; -import org.opensearch.ubl.model.QueryResponse; -import org.opensearch.ubl.model.QueryRequest; -import org.opensearch.rest.RestChannel; +import org.opensearch.ubi.model.QueryResponse; +import org.opensearch.ubi.model.QueryRequest; import java.util.List; diff --git a/src/main/java/org/opensearch/ubl/backends/OpenSearchBackend.java b/src/main/java/org/opensearch/ubi/backends/OpenSearchBackend.java similarity index 95% rename from src/main/java/org/opensearch/ubl/backends/OpenSearchBackend.java rename to src/main/java/org/opensearch/ubi/backends/OpenSearchBackend.java index 1fba79d..845ef8a 100644 --- a/src/main/java/org/opensearch/ubl/backends/OpenSearchBackend.java +++ b/src/main/java/org/opensearch/ubi/backends/OpenSearchBackend.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl.backends; +package org.opensearch.ubi.backends; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,11 +18,11 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.io.Streams; import org.opensearch.common.xcontent.XContentType; -import org.opensearch.ubl.SettingsConstants; -import org.opensearch.ubl.events.Event; -import org.opensearch.ubl.events.OpenSearchEventManager; -import org.opensearch.ubl.model.QueryRequest; -import org.opensearch.ubl.model.QueryResponse; +import org.opensearch.ubi.SettingsConstants; +import org.opensearch.ubi.events.Event; +import org.opensearch.ubi.events.OpenSearchEventManager; +import org.opensearch.ubi.model.QueryRequest; +import org.opensearch.ubi.model.QueryResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/opensearch/ubl/events/AbstractEventManager.java b/src/main/java/org/opensearch/ubi/events/AbstractEventManager.java similarity index 76% rename from src/main/java/org/opensearch/ubl/events/AbstractEventManager.java rename to src/main/java/org/opensearch/ubi/events/AbstractEventManager.java index 88f8093..89164f2 100644 --- a/src/main/java/org/opensearch/ubl/events/AbstractEventManager.java +++ b/src/main/java/org/opensearch/ubi/events/AbstractEventManager.java @@ -6,13 +6,12 @@ * compatible open source license. */ -package org.opensearch.ubl.events; +package org.opensearch.ubi.events; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.index.IndexRequest; -import org.opensearch.ubl.events.queues.EventQueue; -import org.opensearch.ubl.events.queues.InternalQueue; +import org.opensearch.ubi.events.queues.EventQueue; +import org.opensearch.ubi.events.queues.InternalQueue; public abstract class AbstractEventManager { diff --git a/src/main/java/org/opensearch/ubl/events/Event.java b/src/main/java/org/opensearch/ubi/events/Event.java similarity index 94% rename from src/main/java/org/opensearch/ubl/events/Event.java rename to src/main/java/org/opensearch/ubi/events/Event.java index 4f38e65..56fff82 100644 --- a/src/main/java/org/opensearch/ubl/events/Event.java +++ b/src/main/java/org/opensearch/ubi/events/Event.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl.events; +package org.opensearch.ubi.events; public class Event { diff --git a/src/main/java/org/opensearch/ubl/events/OpenSearchEventManager.java b/src/main/java/org/opensearch/ubi/events/OpenSearchEventManager.java similarity index 98% rename from src/main/java/org/opensearch/ubl/events/OpenSearchEventManager.java rename to src/main/java/org/opensearch/ubi/events/OpenSearchEventManager.java index 80a71ef..97b51d8 100644 --- a/src/main/java/org/opensearch/ubl/events/OpenSearchEventManager.java +++ b/src/main/java/org/opensearch/ubi/events/OpenSearchEventManager.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl.events; +package org.opensearch.ubi.events; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/opensearch/ubl/events/queues/EventQueue.java b/src/main/java/org/opensearch/ubi/events/queues/EventQueue.java similarity index 72% rename from src/main/java/org/opensearch/ubl/events/queues/EventQueue.java rename to src/main/java/org/opensearch/ubi/events/queues/EventQueue.java index 31afec3..e26fa7f 100644 --- a/src/main/java/org/opensearch/ubl/events/queues/EventQueue.java +++ b/src/main/java/org/opensearch/ubi/events/queues/EventQueue.java @@ -6,10 +6,9 @@ * compatible open source license. */ -package org.opensearch.ubl.events.queues; +package org.opensearch.ubi.events.queues; -import org.opensearch.action.index.IndexRequest; -import org.opensearch.ubl.events.Event; +import org.opensearch.ubi.events.Event; import java.util.List; diff --git a/src/main/java/org/opensearch/ubl/events/queues/InternalQueue.java b/src/main/java/org/opensearch/ubi/events/queues/InternalQueue.java similarity index 89% rename from src/main/java/org/opensearch/ubl/events/queues/InternalQueue.java rename to src/main/java/org/opensearch/ubi/events/queues/InternalQueue.java index 4266b78..62a8a45 100644 --- a/src/main/java/org/opensearch/ubl/events/queues/InternalQueue.java +++ b/src/main/java/org/opensearch/ubi/events/queues/InternalQueue.java @@ -6,9 +6,9 @@ * compatible open source license. */ -package org.opensearch.ubl.events.queues; +package org.opensearch.ubi.events.queues; -import org.opensearch.ubl.events.Event; +import org.opensearch.ubi.events.Event; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/org/opensearch/ubl/model/QueryRequest.java b/src/main/java/org/opensearch/ubi/model/QueryRequest.java similarity index 96% rename from src/main/java/org/opensearch/ubl/model/QueryRequest.java rename to src/main/java/org/opensearch/ubi/model/QueryRequest.java index 7cd8f61..3b89b05 100644 --- a/src/main/java/org/opensearch/ubl/model/QueryRequest.java +++ b/src/main/java/org/opensearch/ubi/model/QueryRequest.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl.model; +package org.opensearch.ubi.model; public class QueryRequest { diff --git a/src/main/java/org/opensearch/ubl/model/QueryResponse.java b/src/main/java/org/opensearch/ubi/model/QueryResponse.java similarity index 96% rename from src/main/java/org/opensearch/ubl/model/QueryResponse.java rename to src/main/java/org/opensearch/ubi/model/QueryResponse.java index 3d47639..4fe2bc6 100644 --- a/src/main/java/org/opensearch/ubl/model/QueryResponse.java +++ b/src/main/java/org/opensearch/ubi/model/QueryResponse.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.ubl.model; +package org.opensearch.ubi.model; import java.util.List; diff --git a/src/main/resources/org/opensearch/ubl/backends/events-mapping.json b/src/main/resources/org/opensearch/ubi/backends/events-mapping.json similarity index 100% rename from src/main/resources/org/opensearch/ubl/backends/events-mapping.json rename to src/main/resources/org/opensearch/ubi/backends/events-mapping.json diff --git a/src/main/resources/org/opensearch/ubl/backends/queries-mapping.json b/src/main/resources/org/opensearch/ubi/backends/queries-mapping.json similarity index 100% rename from src/main/resources/org/opensearch/ubl/backends/queries-mapping.json rename to src/main/resources/org/opensearch/ubi/backends/queries-mapping.json diff --git a/src/yamlRestTest/resources/rest-api-spec/api/_plugins.search_relevance.json b/src/yamlRestTest/resources/rest-api-spec/api/_plugins.search_relevance.json index d449fa5..757b7c3 100644 --- a/src/yamlRestTest/resources/rest-api-spec/api/_plugins.search_relevance.json +++ b/src/yamlRestTest/resources/rest-api-spec/api/_plugins.search_relevance.json @@ -4,7 +4,7 @@ "url": { "paths": [ { - "path": "/_plugins/ubl", + "path": "/_plugins/ubi", "methods": [ "DELETE", "GET", diff --git a/src/yamlRestTest/resources/rest-api-spec/test/_plugins.search_relevance/10_basic.yml b/src/yamlRestTest/resources/rest-api-spec/test/_plugins.search_relevance/10_basic.yml index 1a1f6bd..d72ef60 100644 --- a/src/yamlRestTest/resources/rest-api-spec/test/_plugins.search_relevance/10_basic.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/_plugins.search_relevance/10_basic.yml @@ -5,4 +5,4 @@ h: component - match: - $body: /^opensearch-ubl\n$/ + $body: /^opensearch-ubi\n$/