From d18fa514e3029f897fce2520f3ac401d37c2851d Mon Sep 17 00:00:00 2001
From: Alex Leigh <a@leigh-co.com>
Date: Sun, 10 Sep 2023 12:49:26 -0700
Subject: [PATCH] Refactoring EO packages into traditional sdk/engine/service
 pattern.

---
 .../src/main/java/lc/esp/eo/EODataSourceBinder.java            | 2 +-
 .../src/main/java/lc/esp/eo/sdk}/EOFilteringIterator.java      | 3 +--
 .../src/main/java/lc/esp/eo/sdk}/EOLoop.java                   | 3 +--
 .../app/src/main/java/lc/ris/android/ItemFragment.java         | 2 +-
 .../src/main/java/lc/ris/client/InventoryStore.java            | 2 +-
 .../src/main/java/lc/ris/client/MockInventoryStore.java        | 3 ++-
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename java/{lc-esp-eo-engine/src/main/java/lc/esp/eo/util => lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk}/EOFilteringIterator.java (97%)
 rename java/{lc-esp-eo-engine/src/main/java/lc/esp/eo => lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk}/EOLoop.java (99%)

diff --git a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java b/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java
index ba1e491cb..eb30dd94a 100644
--- a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java
+++ b/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
  * @since mk20
  */
 public class EODataSourceBinder {
-    private static final MechaLogger logger = MechaLoggerFactory.getLogger(EO.class);
+    private static final MechaLogger logger = MechaLoggerFactory.getLogger(EODataSourceBinder.class);
     private final HashMap<Integer, MariaDbDataSource> dataSources = new HashMap<>();
     private final long MAX_UINT32 = Integer.toUnsignedLong(-1);
     private final ShardMap shardMap = new ShardMap();
diff --git a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/util/EOFilteringIterator.java b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOFilteringIterator.java
similarity index 97%
rename from java/lc-esp-eo-engine/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
rename to java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOFilteringIterator.java
index a3da84496..bc3c66552 100644
--- a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
+++ b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOFilteringIterator.java
@@ -7,9 +7,8 @@
  * actual or intended publication of such source code.
  */
 
-package lc.esp.eo.util;
+package lc.esp.eo.sdk;
 
-import lc.esp.eo.EO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EOLoop.java b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOLoop.java
similarity index 99%
rename from java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EOLoop.java
rename to java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOLoop.java
index dfd01920f..d5deadeb5 100644
--- a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EOLoop.java
+++ b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOLoop.java
@@ -7,9 +7,8 @@
  * actual or intended publication of such source code.
  */
 
-package lc.esp.eo;
+package lc.esp.eo.sdk;
 
-import lc.esp.eo.util.EOFilteringIterator;
 import lc.mecha.log.MechaLogger;
 import lc.mecha.log.MechaLoggerFactory;
 
diff --git a/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java b/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java
index 88d79fbac..df639fa96 100644
--- a/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java
+++ b/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java
@@ -6,7 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import androidx.fragment.app.Fragment;
-import lc.eo.EO;
+import lc.esp.eo.sdk.EO;
 import lc.ris.client.RapidInventoryClient;
 
 ;
diff --git a/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java b/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java
index 4d4d8e7a8..07adbe4c9 100644
--- a/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java
+++ b/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java
@@ -1,6 +1,6 @@
 package lc.ris.client;
 
-import lc.esp.eo.EO;
+import lc.esp.eo.sdk.EO;
 
 /**
  * Classes implementing this interface provide access to a store of inventory information within the
diff --git a/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java b/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java
index bae8acc37..699f81c6e 100644
--- a/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java
+++ b/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java
@@ -1,6 +1,7 @@
 package lc.ris.client;
 
-import lc.esp.eo.EO;
+
+import lc.esp.eo.sdk.EO;
 
 /**
  * This implementation of {@link InventoryStore} is mocked to appear to work, for the purposes of testing
-- 
GitLab