From bff56ed58cd950d117a11e6a73e37de719b58b71 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 11 Mar 2024 08:15:43 +0000
Subject: [PATCH] Move charsetter classes

---
 app/src/main/java/io/xpipe/app/util/DialogHelper.java         | 4 ++--
 core/src/main/java/io/xpipe/core/dialog/QueryConverter.java   | 4 ++--
 core/src/main/java/io/xpipe/core/process/ShellDialect.java    | 4 ++--
 .../java/io/xpipe/core/store/KnownFormatStreamDataStore.java  | 4 ++--
 core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java  | 2 --
 core/src/main/java/io/xpipe/core/util/Deobfuscator.java       | 1 -
 .../main/java/io/xpipe/core/{charsetter => util}/NewLine.java | 2 +-
 .../io/xpipe/core/{charsetter => util}/StreamCharset.java     | 3 +--
 core/src/main/java/module-info.java                           | 1 -
 9 files changed, 10 insertions(+), 15 deletions(-)
 rename core/src/main/java/io/xpipe/core/{charsetter => util}/NewLine.java (96%)
 rename core/src/main/java/io/xpipe/core/{charsetter => util}/StreamCharset.java (98%)

diff --git a/app/src/main/java/io/xpipe/app/util/DialogHelper.java b/app/src/main/java/io/xpipe/app/util/DialogHelper.java
index 9ca512c1..ccb3aa6c 100644
--- a/app/src/main/java/io/xpipe/app/util/DialogHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/DialogHelper.java
@@ -1,8 +1,8 @@
 package io.xpipe.app.util;
 
 import io.xpipe.app.storage.DataStorage;
-import io.xpipe.core.charsetter.NewLine;
-import io.xpipe.core.charsetter.StreamCharset;
+import io.xpipe.core.util.NewLine;
+import io.xpipe.core.util.StreamCharset;
 import io.xpipe.core.dialog.Dialog;
 import io.xpipe.core.dialog.QueryConverter;
 import io.xpipe.core.store.*;
diff --git a/core/src/main/java/io/xpipe/core/dialog/QueryConverter.java b/core/src/main/java/io/xpipe/core/dialog/QueryConverter.java
index f41c77cd..6a069c44 100644
--- a/core/src/main/java/io/xpipe/core/dialog/QueryConverter.java
+++ b/core/src/main/java/io/xpipe/core/dialog/QueryConverter.java
@@ -1,7 +1,7 @@
 package io.xpipe.core.dialog;
 
-import io.xpipe.core.charsetter.NewLine;
-import io.xpipe.core.charsetter.StreamCharset;
+import io.xpipe.core.util.NewLine;
+import io.xpipe.core.util.StreamCharset;
 import io.xpipe.core.util.SecretValue;
 
 import java.net.URI;
diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialect.java b/core/src/main/java/io/xpipe/core/process/ShellDialect.java
index 1befc59e..d45a9a18 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellDialect.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellDialect.java
@@ -1,8 +1,8 @@
 package io.xpipe.core.process;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.xpipe.core.charsetter.NewLine;
-import io.xpipe.core.charsetter.StreamCharset;
+import io.xpipe.core.util.NewLine;
+import io.xpipe.core.util.StreamCharset;
 import io.xpipe.core.store.FileSystem;
 import io.xpipe.core.util.SecretValue;
 
diff --git a/core/src/main/java/io/xpipe/core/store/KnownFormatStreamDataStore.java b/core/src/main/java/io/xpipe/core/store/KnownFormatStreamDataStore.java
index 775b399e..823b8582 100644
--- a/core/src/main/java/io/xpipe/core/store/KnownFormatStreamDataStore.java
+++ b/core/src/main/java/io/xpipe/core/store/KnownFormatStreamDataStore.java
@@ -1,7 +1,7 @@
 package io.xpipe.core.store;
 
-import io.xpipe.core.charsetter.NewLine;
-import io.xpipe.core.charsetter.StreamCharset;
+import io.xpipe.core.util.NewLine;
+import io.xpipe.core.util.StreamCharset;
 
 public interface KnownFormatStreamDataStore extends StreamDataStore {
 
diff --git a/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java b/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java
index fcb73e63..a85295d6 100644
--- a/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java
+++ b/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java
@@ -12,8 +12,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.ArrayType;
-import io.xpipe.core.charsetter.NewLine;
-import io.xpipe.core.charsetter.StreamCharset;
 import io.xpipe.core.dialog.BaseQueryElement;
 import io.xpipe.core.dialog.BusyElement;
 import io.xpipe.core.dialog.ChoiceElement;
diff --git a/core/src/main/java/io/xpipe/core/util/Deobfuscator.java b/core/src/main/java/io/xpipe/core/util/Deobfuscator.java
index 0e327bab..502fbf84 100644
--- a/core/src/main/java/io/xpipe/core/util/Deobfuscator.java
+++ b/core/src/main/java/io/xpipe/core/util/Deobfuscator.java
@@ -1,6 +1,5 @@
 package io.xpipe.core.util;
 
-import io.xpipe.core.charsetter.NewLine;
 import io.xpipe.core.process.OsType;
 
 import java.io.PrintWriter;
diff --git a/core/src/main/java/io/xpipe/core/charsetter/NewLine.java b/core/src/main/java/io/xpipe/core/util/NewLine.java
similarity index 96%
rename from core/src/main/java/io/xpipe/core/charsetter/NewLine.java
rename to core/src/main/java/io/xpipe/core/util/NewLine.java
index 04a5804b..f32d2ae6 100644
--- a/core/src/main/java/io/xpipe/core/charsetter/NewLine.java
+++ b/core/src/main/java/io/xpipe/core/util/NewLine.java
@@ -1,4 +1,4 @@
-package io.xpipe.core.charsetter;
+package io.xpipe.core.util;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
diff --git a/core/src/main/java/io/xpipe/core/charsetter/StreamCharset.java b/core/src/main/java/io/xpipe/core/util/StreamCharset.java
similarity index 98%
rename from core/src/main/java/io/xpipe/core/charsetter/StreamCharset.java
rename to core/src/main/java/io/xpipe/core/util/StreamCharset.java
index 9de184bc..7015bb23 100644
--- a/core/src/main/java/io/xpipe/core/charsetter/StreamCharset.java
+++ b/core/src/main/java/io/xpipe/core/util/StreamCharset.java
@@ -1,6 +1,5 @@
-package io.xpipe.core.charsetter;
+package io.xpipe.core.util;
 
-import io.xpipe.core.util.Identifiers;
 import lombok.Value;
 
 import java.io.InputStream;
diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
index 7d66b7a7..287db7ad 100644
--- a/core/src/main/java/module-info.java
+++ b/core/src/main/java/module-info.java
@@ -8,7 +8,6 @@ open module io.xpipe.core {
     exports io.xpipe.core.store;
     exports io.xpipe.core.util;
     exports io.xpipe.core.dialog;
-    exports io.xpipe.core.charsetter;
     exports io.xpipe.core.process;
 
     requires com.fasterxml.jackson.datatype.jsr310;