diff --git a/README.md b/README.md index cbbf2e1273..b665e7d7b3 100644 --- a/README.md +++ b/README.md @@ -304,7 +304,7 @@ Thin JAR (recommended): org.zowe.client.java.sdk zowe-client-java-sdk - 7.0.2 + 7.0.4 Fat JAR (with dependencies): @@ -312,7 +312,7 @@ Fat JAR (with dependencies): org.zowe.client.java.sdk zowe-client-java-sdk - 7.0.2 + 7.0.4 jar-with-dependencies @@ -320,11 +320,11 @@ For a Gradle project add the SDK as a dependency by updating your `build.gradle` 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 diff --git a/pom.xml b/pom.xml index 221f334525..6d055cc1d2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.zowe.client.java.sdk zowe-client-java-sdk - 7.0.3 + 7.0.4 jar ${project.groupId}:${project.artifactId} diff --git a/src/main/java/zowe/client/sdk/teamconfig/service/TeamConfigService.java b/src/main/java/zowe/client/sdk/teamconfig/service/TeamConfigService.java index 2408b94e57..3a4835a793 100644 --- a/src/main/java/zowe/client/sdk/teamconfig/service/TeamConfigService.java +++ b/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); } /** diff --git a/src/main/java/zowe/client/sdk/zosconsole/methods/ConsoleGet.java b/src/main/java/zowe/client/sdk/zosconsole/methods/ConsoleGet.java index c4414b070b..708f4c1905 100644 --- a/src/main/java/zowe/client/sdk/zosconsole/methods/ConsoleGet.java +++ b/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); diff --git a/src/main/java/zowe/client/sdk/zosfiles/dsn/methods/DsnCopy.java b/src/main/java/zowe/client/sdk/zosfiles/dsn/methods/DsnCopy.java index fc08236e56..8cc731d4f5 100644 --- a/src/main/java/zowe/client/sdk/zosfiles/dsn/methods/DsnCopy.java +++ b/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; diff --git a/src/main/java/zowe/client/sdk/zosjobs/methods/JobCancel.java b/src/main/java/zowe/client/sdk/zosjobs/methods/JobCancel.java index 005858d057..dfc158cc2e 100644 --- a/src/main/java/zowe/client/sdk/zosjobs/methods/JobCancel.java +++ b/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); diff --git a/src/main/java/zowe/client/sdk/zosjobs/methods/JobChange.java b/src/main/java/zowe/client/sdk/zosjobs/methods/JobChange.java index f893a3c19e..99ae0163b1 100644 --- a/src/main/java/zowe/client/sdk/zosjobs/methods/JobChange.java +++ b/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) { diff --git a/src/main/java/zowe/client/sdk/zosjobs/methods/JobDelete.java b/src/main/java/zowe/client/sdk/zosjobs/methods/JobDelete.java index 73d28808a7..6f165ac4a5 100644 --- a/src/main/java/zowe/client/sdk/zosjobs/methods/JobDelete.java +++ b/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 headers = new HashMap<>(); diff --git a/src/main/java/zowe/client/sdk/zosjobs/methods/JobGet.java b/src/main/java/zowe/client/sdk/zosjobs/methods/JobGet.java index 1931b2c2e0..2d077e25ad 100644 --- a/src/main/java/zowe/client/sdk/zosjobs/methods/JobGet.java +++ b/src/main/java/zowe/client/sdk/zosjobs/methods/JobGet.java @@ -224,7 +224,7 @@ public List 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 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()); } } diff --git a/src/main/java/zowe/client/sdk/zoslogs/method/ZosLog.java b/src/main/java/zowe/client/sdk/zoslogs/method/ZosLog.java index 47ea347731..8e9db7bb73 100644 --- a/src/main/java/zowe/client/sdk/zoslogs/method/ZosLog.java +++ b/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 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())); diff --git a/src/main/java/zowe/client/sdk/zostso/methods/TsoPing.java b/src/main/java/zowe/client/sdk/zostso/methods/TsoPing.java index 6e8c1ce1f3..013097c829 100644 --- a/src/main/java/zowe/client/sdk/zostso/methods/TsoPing.java +++ b/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(""); diff --git a/src/main/java/zowe/client/sdk/zostso/methods/TsoReply.java b/src/main/java/zowe/client/sdk/zostso/methods/TsoReply.java index a3b9e72497..bb5ff6b785 100644 --- a/src/main/java/zowe/client/sdk/zostso/methods/TsoReply.java +++ b/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(""); diff --git a/src/main/java/zowe/client/sdk/zostso/methods/TsoSend.java b/src/main/java/zowe/client/sdk/zostso/methods/TsoSend.java index 6a82c21010..0cd467bc31 100644 --- a/src/main/java/zowe/client/sdk/zostso/methods/TsoSend.java +++ b/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 + "\"}}"; diff --git a/src/main/java/zowe/client/sdk/zostso/methods/TsoStop.java b/src/main/java/zowe/client/sdk/zostso/methods/TsoStop.java index 3861ab0764..becbb8a0b9 100644 --- a/src/main/java/zowe/client/sdk/zostso/methods/TsoStop.java +++ b/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);