lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-08-25 02:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reformat

Browse Source
This commit is contained in:
crschnick
2024-07-25 07:01:40 +00:00
parent 54f27a274f
commit 17069267da
95 changed files with 618 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java
+2 -1
View File
@@ -1,8 +1,9 @@
package io.xpipe.core.store;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.xpipe.core.process.CommandBuilder;
import io.xpipe.core.process.ShellControl;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
import java.io.InputStream;
core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java
+2 -1
View File
@@ -60,7 +60,8 @@ public interface NetworkTunnelStore extends DataStore {
default NetworkTunnelSession sessionChain(int local, int remotePort) throws Exception {
if (!isLocallyTunneable()) {
throw new IllegalStateException("Unable to create tunnel chain as one intermediate system does not support tunneling");
throw new IllegalStateException(
"Unable to create tunnel chain as one intermediate system does not support tunneling");
}
var running = new AtomicBoolean();
core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java
+9 -8
View File
@@ -1,13 +1,5 @@
package io.xpipe.core.util;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.module.SimpleModule;
import io.xpipe.core.dialog.BaseQueryElement;
import io.xpipe.core.dialog.BusyElement;
import io.xpipe.core.dialog.ChoiceElement;
@@ -19,6 +11,15 @@ import io.xpipe.core.store.FilePath;
import io.xpipe.core.store.LocalStore;
import io.xpipe.core.store.StorePath;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.module.SimpleModule;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.file.Path;
core/src/main/java/io/xpipe/core/util/JacksonMapper.java
+9 -5
View File
@@ -3,8 +3,8 @@ package io.xpipe.core.util;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.Module;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.Module;
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.Getter;
@@ -91,7 +91,6 @@ public class JacksonMapper {
return INSTANCE;
}
public static ObjectMapper getCensored() {
if (!JacksonMapper.isInit()) {
return BASE;
@@ -103,13 +102,18 @@ public class JacksonMapper {
public void setupModule(SetupContext context) {
addSerializer(SecretValue.class, new JsonSerializer<>() {
@Override
public void serialize(SecretValue value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
public void serialize(SecretValue value, JsonGenerator gen, SerializerProvider serializers)
throws IOException {
gen.writeString("<secret>");
}
@Override
public void serializeWithType(SecretValue value, JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws
IOException {
public void serializeWithType(
SecretValue value,
JsonGenerator gen,
SerializerProvider serializers,
TypeSerializer typeSer)
throws IOException {
gen.writeString("<secret>");
}
});