Update encoding of url parameters project wide.

README.md

@@ -304,27 +304,27 @@ Thin JAR (recommended):
         <dependency>
           <groupId>org.zowe.client.java.sdk</groupId>
           <artifactId>zowe-client-java-sdk</artifactId>
-          <version>7.0.2</version>
+          <version>7.0.4</version>
         </dependency>
 
 Fat JAR (with dependencies):
 
         <dependency>
           <groupId>org.zowe.client.java.sdk</groupId>
           <artifactId>zowe-client-java-sdk</artifactId>
-          <version>7.0.2</version>
+          <version>7.0.4</version>
           <classifier>jar-with-dependencies</classifier>
         </dependency>  
 
 For a Gradle project add the SDK as a dependency by updating your `build.gradle` as follows:  
 
 Thin JAR (recommended):  
 
-    implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.3'    
+    implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.4'    
 
 Fat JAR (with dependencies):  
 
-    implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.3', classifier: 'jar-with-dependencies'
+    implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.4', classifier: 'jar-with-dependencies'
 
 ## Publishing to Maven Central  
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.zowe.client.java.sdk</groupId>
     <artifactId>zowe-client-java-sdk</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.4</version>
 
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>

src/main/java/zowe/client/sdk/teamconfig/service/TeamConfigService.java

@@ -100,7 +100,7 @@ public void updateTeamConfig(final KeyTarConfig config, final String profileName
         } catch (IOException e) {
             throw new TeamConfigException("Error writing zowe global team configuration file", e);
         }
