Moving into an ubl package.

o19s · Feb 15, 2024 · 651f7b2 · 651f7b2
1 parent 395bb73
commit 651f7b2
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 29 deletions.
diff --git 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/...ava/org/opensearch/SettingsConstants.java → ...org/opensearch/ubl/SettingsConstants.java b/...ava/org/opensearch/SettingsConstants.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/...opensearch/UserBehaviorLoggingPlugin.java → ...search/ubl/UserBehaviorLoggingPlugin.java b/...opensearch/UserBehaviorLoggingPlugin.java → ...search/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/...ction/UserBehaviorLoggingRestHandler.java → ...ction/UserBehaviorLoggingRestHandler.java b/...ction/UserBehaviorLoggingRestHandler.java → ...ction/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/...tion/UserBehaviorLoggingSearchFilter.java → ...tion/UserBehaviorLoggingSearchFilter.java b/...tion/UserBehaviorLoggingSearchFilter.java → ...tion/UserBehaviorLoggingSearchFilter.java
@@ -6,20 +6,21 @@
  * 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;
 import org.opensearch.action.support.ActionFilterChain;
 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/...java/org/opensearch/backends/Backend.java → .../org/opensearch/ubl/backends/Backend.java b/...java/org/opensearch/backends/Backend.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/...pensearch/backends/OpenSearchBackend.java → ...earch/ubl/backends/OpenSearchBackend.java b/...pensearch/backends/OpenSearchBackend.java → ...earch/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/...a/org/opensearch/events/EventManager.java → ...g/opensearch/ubl/events/EventManager.java b/...a/org/opensearch/events/EventManager.java → ...g/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/.../opensearch/events/queues/EventQueue.java → ...nsearch/ubl/events/queues/EventQueue.java b/.../opensearch/events/queues/EventQueue.java → ...nsearch/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/...ensearch/events/queues/InternalQueue.java → ...arch/ubl/events/queues/InternalQueue.java b/...ensearch/events/queues/InternalQueue.java → ...arch/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/...va/org/opensearch/model/QueryRequest.java → ...rg/opensearch/ubl/model/QueryRequest.java b/...va/org/opensearch/model/QueryRequest.java → ...rg/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/...a/org/opensearch/model/QueryResponse.java → ...g/opensearch/ubl/model/QueryResponse.java b/...a/org/opensearch/model/QueryResponse.java → ...g/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;