From 85686700a43c57c8e723910eb872475b0a010d01 Mon Sep 17 00:00:00 2001 From: Dinh Nguyen Date: Tue, 24 Dec 2024 10:53:22 +0700 Subject: [PATCH] Update default encoding set, primeface version, remove unused import --- .settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/ch.ivyteam.ivy.designer.prefs | 2 +- .../.settings/org.eclipse.core.resources.prefs | 2 ++ sftp-connector-demo/pom.xml | 1 + .../demo/SftpClientDemo/SftpClientDemoData.d.json | 15 +++++---------- .../.settings/ch.ivyteam.ivy.designer.prefs | 2 +- .../.settings/org.eclipse.core.resources.prefs | 2 ++ sftp-connector-test/pom.xml | 1 + .../connector/sftp/test/SftpProcessSSHTest.java | 4 +--- .../.settings/ch.ivyteam.ivy.designer.prefs | 2 +- .../.settings/org.eclipse.core.resources.prefs | 2 ++ sftp-connector/pom.xml | 1 + 12 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 sftp-connector-demo/.settings/org.eclipse.core.resources.prefs create mode 100644 sftp-connector-test/.settings/org.eclipse.core.resources.prefs create mode 100644 sftp-connector/.settings/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/sftp-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/sftp-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 6ae8f4d..e57df4e 100644 --- a/sftp-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/sftp-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,4 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sftp.demo -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/sftp-connector-demo/.settings/org.eclipse.core.resources.prefs b/sftp-connector-demo/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/sftp-connector-demo/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/sftp-connector-demo/pom.xml b/sftp-connector-demo/pom.xml index c7c49c8..4142707 100644 --- a/sftp-connector-demo/pom.xml +++ b/sftp-connector-demo/pom.xml @@ -7,6 +7,7 @@ iar 12.0.0 + UTF-8 diff --git a/sftp-connector-demo/src_hd/com/axonivy/connector/sftp/demo/SftpClientDemo/SftpClientDemoData.d.json b/sftp-connector-demo/src_hd/com/axonivy/connector/sftp/demo/SftpClientDemo/SftpClientDemoData.d.json index 0a012a7..bbc7e1c 100644 --- a/sftp-connector-demo/src_hd/com/axonivy/connector/sftp/demo/SftpClientDemo/SftpClientDemoData.d.json +++ b/sftp-connector-demo/src_hd/com/axonivy/connector/sftp/demo/SftpClientDemo/SftpClientDemoData.d.json @@ -21,31 +21,26 @@ "modifiers" : [ "PERSISTENT" ] }, { "name" : "fileToDownload", - "type" : "com.axonivy.connector.sftp.service.SftpClientService.FileData", - "modifiers" : [ "PERSISTENT" ] + "type" : "com.axonivy.connector.sftp.service.SftpClientService.FileData" }, { "name" : "isFileUploaded", "type" : "Boolean", "modifiers" : [ "PERSISTENT" ] }, { "name" : "listRemoteFiles", - "type" : "java.util.List", - "modifiers" : [ "PERSISTENT" ] + "type" : "java.util.List" }, { "name" : "remoteFileName", "type" : "String", "modifiers" : [ "PERSISTENT" ] }, { "name" : "streamedContent", - "type" : "org.primefaces.model.StreamedContent", - "modifiers" : [ "PERSISTENT" ] + "type" : "org.primefaces.model.StreamedContent" }, { "name" : "toFile", - "type" : "java.io.File", - "modifiers" : [ "PERSISTENT" ] + "type" : "java.io.File" }, { "name" : "uploadedFile", - "type" : "org.primefaces.model.file.UploadedFile", - "modifiers" : [ "PERSISTENT" ] + "type" : "org.primefaces.model.file.UploadedFile" } ] } \ No newline at end of file diff --git a/sftp-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/sftp-connector-test/.settings/ch.ivyteam.ivy.designer.prefs index ba74c3f..888a986 100644 --- a/sftp-connector-test/.settings/ch.ivyteam.ivy.designer.prefs +++ b/sftp-connector-test/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,4 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sftp.test -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/sftp-connector-test/.settings/org.eclipse.core.resources.prefs b/sftp-connector-test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/sftp-connector-test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/sftp-connector-test/pom.xml b/sftp-connector-test/pom.xml index 28a7be4..9189eb4 100644 --- a/sftp-connector-test/pom.xml +++ b/sftp-connector-test/pom.xml @@ -7,6 +7,7 @@ iar 12.0.0 + UTF-8 12.0.1 diff --git a/sftp-connector-test/src_test/com/axonivy/connector/sftp/test/SftpProcessSSHTest.java b/sftp-connector-test/src_test/com/axonivy/connector/sftp/test/SftpProcessSSHTest.java index eb8a4b8..3c5d809 100644 --- a/sftp-connector-test/src_test/com/axonivy/connector/sftp/test/SftpProcessSSHTest.java +++ b/sftp-connector-test/src_test/com/axonivy/connector/sftp/test/SftpProcessSSHTest.java @@ -4,8 +4,6 @@ import java.io.IOException; import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.List; import org.apache.commons.io.FileUtils; @@ -18,7 +16,6 @@ import ch.ivyteam.ivy.bpm.engine.client.BpmClient; import ch.ivyteam.ivy.bpm.engine.client.element.BpmElement; -import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.engine.client.sub.SubProcessCallResult; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; import ch.ivyteam.ivy.scripting.objects.File; @@ -100,6 +97,7 @@ public void callUploadIvyFile(BpmClient bpmClient) throws IOException { assertThat(isSuccess).isTrue(); } + @SuppressWarnings("unchecked") @Test @Order(4) public void callListAllFiles(BpmClient bpmClient) { diff --git a/sftp-connector/.settings/ch.ivyteam.ivy.designer.prefs b/sftp-connector/.settings/ch.ivyteam.ivy.designer.prefs index b3cce9e..7807670 100644 --- a/sftp-connector/.settings/ch.ivyteam.ivy.designer.prefs +++ b/sftp-connector/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,4 +1,4 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sftp -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 \ No newline at end of file diff --git a/sftp-connector/.settings/org.eclipse.core.resources.prefs b/sftp-connector/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/sftp-connector/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/sftp-connector/pom.xml b/sftp-connector/pom.xml index aebf7c3..b172e34 100644 --- a/sftp-connector/pom.xml +++ b/sftp-connector/pom.xml @@ -7,6 +7,7 @@ iar 12.0.0 + UTF-8