remove duplicate methods

Signed-off-by: Anatoli Kalbasin <qwnize@outlook.com>
zowe · Jan 14, 2025 · 02a09d2 · 02a09d2
1 parent f731709
commit 02a09d2
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 167 deletions.
diff --git a/README.md b/README.md
@@ -47,11 +47,11 @@ stage ("stage-name") {
         downloadDS dsn:"EXAMPLE.DATASET(MEMBER)", vol:"VOL001"
         allocateDS dsn:"EXAMPLE.DATASET", alcUnit:"TRK", dsOrg:"PS", primary:1, secondary:1, recFm:"FB", failOnExist:"False"
         writeFileToDS dsn:"EXAMPLE.DATASET", file:"workspaceFile"
+        writeFileToDS dsn:"EXAMPLE.DATASET(MEMBER)", file:"workspaceFile"
         writeFileToDS dsn:"EXAMPLE.DATASET", file:"D:\\files\\localFile"
+        writeFileToDS dsn:"EXAMPLE.DATASET(MEMBER)", file:"D:\\files\\localFile"
         writeToDS dsn:"EXAMPLE.DATASET", text:"Write this string to dataset"
-        writeFileToMember dsn:"EXAMPLE.DATASET", member:"MEMBER", file:"workspaceFile"
-        writeFileToMember dsn:"EXAMPLE.DATASET", member:"MEMBER", file:"D:\\files\\localFile"
-        writeToMember dsn:"EXAMPLE.DATASET", member:"MEMBER", text:"Write this string to member"
+        writeToDS dsn:"EXAMPLE.DATASET(MEMBER)", text:"Write this string to dataset member"
 
         writeDirToDS dir: "app/src/main/cbl/", dsn: "EXAMPLE.DATASET"
         writeDirToDS dir: "D:\\resources\\cbl", dsn: "EXAMPLE.DATASET", isLocalPath: true

diff --git a/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteDirToDatasetStep.kt b/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteDirToDatasetStep.kt
@@ -24,14 +24,14 @@ import org.kohsuke.stapler.DataBoundSetter
 import org.kohsuke.stapler.QueryParameter
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.classic.core.AbstractBuildStep
-import org.zowe.zdevops.logic.writeDirectoryToDataset
+import org.zowe.zdevops.logic.writeDirectoryToPdsJenkins
 import org.zowe.zdevops.utils.validateDatasetName
 import org.zowe.zdevops.utils.validateFieldIsNotEmpty
 
 
 /**
  * A freestyle job Jenkins class for writing the contents of a directory to a PDS/E dataset.
- * @see org.zowe.zdevops.declarative.jobs.WriteDirToDatasetDeclarative
+ * @see org.zowe.zdevops.declarative.files.dsn.WriteDirToDatasetDeclarative
  */
 class WriteDirToDatasetStep
 @DataBoundConstructor
@@ -58,7 +58,7 @@ constructor(
     zosConnection: ZOSConnection
   ) {
     val workspace = build.executor?.currentWorkspace ?: throw AbortException("'build.executor' was null")
-    writeDirectoryToDataset(dsn, dir, isLocalPath, workspace, listener, zosConnection)
+    writeDirectoryToPdsJenkins(dsn, dir, isLocalPath, workspace, listener, zosConnection)
   }
 
   @Extension

diff --git a/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteFileToDatasetStep.kt b/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteFileToDatasetStep.kt
@@ -1,11 +1,15 @@
 /*
+ * Copyright (c) 2023-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2023
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.classic.files.dsn
@@ -24,8 +28,8 @@ import org.kohsuke.stapler.bind.JavaScriptMethod
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.Messages
 import org.zowe.zdevops.classic.core.AbstractBuildStep
-import org.zowe.zdevops.logic.writeToDataset
-import org.zowe.zdevops.utils.validateDatasetName
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
+import org.zowe.zdevops.utils.validateDsnOrDsnMemberName
 import org.zowe.zdevops.utils.validateFieldIsNotEmpty
 import java.io.File
 
@@ -93,7 +97,7 @@ constructor(
         listener.logger.println(Messages.zdevops_declarative_writing_DS_from_file(dsn, file?.name, zosConnection.host, zosConnection.zosmfPort))
         val fileContent = file?.readText()
         if (fileContent != null) {
-            writeToDataset(listener, zosConnection, dsn, fileContent)
+            writeTextToDatasetJenkins(listener, zosConnection, dsn, fileContent)
         }
     }
 
@@ -155,7 +159,7 @@ constructor(
          * @return FormValidation.ok() if the dataset name is valid, or an error message otherwise
          */
         fun doCheckDsn(@QueryParameter dsn: String): FormValidation? {
-            return validateDatasetName(dsn)
+            return validateDsnOrDsnMemberName(dsn)
         }
 
         /**

diff --git a/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteFileToMemberStep.kt b/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteFileToMemberStep.kt
@@ -1,11 +1,15 @@
 /*
+ * Copyright (c) 2023-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2023
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.classic.files.dsn
@@ -24,7 +28,7 @@ import org.kohsuke.stapler.bind.JavaScriptMethod
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.Messages
 import org.zowe.zdevops.classic.core.AbstractBuildStep
-import org.zowe.zdevops.logic.writeToMember
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
 import org.zowe.zdevops.utils.validateDatasetName
 import org.zowe.zdevops.utils.validateFieldIsNotEmpty
 import org.zowe.zdevops.utils.validateMemberName
@@ -94,9 +98,10 @@ constructor(
             else        -> throw AbortException(Messages.zdevops_classic_write_options_invalid())
         }
         listener.logger.println(Messages.zdevops_declarative_writing_DS_from_file(dsn, file?.name, zosConnection.host, zosConnection.zosmfPort))
+        listener.logger.println("[WARNING] - The method is deprecated. Please, consider switching to `Write File to Dataset` step.")
         val fileContent = file?.readText()
         if (fileContent != null) {
-            writeToMember(listener, zosConnection, dsn, member, fileContent)
+            writeTextToDatasetJenkins(listener, zosConnection, "$dsn($member)", fileContent)
         }
     }
 

diff --git a/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteToDatasetStep.kt b/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteToDatasetStep.kt
@@ -1,11 +1,15 @@
 /*
+ * Copyright (c) 2023-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2023
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.classic.files.dsn
@@ -20,8 +24,8 @@ import org.kohsuke.stapler.QueryParameter
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.Messages
 import org.zowe.zdevops.classic.core.AbstractBuildStep
-import org.zowe.zdevops.logic.writeToDataset
-import org.zowe.zdevops.utils.validateDatasetName
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
+import org.zowe.zdevops.utils.validateDsnOrDsnMemberName
 import org.zowe.zdevops.utils.validateFieldIsNotEmpty
 
 /**
@@ -57,7 +61,7 @@ constructor(
         zosConnection: ZOSConnection
     ) {
         listener.logger.println(Messages.zdevops_declarative_writing_DS_from_input(dsn, zosConnection.host, zosConnection.zosmfPort))
-        writeToDataset(listener, zosConnection, dsn, text)
+        writeTextToDatasetJenkins(listener, zosConnection, dsn, text)
     }
 
     /**
@@ -72,7 +76,7 @@ constructor(
          * @return FormValidation.ok() if the dataset name is valid, or an error message otherwise
          */
         fun doCheckDsn(@QueryParameter dsn: String): FormValidation? {
-            return validateDatasetName(dsn)
+            return validateDsnOrDsnMemberName(dsn)
         }
 
         /**

diff --git a/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteToMemberStep.kt b/src/main/kotlin/org/zowe/zdevops/classic/files/dsn/WriteToMemberStep.kt
@@ -1,11 +1,15 @@
 /*
+ * Copyright (c) 2023-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2023
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.classic.files.dsn
@@ -20,7 +24,7 @@ import org.kohsuke.stapler.QueryParameter
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.Messages
 import org.zowe.zdevops.classic.core.AbstractBuildStep
-import org.zowe.zdevops.logic.writeToMember
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
 import org.zowe.zdevops.utils.validateDatasetName
 import org.zowe.zdevops.utils.validateFieldIsNotEmpty
 import org.zowe.zdevops.utils.validateMemberName
@@ -60,7 +64,8 @@ constructor(
         zosConnection: ZOSConnection
     ) {
         listener.logger.println(Messages.zdevops_declarative_writing_DS_from_input(dsn, zosConnection.host, zosConnection.zosmfPort))
-        writeToMember(listener, zosConnection, dsn, member, text)
+        listener.logger.println("[WARNING] - The method is deprecated. Please, consider switching to `Write to Dataset` step.")
+        writeTextToDatasetJenkins(listener, zosConnection, "$dsn($member)", text)
     }
 
     /**

diff --git a/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteDirToDatasetDeclarative.kt b/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteDirToDatasetDeclarative.kt
@@ -25,7 +25,7 @@ import org.kohsuke.stapler.DataBoundConstructor
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.declarative.core.AbstractZosmfAction
 import org.zowe.zdevops.declarative.jobs.zMessages
-import org.zowe.zdevops.logic.writeDirectoryToDataset
+import org.zowe.zdevops.logic.writeDirectoryToPdsJenkins
 
 /**
  * A declarative class for writing the contents of a directory to a PDS/E dataset.
@@ -67,7 +67,7 @@ class WriteDirToDatasetDeclarative
     listener: TaskListener,
     zosConnection: ZOSConnection
   ) {
-    writeDirectoryToDataset(dsn, dir, isLocalPath, workspace, listener, zosConnection)
+    writeDirectoryToPdsJenkins(dsn, dir, isLocalPath, workspace, listener, zosConnection)
   }
 
   @Symbol("writeDirToDS")

diff --git a/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteFIleToMemberDeclarative.kt b/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteFIleToMemberDeclarative.kt
@@ -1,25 +1,31 @@
 /*
+ * Copyright (c) 2022-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2022
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.declarative.files.dsn
 
-import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
-import org.zowe.kotlinsdk.zowe.client.sdk.zosfiles.ZosDsn
-import org.zowe.zdevops.declarative.core.AbstractZosmfAction
-import hudson.*
+import hudson.EnvVars
+import hudson.Extension
 import hudson.FilePath
+import hudson.Launcher
 import hudson.model.Run
 import hudson.model.TaskListener
 import org.jenkinsci.Symbol
 import org.kohsuke.stapler.DataBoundConstructor
+import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
+import org.zowe.zdevops.declarative.core.AbstractZosmfAction
 import org.zowe.zdevops.declarative.jobs.zMessages
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
 import java.io.File
 import java.nio.file.Paths
 
@@ -47,18 +53,8 @@ class WriteFIleToMemberDeclarative @DataBoundConstructor constructor(private val
             File("$workspacePath$file")
         }
 
-        val targetDS = ZosDsn(zosConnection).getDatasetInfo(dsn)
-        val targetDSLRECL = targetDS.recordLength ?: throw AbortException(zMessages.zdevops_declarative_writing_DS_no_info(dsn))
-        val ineligibleStrings = textFile
-            .readLines()
-            .map { it.length }
-            .fold(0) { result, currStrLength -> if (currStrLength > targetDSLRECL) result + 1 else result }
-        if (ineligibleStrings > 0) {
-            throw AbortException(zMessages.zdevops_declarative_writing_DS_ineligible_strings(ineligibleStrings, dsn))
-        }
-        val textString = textFile.readText().replace("\r","")
-        ZosDsn(zosConnection).writeDsn(dsn, member, textString.toByteArray())
-        listener.logger.println(zMessages.zdevops_declarative_writing_DS_success(dsn))
+        listener.logger.println("[WARNING] - The method `writeFileToMember` is deprecated. Please, consider switching to `writeFileToDataset`.")
+        writeTextToDatasetJenkins(listener, zosConnection, "$dsn($member)", textFile.readText())
     }
 
 

diff --git a/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteFileToDatasetDeclarative.kt b/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteFileToDatasetDeclarative.kt
@@ -1,25 +1,31 @@
 /*
+ * Copyright (c) 2022-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2022
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.declarative.files.dsn
 
-import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
-import org.zowe.kotlinsdk.zowe.client.sdk.zosfiles.ZosDsn
-import org.zowe.zdevops.declarative.core.AbstractZosmfAction
-import hudson.*
+import hudson.EnvVars
+import hudson.Extension
 import hudson.FilePath
+import hudson.Launcher
 import hudson.model.Run
 import hudson.model.TaskListener
 import org.jenkinsci.Symbol
 import org.kohsuke.stapler.DataBoundConstructor
+import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
+import org.zowe.zdevops.declarative.core.AbstractZosmfAction
 import org.zowe.zdevops.declarative.jobs.zMessages
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
 import java.io.File
 import java.nio.file.Paths
 
@@ -46,23 +52,7 @@ class WriteFileToDatasetDeclarative @DataBoundConstructor constructor(private va
             File("$workspacePath$file")
         }
 
-        val targetDS = ZosDsn(zosConnection).getDatasetInfo(dsn)
-        if (targetDS.recordLength == null) {
-            throw AbortException(zMessages.zdevops_declarative_writing_DS_no_info(dsn))
-        }
-        var ineligibleStrings = 0
-        textFile.readLines().forEach {
-            if (it.length > targetDS.recordLength!!) {
-                ineligibleStrings++
-            }
-        }
-        if (ineligibleStrings > 0) {
-            throw AbortException(zMessages.zdevops_declarative_writing_DS_ineligible_strings(ineligibleStrings,dsn))
-        } else {
-            val textString = textFile.readText().replace("\r","")
-            ZosDsn(zosConnection).writeDsn(dsn, textString.toByteArray())
-            listener.logger.println(zMessages.zdevops_declarative_writing_DS_success(dsn))
-        }
+        writeTextToDatasetJenkins(listener, zosConnection, dsn, textFile.readText())
     }
 
 

diff --git a/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteToDatasetDeclarative.kt b/src/main/kotlin/org/zowe/zdevops/declarative/files/dsn/WriteToDatasetDeclarative.kt
@@ -1,24 +1,31 @@
 /*
+ * Copyright (c) 2022-2025 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright IBA Group 2022
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 package org.zowe.zdevops.declarative.files.dsn
 
-import hudson.*
+import hudson.EnvVars
+import hudson.Extension
+import hudson.FilePath
+import hudson.Launcher
 import hudson.model.Run
 import hudson.model.TaskListener
 import org.jenkinsci.Symbol
 import org.kohsuke.stapler.DataBoundConstructor
 import org.zowe.kotlinsdk.zowe.client.sdk.core.ZOSConnection
 import org.zowe.zdevops.declarative.core.AbstractZosmfAction
 import org.zowe.zdevops.declarative.jobs.zMessages
-import org.zowe.zdevops.logic.writeToDataset
+import org.zowe.zdevops.logic.writeTextToDatasetJenkins
 
 class WriteToDatasetDeclarative @DataBoundConstructor constructor(private val dsn: String,
                                                                   private val text: String) :
@@ -34,7 +41,7 @@ class WriteToDatasetDeclarative @DataBoundConstructor constructor(private val ds
         listener: TaskListener,
         zosConnection: ZOSConnection
     ) {
-        writeToDataset(listener, zosConnection, dsn, text)
+        writeTextToDatasetJenkins(listener, zosConnection, dsn, text)
     }