refactoring

Erudika · Dec 20, 2021 · 8f1acd3 · 8f1acd3
1 parent fff2b9b
commit 8f1acd3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>com.erudika</groupId>
 			<artifactId>para-core</artifactId>
-			<version>1.42.1</version>
+			<version>1.42.2</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/src/main/java/com/erudika/para/server/search/LuceneSearch.java b/src/main/java/com/erudika/para/server/search/LuceneSearch.java
@@ -22,17 +22,17 @@
 import com.erudika.para.core.Tag;
 import com.erudika.para.core.utils.CoreUtils;
 import com.erudika.para.core.utils.ParaObjectUtils;
-import com.erudika.para.persistence.DAO;
-import com.erudika.para.search.Search;
+import com.erudika.para.core.persistence.DAO;
+import com.erudika.para.core.search.Search;
 import static com.erudika.para.server.search.LuceneUtils.count;
 import static com.erudika.para.server.search.LuceneUtils.getTermsQuery;
 import static com.erudika.para.server.search.LuceneUtils.indexDocuments;
 import static com.erudika.para.server.search.LuceneUtils.paraObjectToDocument;
 import static com.erudika.para.server.search.LuceneUtils.searchGeoQuery;
 import static com.erudika.para.server.search.LuceneUtils.unindexDocuments;
-import com.erudika.para.utils.Config;
-import com.erudika.para.utils.Pager;
-import com.erudika.para.utils.Utils;
+import com.erudika.para.core.utils.Config;
+import com.erudika.para.core.utils.Pager;
+import com.erudika.para.core.utils.Utils;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/src/main/java/com/erudika/para/server/search/LuceneUtils.java b/src/main/java/com/erudika/para/server/search/LuceneUtils.java
@@ -17,17 +17,17 @@
  */
 package com.erudika.para.server.search;
 
-import com.erudika.para.DestroyListener;
-import com.erudika.para.Para;
+import com.erudika.para.core.listeners.DestroyListener;
+import com.erudika.para.core.utils.Para;
 import com.erudika.para.core.Address;
 import com.erudika.para.core.App;
 import com.erudika.para.core.ParaObject;
 import com.erudika.para.core.utils.ParaObjectUtils;
-import com.erudika.para.persistence.DAO;
-import com.erudika.para.utils.Config;
-import static com.erudika.para.utils.Config.DEFAULT_LIMIT;
-import com.erudika.para.utils.Pager;
-import com.erudika.para.utils.Utils;
+import com.erudika.para.core.persistence.DAO;
+import com.erudika.para.core.utils.Config;
+import static com.erudika.para.core.utils.Config.DEFAULT_LIMIT;
+import com.erudika.para.core.utils.Pager;
+import com.erudika.para.core.utils.Utils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import java.io.IOException;

diff --git a/src/test/java/com/erudika/para/server/search/LuceneSearchIT.java b/src/test/java/com/erudika/para/server/search/LuceneSearchIT.java
@@ -17,12 +17,11 @@
  */
 package com.erudika.para.server.search;
 
-import com.erudika.para.server.search.LuceneSearch;
 import com.erudika.para.core.ParaObject;
-import com.erudika.para.persistence.DAO;
+import com.erudika.para.core.persistence.DAO;
 import static com.erudika.para.server.search.SearchTest.u;
-import com.erudika.para.utils.Config;
-import com.erudika.para.utils.Pager;
+import com.erudika.para.core.utils.Config;
+import com.erudika.para.core.utils.Pager;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/src/test/java/com/erudika/para/server/search/SearchTest.java b/src/test/java/com/erudika/para/server/search/SearchTest.java
@@ -25,10 +25,10 @@
 import com.erudika.para.core.Sysprop;
 import com.erudika.para.core.Tag;
 import com.erudika.para.core.User;
-import com.erudika.para.search.Search;
-import com.erudika.para.utils.Config;
-import com.erudika.para.utils.Pager;
-import com.erudika.para.utils.Utils;
+import com.erudika.para.core.search.Search;
+import com.erudika.para.core.utils.Config;
+import com.erudika.para.core.utils.Pager;
+import com.erudika.para.core.utils.Utils;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;