feat: support alias & add vm option (#106)

vran-dev · web-flow · commit c22ffab6f7b6 · 2021-02-24T13:48:02.000+08:00
* feat: support add server alias (#103) * feat: change config name to prettyZoo.cfg (#104) * feat: add file.encoding vm option (#105)
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,7 +20,7 @@ jlink {
     forceMerge("jackson", "log4j-api")
     launcher {
         name = 'prettyZoo'
-        jvmArgs = ['-Djdk.gtk.version=2']
+        jvmArgs = ['-Djdk.gtk.version=2', '-Dfile.encoding=utf-8']
     }
     jpackage {
         def os = org.gradle.internal.os.OperatingSystem.current()
diff --git a/app/src/main/java/cc/cc1234/app/controller/ServerViewController.java b/app/src/main/java/cc/cc1234/app/controller/ServerViewController.java
@@ -53,6 +53,9 @@ public class ServerViewController {
     @FXML
     private TextField zkServer;
 
+    @FXML
+    private TextField zkAlias;
+
     @FXML
     private TextField sshServer;
 
@@ -150,6 +153,7 @@ private void showConnectAndSaveButton() {
     private void propertyReset() {
         zkServer.textProperty().unbind();
         zkServer.textProperty().setValue("");
+        zkAlias.textProperty().setValue("");
         sshServer.textProperty().setValue("");
         sshUsername.textProperty().setValue("");
         sshPassword.textProperty().setValue("");
@@ -159,6 +163,7 @@ private void propertyReset() {
 
     private void propertyBind(ServerConfigurationVO config) {
         zkServer.textProperty().setValue(config.getZkServer());
+        zkAlias.textProperty().setValue(config.getZkAlias());
         sshServer.textProperty().setValue(config.getSshServer());
         sshUsername.textProperty().setValue(config.getSshUsername());
         sshPassword.textProperty().setValue(config.getSshPassword());
@@ -234,6 +239,7 @@ private void onSave() {
             serverConfigVO.setSshUsername(sshUsername.textProperty().get());
             serverConfigVO.setSshPassword(sshPassword.textProperty().get());
             serverConfigVO.setSshServer(sshServer.textProperty().get());
+            serverConfigVO.setZkAlias(zkAlias.textProperty().get());
             if (sshTunnelCheckbox.isSelected()) {
                 serverConfigVO.setSshEnabled(true);
             }
diff --git a/app/src/main/java/cc/cc1234/app/facade/PrettyZooFacade.java b/app/src/main/java/cc/cc1234/app/facade/PrettyZooFacade.java
@@ -139,6 +139,7 @@ public void saveServerConfiguration(ServerConfigurationVO serverConfigurationVO)
                 .sshPassword(serverConfigurationVO.getSshPassword());
 
         final ServerConfiguration serverConfiguration = ServerConfiguration.builder()
+                .alias(serverConfigurationVO.getZkAlias())
                 .host(serverConfigurationVO.getZkServer())
                 .aclList(new ArrayList<>(serverConfigurationVO.getAclList()))
                 .sshTunnelEnabled(serverConfigurationVO.isSshEnabled())
diff --git a/app/src/main/java/cc/cc1234/app/listener/DefaultConfigurationListener.java b/app/src/main/java/cc/cc1234/app/listener/DefaultConfigurationListener.java
@@ -48,6 +48,7 @@ public void onServerChange(ServerConfigData newValue) {
                 .findFirst()
                 .map(old -> {
                     old.setAclList(FXCollections.observableList(newValue.getAclList()));
+                    old.setZkAlias(newValue.getAlias());
                     newValue.getSshTunnelConfig()
                             .map(sshTunnelConfig -> {
                                 old.setSshEnabled(newValue.getSshTunnelEnabled());
diff --git a/app/src/main/java/cc/cc1234/app/view/cell/ZkServerListCell.java b/app/src/main/java/cc/cc1234/app/view/cell/ZkServerListCell.java
@@ -23,11 +23,16 @@ protected void updateItem(ServerConfigurationVO item, boolean empty) {
     }
 
     private StringBinding connectBinding(ServerConfigurationVO item) {
-        return Bindings.createStringBinding(() -> connectSymbol(item), item.zkServerProperty(), item.connectedProperty());
+        return Bindings.createStringBinding(() -> connectSymbol(item), item.zkServerProperty(), item.zkAliasProperty(), item.connectedProperty());
     }
 
     private String connectSymbol(ServerConfigurationVO item) {
         String server = item.getZkServer();
-        return item.isConnected() ? "√ " + server : "× " + server;
+        String alias = item.getZkAlias();
+        if (alias != null && !alias.isBlank()) {
+            return item.isConnected() ? "√ " + alias : "× " + alias;
+        } else {
+            return item.isConnected() ? "√ " + server : "× " + server;
+        }
     }
 }
diff --git a/app/src/main/java/cc/cc1234/app/vo/ConfigurationVOTransfer.java b/app/src/main/java/cc/cc1234/app/vo/ConfigurationVOTransfer.java
@@ -61,6 +61,7 @@ public static ServerConfigurationVO to(ServerConfigData serverConfig) {
         vo.setZkServer(serverConfig.getHost());
         vo.getAclList().addAll(serverConfig.getAclList());
         vo.setConnected(false);
+        vo.setZkAlias(serverConfig.getAlias());
         serverConfig.getSshTunnelConfig().ifPresent(sshTunnelConfig -> {
             if (sshTunnelConfig.getRemoteHost() == null || sshTunnelConfig.getRemotePort() == null) {
                 vo.setRemoteServer("");
diff --git a/app/src/main/java/cc/cc1234/app/vo/ServerConfigurationVO.java b/app/src/main/java/cc/cc1234/app/vo/ServerConfigurationVO.java
@@ -11,6 +11,8 @@ public class ServerConfigurationVO {
 
     private SimpleStringProperty zkServer = new SimpleStringProperty("");
 
+    private SimpleStringProperty zkAlias= new SimpleStringProperty("");
+
     private ObjectProperty<ObservableList<String>> aclList = new SimpleObjectProperty<>(FXCollections.observableArrayList());
 
     private SimpleBooleanProperty connected = new SimpleBooleanProperty(false);
@@ -27,6 +29,7 @@ public class ServerConfigurationVO {
 
     public void unbind() {
         zkServer.unbind();
+        zkAlias.unbind();
         aclList.unbind();
         connected.unbind();
         sshEnabled.unbind();
@@ -132,4 +135,16 @@ public void setRemoteServer(String remoteServer) {
     public SimpleStringProperty remoteServerProperty() {
         return remoteServer;
     }
+
+    public String getZkAlias() {
+        return zkAlias.get();
+    }
+
+    public SimpleStringProperty zkAliasProperty() {
+        return zkAlias;
+    }
+
+    public void setZkAlias(String zkAlias) {
+        this.zkAlias.set(zkAlias);
+    }
 }
diff --git a/app/src/main/resources/fxml/ServerView.fxml b/app/src/main/resources/fxml/ServerView.fxml
@@ -16,8 +16,8 @@
 <AnchorPane fx:id="serverInfoPane" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #fff;" stylesheets="@../assets/style.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="cc.cc1234.app.controller.ServerViewController">
    <children>
       <TextField fx:id="zkServer" layoutX="30.0" layoutY="25.0" prefHeight="25.0" prefWidth="240.0" promptText="127.0.0.1:2181" styleClass="v-line-textField" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="25.0" />
-      <CheckBox fx:id="sshTunnelCheckbox" layoutX="30.0" layoutY="70.0" mnemonicParsing="false" prefHeight="25.0" styleClass="v-checkbox" text="Use SSH Tunne" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="70.0" />
-      <AnchorPane fx:id="sshTunnelPane" layoutX="30.0" layoutY="175.0" prefHeight="246.0" prefWidth="590.0" style="-fx-border-color: #ddd; -fx-border-style: dashed; -fx-border-width: 2; -fx-background-color: transparent;" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="30.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="120.0">
+      <CheckBox fx:id="sshTunnelCheckbox" layoutX="30.0" layoutY="70.0" mnemonicParsing="false" prefHeight="25.0" styleClass="v-checkbox" text="Use SSH Tunne" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="110.0" />
+      <AnchorPane fx:id="sshTunnelPane" layoutX="30.0" layoutY="150.0" prefHeight="250.0" prefWidth="614.0" style="-fx-border-color: #ddd; -fx-border-style: dashed; -fx-border-width: 2; -fx-background-color: transparent;" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="30.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="150.0">
          <children>
             <GridPane hgap="20.0" layoutX="2.0" layoutY="8.0" vgap="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
               <columnConstraints>
@@ -26,7 +26,7 @@
                 <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="240.0" prefWidth="240.0" />
               </columnConstraints>
               <rowConstraints>
-                  <RowConstraints minHeight="60.0" prefHeight="80.0" valignment="CENTER" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="40.0" prefHeight="50.0" valignment="CENTER" vgrow="SOMETIMES" />
                 <RowConstraints minHeight="0.0" prefHeight="150.0" valignment="CENTER" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
@@ -45,7 +45,7 @@
                         <Text layoutX="70.0" layoutY="55.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Remote Server" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="20.0" />
                      </children>
                   </AnchorPane>
-                  <ProgressBar fx:id="sshTunnelProgressBarFrom" prefHeight="18.0" prefWidth="81.0" progress="0.0" rotate="90.0" />
+                  <ProgressBar fx:id="sshTunnelProgressBarFrom" prefHeight="18.0" prefWidth="43.0" progress="0.0" rotate="90.0" />
                </children>
                <padding>
                   <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
@@ -54,13 +54,14 @@
          </children>
       </AnchorPane>
       <Button fx:id="closeButton" layoutX="620.0" layoutY="14.0" mnemonicParsing="false" styleClass="v-button" text="X" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="10.0" />
-      <TextArea fx:id="aclTextArea" layoutX="353.0" layoutY="51.0" prefHeight="60.0" prefWidth="240.0" styleClass="vTextArea" AnchorPane.rightAnchor="81.0" AnchorPane.topAnchor="20.0" />
+      <TextArea fx:id="aclTextArea" layoutX="353.0" layoutY="51.0" prefHeight="90.0" prefWidth="240.0" styleClass="vTextArea" AnchorPane.rightAnchor="81.0" AnchorPane.topAnchor="20.0" />
       <HBox fx:id="buttonHBox" alignment="CENTER" layoutX="444.0" layoutY="432.0" prefHeight="25.0" spacing="10.0" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="30.0">
          <children>
             <Button fx:id="saveButton" mnemonicParsing="false" styleClass="v-button" text="save" />
             <Button fx:id="connectButton" mnemonicParsing="false" styleClass="v-button" text="connect" />
             <Button fx:id="deleteButton" mnemonicParsing="false" styleClass="v-button" text="delete" />
          </children>
       </HBox>
+      <TextField fx:id="zkAlias" layoutX="30.0" layoutY="65.0" prefHeight="25.0" prefWidth="240.0" promptText="Alias name (Option)" styleClass="v-line-textField" />
    </children>
 </AnchorPane>
diff --git a/domain/src/main/java/cc/cc1234/domain/configuration/entity/Configuration.java b/domain/src/main/java/cc/cc1234/domain/configuration/entity/Configuration.java
@@ -87,6 +87,10 @@ private void serverConfigurationPrecondition(ServerConfiguration serverConfig) {
         if (serverConfig.getSshTunnelEnabled() && serverConfig.getSshTunnel() == null) {
             throw new IllegalStateException("add SSHTunnel before save");
         }
+        final String alias = serverConfig.getAlias();
+        if (alias != null && !alias.isEmpty() && alias.isBlank()) {
+            throw new IllegalStateException("Alias must not be all blank");
+        }
     }
 
     /**
@@ -122,6 +126,7 @@ private ServerConfigData toServerConfig(ServerConfiguration serverConfiguration)
         serverData.setHost(serverConfiguration.getHost());
         serverData.setSshTunnelEnabled(serverConfiguration.getSshTunnelEnabled());
         serverData.setSshTunnelConfig(Optional.ofNullable(sshTunnelData));
+        serverData.setAlias(serverConfiguration.getAlias());
         return serverData;
     }
 }
diff --git a/domain/src/main/java/cc/cc1234/domain/configuration/entity/ServerConfiguration.java b/domain/src/main/java/cc/cc1234/domain/configuration/entity/ServerConfiguration.java
@@ -13,6 +13,8 @@ public class ServerConfiguration {
     // entity id
     private String host;
 
+    private String alias;
+
     private List<String> aclList;
 
     private int connectTimes;
@@ -29,6 +31,7 @@ public void update(ServerConfiguration serverConfiguration) {
         this.sshTunnelEnabled = serverConfiguration.getSshTunnelEnabled();
         this.sshTunnel = serverConfiguration.getSshTunnel();
         this.connectTimes = serverConfiguration.getConnectTimes();
+        this.alias = serverConfiguration.getAlias();
     }
 
     public void incrementConnectTimes() {
diff --git a/domain/src/main/java/cc/cc1234/domain/configuration/factory/ConfigurationFactory.java b/domain/src/main/java/cc/cc1234/domain/configuration/factory/ConfigurationFactory.java
@@ -33,6 +33,7 @@ public Configuration create(List<ConfigurationChangeListener> listeners) {
                                     .build())
                             .orElse(null);
                     return ServerConfiguration.builder()
+                            .alias(serverConfig.getAlias())
                             .host(serverConfig.getHost())
                             .aclList(serverConfig.getAclList())
                             .connectTimes(serverConfig.getConnectTimes())
diff --git a/infrastructure/src/main/java/cc/cc1234/config/JsonPrettyZooConfigRepository.java b/infrastructure/src/main/java/cc/cc1234/config/JsonPrettyZooConfigRepository.java
@@ -26,6 +26,7 @@ public ConfigData get() {
     }
 
     private ConfigData doLoad() {
+        migrateIfNecessary();
         final ConfigData config = JsonUtils.from(CONFIG_PATH, ConfigData.class);
         final List<ServerConfigData> sortedServers = config.getServers()
                 .stream()
@@ -37,6 +38,17 @@ private ConfigData doLoad() {
         return config;
     }
 
+    /**
+     * compatibility function
+     * since: v1.5.0
+     */
+    private void migrateIfNecessary() {
+        if (!Files.exists(Paths.get(CONFIG_PATH)) && Files.exists(Paths.get(OLD_CONFIG_PATH))) {
+            var config = JsonUtils.from(OLD_CONFIG_PATH, ConfigData.class);
+            save(config);
+        }
+    }
+
     @Override
     public void save(ConfigData config) {
         try {
diff --git a/spi/src/main/java/cc/cc1234/spi/config/PrettyZooConfigRepository.java b/spi/src/main/java/cc/cc1234/spi/config/PrettyZooConfigRepository.java
@@ -8,7 +8,13 @@
 
 public interface PrettyZooConfigRepository {
 
-    String CONFIG_PATH = System.getProperty("user.home") + "/.prettyZoo/server-input.history";
+    /**
+     * will be remove in future
+     */
+    @Deprecated
+    String OLD_CONFIG_PATH = System.getProperty("user.home") + "/.prettyZoo/server-input.history";
+
+    String CONFIG_PATH = System.getProperty("user.home") + "/.prettyZoo/prettyZoo.cfg";
 
     ConfigData get();
 
diff --git a/spi/src/main/java/cc/cc1234/spi/config/model/ServerConfigData.java b/spi/src/main/java/cc/cc1234/spi/config/model/ServerConfigData.java
@@ -9,6 +9,8 @@ public class ServerConfigData {
 
     private String host;
 
+    private String alias;
+
     private int connectTimes = 0;
 
     private List<String> aclList = new ArrayList<>();
@@ -57,19 +59,24 @@ public void setSshTunnelConfig(Optional<SSHTunnelConfigData> sshTunnelConfig) {
         this.sshTunnelConfig = sshTunnelConfig;
     }
 
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ServerConfigData that = (ServerConfigData) o;
-        return connectTimes == that.connectTimes &&
-                host.equals(that.host) &&
-                aclList.equals(that.aclList) &&
-                sshTunnelConfig.equals(that.sshTunnelConfig);
+        return connectTimes == that.connectTimes && Objects.equals(host, that.host) && Objects.equals(alias, that.alias) && Objects.equals(aclList, that.aclList) && Objects.equals(sshTunnelEnabled, that.sshTunnelEnabled) && Objects.equals(sshTunnelConfig, that.sshTunnelConfig);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(host, connectTimes, aclList, sshTunnelConfig);
+        return Objects.hash(host, alias, connectTimes, aclList, sshTunnelEnabled, sshTunnelConfig);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ jlink {`
`20`	`20`	`forceMerge("jackson", "log4j-api")`
`21`	`21`	`launcher {`
`22`	`22`	`name = 'prettyZoo'`
`23`		`- jvmArgs = ['-Djdk.gtk.version=2']`
	`23`	`+ jvmArgs = ['-Djdk.gtk.version=2', '-Dfile.encoding=utf-8']`
`24`	`24`	`}`
`25`	`25`	`jpackage {`
`26`	`26`	`def os = org.gradle.internal.os.OperatingSystem.current()`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,16 @@ protected void updateItem(ServerConfigurationVO item, boolean empty) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`private StringBinding connectBinding(ServerConfigurationVO item) {`
`26`		`- return Bindings.createStringBinding(() -> connectSymbol(item), item.zkServerProperty(), item.connectedProperty());`
	`26`	`+ return Bindings.createStringBinding(() -> connectSymbol(item), item.zkServerProperty(), item.zkAliasProperty(), item.connectedProperty());`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private String connectSymbol(ServerConfigurationVO item) {`
`30`	`30`	`String server = item.getZkServer();`
`31`		`- return item.isConnected() ? "√ " + server : "× " + server;`
	`31`	`+ String alias = item.getZkAlias();`
	`32`	`+ if (alias != null && !alias.isBlank()) {`
	`33`	`+ return item.isConnected() ? "√ " + alias : "× " + alias;`
	`34`	`+ } else {`
	`35`	`+ return item.isConnected() ? "√ " + server : "× " + server;`
	`36`	`+ }`
`32`	`37`	`}`
`33`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,10 @@ private void serverConfigurationPrecondition(ServerConfiguration serverConfig) {`
`87`	`87`	`if (serverConfig.getSshTunnelEnabled() && serverConfig.getSshTunnel() == null) {`
`88`	`88`	`throw new IllegalStateException("add SSHTunnel before save");`
`89`	`89`	`}`
	`90`	`+ final String alias = serverConfig.getAlias();`
	`91`	`+ if (alias != null && !alias.isEmpty() && alias.isBlank()) {`
	`92`	`+ throw new IllegalStateException("Alias must not be all blank");`
	`93`	`+ }`
`90`	`94`	`}`
`91`	`95`
`92`	`96`	`/**`
`@@ -122,6 +126,7 @@ private ServerConfigData toServerConfig(ServerConfiguration serverConfiguration)`
`122`	`126`	`serverData.setHost(serverConfiguration.getHost());`
`123`	`127`	`serverData.setSshTunnelEnabled(serverConfiguration.getSshTunnelEnabled());`
`124`	`128`	`serverData.setSshTunnelConfig(Optional.ofNullable(sshTunnelData));`
	`129`	`+ serverData.setAlias(serverConfiguration.getAlias());`
`125`	`130`	`return serverData;`
`126`	`131`	`}`
`127`	`132`	`}`