Move charsetter classes

xpipe-io · Mar 11, 2024 · bff56ed · bff56ed
1 parent c35fb24
commit bff56ed
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -12,8 +12,6 @@
 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
@@ -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/...ava/io/xpipe/core/charsetter/NewLine.java → ...main/java/io/xpipe/core/util/NewLine.java b/...ava/io/xpipe/core/charsetter/NewLine.java → ...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/.../xpipe/core/charsetter/StreamCharset.java → ...ava/io/xpipe/core/util/StreamCharset.java b/.../xpipe/core/charsetter/StreamCharset.java → ...ava/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
@@ -8,7 +8,6 @@
     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;