From 651f7b2343adcffe3a2188abf049c7723ccf4f19 Mon Sep 17 00:00:00 2001 From: jzonthemtn Date: Thu, 15 Feb 2024 11:14:02 -0500 Subject: [PATCH] Moving into an ubl package. --- build.gradle | 2 +- .../org/opensearch/{ => ubl}/SettingsConstants.java | 2 +- .../{ => ubl}/UserBehaviorLoggingPlugin.java | 12 ++++++------ .../action/UserBehaviorLoggingRestHandler.java | 4 ++-- .../action/UserBehaviorLoggingSearchFilter.java | 9 +++++---- .../org/opensearch/{ => ubl}/backends/Backend.java | 6 +++--- .../{ => ubl}/backends/OpenSearchBackend.java | 10 +++++----- .../opensearch/{ => ubl}/events/EventManager.java | 6 +++--- .../{ => ubl}/events/queues/EventQueue.java | 2 +- .../{ => ubl}/events/queues/InternalQueue.java | 2 +- .../org/opensearch/{ => ubl}/model/QueryRequest.java | 2 +- .../opensearch/{ => ubl}/model/QueryResponse.java | 2 +- 12 files changed, 30 insertions(+), 29 deletions(-) rename src/main/java/org/opensearch/{ => ubl}/SettingsConstants.java (93%) rename src/main/java/org/opensearch/{ => ubl}/UserBehaviorLoggingPlugin.java (93%) rename src/main/java/org/opensearch/{ => ubl}/action/UserBehaviorLoggingRestHandler.java (97%) rename src/main/java/org/opensearch/{ => ubl}/action/UserBehaviorLoggingSearchFilter.java (94%) rename src/main/java/org/opensearch/{ => ubl}/backends/Backend.java (82%) rename src/main/java/org/opensearch/{ => ubl}/backends/OpenSearchBackend.java (96%) rename src/main/java/org/opensearch/{ => ubl}/events/EventManager.java (91%) rename src/main/java/org/opensearch/{ => ubl}/events/queues/EventQueue.java (90%) rename src/main/java/org/opensearch/{ => ubl}/events/queues/InternalQueue.java (95%) rename src/main/java/org/opensearch/{ => ubl}/model/QueryRequest.java (94%) rename src/main/java/org/opensearch/{ => ubl}/model/QueryResponse.java (96%) diff --git a/build.gradle b/build.gradle index a2700bd..7526364 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'opensearch.yaml-rest-test' opensearchplugin { name 'opensearch-ubl' description 'OpenSearch User Behavior Logging Plugin' - classname 'org.opensearch.UserBehaviorLoggingPlugin' + classname 'org.opensearch.ubl.UserBehaviorLoggingPlugin' licenseFile rootProject.file('LICENSE.txt') noticeFile rootProject.file('NOTICE.txt') } diff --git a/src/main/java/org/opensearch/SettingsConstants.java b/src/main/java/org/opensearch/ubl/SettingsConstants.java similarity index 93% rename from src/main/java/org/opensearch/SettingsConstants.java rename to src/main/java/org/opensearch/ubl/SettingsConstants.java index 2ddf200..a8794b5 100644 --- a/src/main/java/org/opensearch/SettingsConstants.java +++ b/src/main/java/org/opensearch/ubl/SettingsConstants.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch; +package org.opensearch.ubl; public class SettingsConstants { diff --git a/src/main/java/org/opensearch/UserBehaviorLoggingPlugin.java b/src/main/java/org/opensearch/ubl/UserBehaviorLoggingPlugin.java similarity index 93% rename from src/main/java/org/opensearch/UserBehaviorLoggingPlugin.java rename to src/main/java/org/opensearch/ubl/UserBehaviorLoggingPlugin.java index 07d7dfd..8ce2eb6 100644 --- a/src/main/java/org/opensearch/UserBehaviorLoggingPlugin.java +++ b/src/main/java/org/opensearch/ubl/UserBehaviorLoggingPlugin.java @@ -6,15 +6,15 @@ * compatible open source license. */ -package org.opensearch; +package org.opensearch.ubl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.UserBehaviorLoggingRestHandler; -import org.opensearch.action.UserBehaviorLoggingSearchFilter; +import org.opensearch.ubl.action.UserBehaviorLoggingRestHandler; +import org.opensearch.ubl.action.UserBehaviorLoggingSearchFilter; import org.opensearch.action.support.ActionFilter; -import org.opensearch.backends.Backend; -import org.opensearch.backends.OpenSearchBackend; +import org.opensearch.ubl.backends.Backend; +import org.opensearch.ubl.backends.OpenSearchBackend; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; @@ -24,7 +24,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; -import org.opensearch.events.EventManager; +import org.opensearch.ubl.events.EventManager; import org.opensearch.plugins.ActionPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; diff --git a/src/main/java/org/opensearch/action/UserBehaviorLoggingRestHandler.java b/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingRestHandler.java similarity index 97% rename from src/main/java/org/opensearch/action/UserBehaviorLoggingRestHandler.java rename to src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingRestHandler.java index 0894871..996c9dd 100644 --- a/src/main/java/org/opensearch/action/UserBehaviorLoggingRestHandler.java +++ b/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingRestHandler.java @@ -6,14 +6,14 @@ * compatible open source license. */ -package org.opensearch.action; +package org.opensearch.ubl.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.backends.Backend; +import org.opensearch.ubl.backends.Backend; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; diff --git a/src/main/java/org/opensearch/action/UserBehaviorLoggingSearchFilter.java b/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingSearchFilter.java similarity index 94% rename from src/main/java/org/opensearch/action/UserBehaviorLoggingSearchFilter.java rename to src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingSearchFilter.java index de12a09..a0776a0 100644 --- a/src/main/java/org/opensearch/action/UserBehaviorLoggingSearchFilter.java +++ b/src/main/java/org/opensearch/ubl/action/UserBehaviorLoggingSearchFilter.java @@ -6,10 +6,11 @@ * compatible open source license. */ -package org.opensearch.action; +package org.opensearch.ubl.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.action.ActionRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilter; @@ -17,9 +18,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; import org.opensearch.core.action.ActionResponse; -import org.opensearch.model.QueryResponse; -import org.opensearch.backends.Backend; -import org.opensearch.model.QueryRequest; +import org.opensearch.ubl.model.QueryResponse; +import org.opensearch.ubl.backends.Backend; +import org.opensearch.ubl.model.QueryRequest; import org.opensearch.tasks.Task; import java.util.*; diff --git a/src/main/java/org/opensearch/backends/Backend.java b/src/main/java/org/opensearch/ubl/backends/Backend.java similarity index 82% rename from src/main/java/org/opensearch/backends/Backend.java rename to src/main/java/org/opensearch/ubl/backends/Backend.java index b9d8ba2..553cecd 100644 --- a/src/main/java/org/opensearch/backends/Backend.java +++ b/src/main/java/org/opensearch/ubl/backends/Backend.java @@ -6,10 +6,10 @@ * compatible open source license. */ -package org.opensearch.backends; +package org.opensearch.ubl.backends; -import org.opensearch.model.QueryResponse; -import org.opensearch.model.QueryRequest; +import org.opensearch.ubl.model.QueryResponse; +import org.opensearch.ubl.model.QueryRequest; import org.opensearch.rest.RestChannel; import java.util.List; diff --git a/src/main/java/org/opensearch/backends/OpenSearchBackend.java b/src/main/java/org/opensearch/ubl/backends/OpenSearchBackend.java similarity index 96% rename from src/main/java/org/opensearch/backends/OpenSearchBackend.java rename to src/main/java/org/opensearch/ubl/backends/OpenSearchBackend.java index a9b11ea..84b1a90 100644 --- a/src/main/java/org/opensearch/backends/OpenSearchBackend.java +++ b/src/main/java/org/opensearch/ubl/backends/OpenSearchBackend.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.backends; +package org.opensearch.ubl.backends; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,10 +18,10 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.io.Streams; import org.opensearch.common.xcontent.XContentType; -import org.opensearch.events.EventManager; -import org.opensearch.model.QueryResponse; -import org.opensearch.SettingsConstants; -import org.opensearch.model.QueryRequest; +import org.opensearch.ubl.events.EventManager; +import org.opensearch.ubl.model.QueryResponse; +import org.opensearch.ubl.SettingsConstants; +import org.opensearch.ubl.model.QueryRequest; import org.opensearch.rest.RestChannel; import org.opensearch.rest.action.RestToXContentListener; diff --git a/src/main/java/org/opensearch/events/EventManager.java b/src/main/java/org/opensearch/ubl/events/EventManager.java similarity index 91% rename from src/main/java/org/opensearch/events/EventManager.java rename to src/main/java/org/opensearch/ubl/events/EventManager.java index 84b0a25..ec0cac8 100644 --- a/src/main/java/org/opensearch/events/EventManager.java +++ b/src/main/java/org/opensearch/ubl/events/EventManager.java @@ -6,15 +6,15 @@ * compatible open source license. */ -package org.opensearch.events; +package org.opensearch.ubl.events; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.client.Client; -import org.opensearch.events.queues.EventQueue; -import org.opensearch.events.queues.InternalQueue; +import org.opensearch.ubl.events.queues.EventQueue; +import org.opensearch.ubl.events.queues.InternalQueue; public class EventManager { diff --git a/src/main/java/org/opensearch/events/queues/EventQueue.java b/src/main/java/org/opensearch/ubl/events/queues/EventQueue.java similarity index 90% rename from src/main/java/org/opensearch/events/queues/EventQueue.java rename to src/main/java/org/opensearch/ubl/events/queues/EventQueue.java index 4f0101e..c66c571 100644 --- a/src/main/java/org/opensearch/events/queues/EventQueue.java +++ b/src/main/java/org/opensearch/ubl/events/queues/EventQueue.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.events.queues; +package org.opensearch.ubl.events.queues; import org.opensearch.action.index.IndexRequest; diff --git a/src/main/java/org/opensearch/events/queues/InternalQueue.java b/src/main/java/org/opensearch/ubl/events/queues/InternalQueue.java similarity index 95% rename from src/main/java/org/opensearch/events/queues/InternalQueue.java rename to src/main/java/org/opensearch/ubl/events/queues/InternalQueue.java index ff9a8b1..279be1c 100644 --- a/src/main/java/org/opensearch/events/queues/InternalQueue.java +++ b/src/main/java/org/opensearch/ubl/events/queues/InternalQueue.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.events.queues; +package org.opensearch.ubl.events.queues; import org.opensearch.action.index.IndexRequest; diff --git a/src/main/java/org/opensearch/model/QueryRequest.java b/src/main/java/org/opensearch/ubl/model/QueryRequest.java similarity index 94% rename from src/main/java/org/opensearch/model/QueryRequest.java rename to src/main/java/org/opensearch/ubl/model/QueryRequest.java index 0810fff..4eec975 100644 --- a/src/main/java/org/opensearch/model/QueryRequest.java +++ b/src/main/java/org/opensearch/ubl/model/QueryRequest.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.model; +package org.opensearch.ubl.model; public class QueryRequest { diff --git a/src/main/java/org/opensearch/model/QueryResponse.java b/src/main/java/org/opensearch/ubl/model/QueryResponse.java similarity index 96% rename from src/main/java/org/opensearch/model/QueryResponse.java rename to src/main/java/org/opensearch/ubl/model/QueryResponse.java index cfc9a1e..53c0c34 100644 --- a/src/main/java/org/opensearch/model/QueryResponse.java +++ b/src/main/java/org/opensearch/ubl/model/QueryResponse.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.model; +package org.opensearch.ubl.model; import java.util.List;