Merge pull request #221 from Dokyeongyun/ft-220423-removeAlertLogDateFormat

Ft 220423 removeAlertLogDateFormat

Author: Dokyeongyun

config/common.properties

@@ -3,9 +3,6 @@
 db.setting.contents=host,sid,user,password,port,driver,url
 db.setting.oracle.driver.combo=thin
 
-# Server Setting Contents
-server.setting.dateformat.combo=yyyy-MM-dd,EEE MMM dd HH:mm:ss yyyy
-
 # DB Monitoring Contents
 db.monitoring.contents=Archive Usage,TableSpace Usage,ASM Disk Usage
 

src/main/java/root/core/domain/AlertLogCommand.java

@@ -8,21 +8,12 @@
 public class AlertLogCommand {
 	private int readLine;
 	private String readFilePath;
-	private String dateFormat;
-	private String dateFormatRegex;
 	private String[] catchErrorMsg;
 
 	public AlertLogCommand(int readLine, String readFilePath) {
 		this.readLine = readLine;
 		this.readFilePath = readFilePath;
 	}
-	
-	public AlertLogCommand(int readLine, String readFilePath, String dateFormat, String dateFormatRegex) {
-		this.readLine = readLine;
-		this.readFilePath = readFilePath;
-		this.dateFormat = dateFormat;
-		this.dateFormatRegex = dateFormatRegex;
-	}
 
 	public AlertLogCommand(int readLine, String readFilePath, String... catchErrorMsg) {
 		this.readLine = readLine;

src/main/java/root/core/repository/implement/PropertyRepositoryImpl.java

@@ -195,18 +195,6 @@ public void saveServerConnectionInfo(String filePath, Map<String, JschConnection
 			config.setProperty(serverName + ".server.port", jsch.getPort());
 			config.setProperty(serverName + ".server.username", jsch.getUserName());
 			config.setProperty(serverName + ".server.password", jsch.getPassword());
-
-			String dateFormat = jsch.getAlc().getDateFormat();
-			String dateFormatRegex = "";
-
-			if (dateFormat.equals("EEE MMM dd HH:mm:ss yyyy")) {
-				dateFormatRegex = "...\\s...\\s([0-2][0-9]|1[012])\\s\\d\\d:\\d\\d:\\d\\d\\s\\d{4}";
-			} else if (dateFormat.equals("yyyy-MM-dd")) {
-				dateFormatRegex = "\\d{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T";
-			}
-
-			config.setProperty(serverName + ".server.alertlog.dateformat", dateFormat);
-			config.setProperty(serverName + ".server.alertlog.dateformatregex", dateFormatRegex);
 			config.setProperty(serverName + ".server.alertlog.filepath", jsch.getAlc().getReadFilePath());
 			config.setProperty(serverName + ".server.alertlog.readline", 500);
 		}
@@ -553,10 +541,7 @@ public JschConnectionInfo getJschConnectionInfo(String serverName) {
 	public AlertLogCommand getAlertLogCommand(String serverName) {
 		String alertLogFilePath = connInfoConfig.getString(serverName + ".server.alertlog.filepath");
 		int alertLogReadLine = connInfoConfig.getInt(serverName + ".server.alertlog.readline");
-		String alertLogDateFormat = connInfoConfig.getString(serverName + ".server.alertlog.dateformat");
-		String alertLogDateFormatRegex = connInfoConfig.getString(serverName + ".server.alertlog.dateformatregex");
-		AlertLogCommand alc = new AlertLogCommand(alertLogReadLine, alertLogFilePath, alertLogDateFormat,
-				alertLogDateFormatRegex);
+		AlertLogCommand alc = new AlertLogCommand(alertLogReadLine, alertLogFilePath);
 		return alc;
 	}
 

src/main/java/root/javafx/CustomView/ServerConnectionInfoAnchorPane.java

@@ -49,9 +49,6 @@ public class ServerConnectionInfoAnchorPane extends ConnectionInfoAP {
 	@FXML
 	TextField alertLogFilePathTF;
 
-	@FXML
-	JFXComboBox<String> alertLogDateFormatCB;
-
 	public ServerConnectionInfoAnchorPane() {
 		try {
 			FXMLLoader loader = DependencyInjection.getLoader("/fxml/ServerConnectionInfoAnchorPane.fxml");
@@ -73,10 +70,6 @@ public void init() {
 		// Set textFormatter
 		portTF.setTextFormatter(new NumberTextFormatter());
 
-		// Set AlertLogDateFormat ComboBox values
-		alertLogDateFormatCB.getItems()
-				.addAll(propertyRepository.getCommonResources("server.setting.dateformat.combo"));
-		
 		// Set ServerOS ComboBox values
 		serverOSCB.getItems().addAll(ServerOS.values());
 	}
@@ -89,7 +82,6 @@ public void setInitialValue(JschConnectionInfo jsch) {
 		userTF.setText(jsch.getUserName());
 		passwordPF.setText(jsch.getPassword());
 		alertLogFilePathTF.setText(jsch.getAlc().getReadFilePath());
-		alertLogDateFormatCB.getSelectionModel().select(jsch.getAlc().getDateFormat());
 	}
 
 	public JschConnectionInfo getInputValues() {
@@ -102,7 +94,6 @@ public JschConnectionInfo getInputValues() {
 		jsch.setPassword(passwordPF.getText());
 		AlertLogCommand alc = new AlertLogCommand();
 		alc.setReadFilePath(alertLogFilePathTF.getText());
-		alc.setDateFormat(alertLogDateFormatCB.getSelectionModel().getSelectedItem());
 		jsch.setAlc(alc);
 		return jsch;
 	}
@@ -116,6 +107,6 @@ public boolean isAnyEmptyInput() {
 
 		return StringUtils.isAnyEmpty(serverOS.name(), hostTF.getText(),
 				portTF.getText(), userTF.getText(), serverNameTF.getText(), passwordPF.getText(),
-				alertLogFilePathTF.getText(), alertLogDateFormatCB.getSelectionModel().getSelectedItem());
+				alertLogFilePathTF.getText());
 	}
 }

src/main/resources/fxml/ServerConnectionInfoAnchorPane.fxml

@@ -24,7 +24,6 @@
             <RowConstraints minHeight="30.0" percentHeight="24.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="30.0" percentHeight="24.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="30.0" percentHeight="24.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="30.0" percentHeight="24.0" vgrow="SOMETIMES" />
          </rowConstraints>
          <children>
             <Label style="-fx-font-size: 11px;" styleClass="basic-font" text="Host :" />
@@ -47,8 +46,6 @@
             <TextField fx:id="portTF" GridPane.columnIndex="3" />
             <TextField fx:id="hostTF" prefWidth="200.0" GridPane.columnIndex="1" />
             <PasswordField fx:id="passwordPF" prefWidth="200.0" promptText="hidden" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2" />
-            <Label style="-fx-font-size: 11px;" styleClass="basic-font" stylesheets="@../css/javaFx.css" text="AlertLog DateFormat :" GridPane.rowIndex="4" />
-            <JFXComboBox fx:id="alertLogDateFormatCB" prefWidth="424.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
             <Label style="-fx-font-size: 11px;" styleClass="basic-font" stylesheets="@../css/javaFx.css" text="Server OS" GridPane.columnIndex="2" GridPane.rowIndex="2">
                <padding>
                   <Insets left="10.0" />