-        LOG.debug("updateTeamConfig profile {} updated with updatedProperties ******", profileName);
+        LOG.debug("updateTeamConfig profile {} updated", profileName);
     }
 
     /**

src/main/java/zowe/client/sdk/zosconsole/methods/ConsoleGet.java

@@ -109,7 +109,7 @@ public ConsoleGetResponse getResponseCommon(final String responseKey, final Stri
 
         final String url = connection.getZosmfUrl() + ConsoleConstants.RESOURCE + UrlConstants.URL_PATH_DELIM +
                 EncodeUtils.encodeURIComponent(consoleName.isBlank() ? ConsoleConstants.RES_DEF_CN : consoleName) +
-                "/solmsgs/" + responseKey;
+                "/solmsgs/" + EncodeUtils.encodeURIComponent(responseKey);
 
         request.setUrl(url);
 

src/main/java/zowe/client/sdk/zosfiles/dsn/methods/DsnCopy.java

@@ -143,7 +143,7 @@ private String setUrl(final DsnCopyInputData copyInputData) {
                 UrlConstants.URL_PATH_DELIM;
 
         if (copyInputData.getToVolser().isPresent()) {
-            url += "-(" + copyInputData.getToVolser().get() + ")/";
+            url += "-(" + EncodeUtils.encodeURIComponent(copyInputData.getToVolser().get()) + ")/";
         }
         url += EncodeUtils.encodeURIComponent(toDataSet);
         return url;

src/main/java/zowe/client/sdk/zosjobs/methods/JobCancel.java

@@ -15,6 +15,7 @@
 import zowe.client.sdk.rest.*;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.JsonUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zosjobs.JobsConstants;
@@ -126,9 +127,9 @@ public Response cancelCommon(final JobModifyInputData modifyInputData) throws Zo
         final String url = connection.getZosmfUrl() +
                 JobsConstants.RESOURCE +
                 UrlConstants.URL_PATH_DELIM +
-                modifyInputData.getJobName().get() +
+                EncodeUtils.encodeURIComponent(modifyInputData.getJobName().get()) +
                 UrlConstants.URL_PATH_DELIM +
-                modifyInputData.getJobId().get();
+                EncodeUtils.encodeURIComponent(modifyInputData.getJobId().get());
 
         // set version to default value if none given
         final String version = modifyInputData.getVersion().orElse(JobsConstants.DEFAULT_VERSION);

src/main/java/zowe/client/sdk/zosjobs/methods/JobChange.java

@@ -18,6 +18,7 @@
 import zowe.client.sdk.rest.ZosmfRequestFactory;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.JsonUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zosjobs.JobsConstants;
@@ -295,9 +296,9 @@ private static String getUrl(final String zosmfUrl, final JobModifyInputData mod
         return zosmfUrl +
                 JobsConstants.RESOURCE +
                 UrlConstants.URL_PATH_DELIM +
-                modifyInputData.getJobName().get() +
+                EncodeUtils.encodeURIComponent(modifyInputData.getJobName().get()) +
                 UrlConstants.URL_PATH_DELIM +
-                modifyInputData.getJobId().get();
+                EncodeUtils.encodeURIComponent(modifyInputData.getJobId().get());
     }
 
     private static String getVersion(final JobModifyInputData modifyInputData) {

src/main/java/zowe/client/sdk/zosjobs/methods/JobDelete.java

@@ -15,6 +15,7 @@
 import zowe.client.sdk.rest.*;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zosjobs.JobsConstants;
 import zowe.client.sdk.zosjobs.input.JobModifyInputData;
@@ -113,9 +114,9 @@ public Response deleteCommon(final JobModifyInputData modifyInputData) throws Zo
         final String url = connection.getZosmfUrl() +
                 JobsConstants.RESOURCE +
                 UrlConstants.URL_PATH_DELIM +
-                modifyInputData.getJobName().get() +
+                EncodeUtils.encodeURIComponent(modifyInputData.getJobName().get()) +
                 UrlConstants.URL_PATH_DELIM +
-                modifyInputData.getJobId().get();
+                EncodeUtils.encodeURIComponent(modifyInputData.getJobId().get());
 
         final Map<String, String> headers = new HashMap<>();
 

src/main/java/zowe/client/sdk/zosjobs/methods/JobGet.java

@@ -224,7 +224,7 @@ public List<Job> getCommon(final JobGetInputData getInputData) throws ZosmfReque
 
         if (getInputData != null) {
             if (getInputData.getOwner().isPresent()) {
-                url += JobsConstants.QUERY_OWNER + getInputData.getOwner().get();
+                url += JobsConstants.QUERY_OWNER + EncodeUtils.encodeURIComponent(getInputData.getOwner().get());
             }
             if (getInputData.getPrefix().isPresent()) {
                 if (!JobsConstants.DEFAULT_PREFIX.equals(getInputData.getPrefix().get())) {
@@ -251,7 +251,7 @@ public List<Job> getCommon(final JobGetInputData getInputData) throws ZosmfReque
         } else {
             // if no user defined in ZosConnection, then query jobs by the z/OS user ID
             if (connection.getUser() != null && !connection.getUser().isEmpty()) {
-                url += JobsConstants.QUERY_OWNER + connection.getUser();
+                url += JobsConstants.QUERY_OWNER + EncodeUtils.encodeURIComponent(connection.getUser());
             }
         }
 

src/main/java/zowe/client/sdk/zoslogs/method/ZosLog.java

@@ -17,6 +17,7 @@
 import zowe.client.sdk.rest.ZosmfRequestFactory;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.JsonUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zoslogs.input.ZosLogInputData;
@@ -187,11 +188,11 @@ public List<ZosLogResponse> issueCommand(final ZosLogInputData logInputData,
             queryParams.add("timestamp=" + nextTimestamp);
         } else {
             logInputData.getStartTime()
-                    .ifPresent(startTime -> queryParams.add("time=" + startTime));
+                    .ifPresent(startTime -> queryParams.add("time=" + EncodeUtils.encodeURIComponent(startTime)));
         }
 
         logInputData.getTimeRange()
-                .ifPresent(timeRange -> queryParams.add("timeRange=" + timeRange));
+                .ifPresent(timeRange -> queryParams.add("timeRange=" + EncodeUtils.encodeURIComponent(timeRange)));
 
         logInputData.getDirection()
                 .ifPresent(direction -> queryParams.add("direction=" + direction.getValue()));

src/main/java/zowe/client/sdk/zostso/methods/TsoPing.java

@@ -18,6 +18,7 @@
 import zowe.client.sdk.rest.ZosmfRequestFactory;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.TsoUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zostso.TsoConstants;
@@ -83,7 +84,7 @@ public TsoCommonResponse ping(final String sessionId) throws ZosmfRequestExcepti
         final String url = connection.getZosmfUrl() +
                 TsoConstants.RES_PING +
                 UrlConstants.URL_PATH_DELIM +
-                sessionId;
+                EncodeUtils.encodeURIComponent(sessionId);
 
         request.setUrl(url);
         request.setBody("");

src/main/java/zowe/client/sdk/zostso/methods/TsoReply.java

@@ -19,6 +19,7 @@
 import zowe.client.sdk.rest.ZosmfRequestFactory;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.TsoUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zostso.TsoConstants;
@@ -84,7 +85,7 @@ public String reply(final String sessionId) throws ZosmfRequestException {
                 UrlConstants.URL_PATH_DELIM +
                 TsoConstants.RES_START_TSO +
                 UrlConstants.URL_PATH_DELIM +
-                sessionId;
+                EncodeUtils.encodeURIComponent(sessionId);
 
         request.setUrl(url);
         request.setBody("");

src/main/java/zowe/client/sdk/zostso/methods/TsoSend.java

@@ -16,6 +16,7 @@
 import zowe.client.sdk.rest.ZosmfRequestFactory;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.TsoUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zostso.TsoConstants;
@@ -82,7 +83,7 @@ public String sendCommand(final String sessionId, final String command) throws Z
                 UrlConstants.URL_PATH_DELIM +
                 TsoConstants.RES_START_TSO +
                 UrlConstants.URL_PATH_DELIM +
-                sessionId +
+                EncodeUtils.encodeURIComponent(sessionId) +
                 TsoConstants.RES_DONT_READ_REPLY;
         final String body = "{\"TSO RESPONSE\":{\"VERSION\":\"0100\",\"DATA\":\"" + command + "\"}}";
 

src/main/java/zowe/client/sdk/zostso/methods/TsoStop.java

@@ -18,6 +18,7 @@
 import zowe.client.sdk.rest.ZosmfRequestFactory;
 import zowe.client.sdk.rest.exception.ZosmfRequestException;
 import zowe.client.sdk.rest.type.ZosmfRequestType;
+import zowe.client.sdk.utility.EncodeUtils;
 import zowe.client.sdk.utility.TsoUtils;
 import zowe.client.sdk.utility.ValidateUtils;
 import zowe.client.sdk.zostso.TsoConstants;
@@ -85,7 +86,7 @@ public TsoCommonResponse stop(final String sessionId) throws ZosmfRequestExcepti
                 UrlConstants.URL_PATH_DELIM +
                 TsoConstants.RES_START_TSO +
                 UrlConstants.URL_PATH_DELIM +
-                sessionId;
+                EncodeUtils.encodeURIComponent(sessionId);
 
         request.setUrl(url);