Skip to content

Commit dab3d45

Browse files
frankgiordanofrankgiordano
authored
Merge pull request #618 from zowe/aug11
Minor 7.0.4 release update.
2 parents 465ab79 + f1a804b commit dab3d45

14 files changed

Lines changed: 30 additions & 22 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,27 +304,27 @@ Thin JAR (recommended):
304304
<dependency>
305305
<groupId>org.zowe.client.java.sdk</groupId>
306306
<artifactId>zowe-client-java-sdk</artifactId>
307-
<version>7.0.2</version>
307+
<version>7.0.4</version>
308308
</dependency>
309309

310310
Fat JAR (with dependencies):
311311

312312
<dependency>
313313
<groupId>org.zowe.client.java.sdk</groupId>
314314
<artifactId>zowe-client-java-sdk</artifactId>
315-
<version>7.0.2</version>
315+
<version>7.0.4</version>
316316
<classifier>jar-with-dependencies</classifier>
317317
</dependency>
318318

319319
For a Gradle project add the SDK as a dependency by updating your `build.gradle` as follows:
320320

321321
Thin JAR (recommended):
322322

323-
implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.3'
323+
implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.4'
324324

325325
Fat JAR (with dependencies):
326326

327-
implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.3', classifier: 'jar-with-dependencies'
327+
implementation group: 'org.zowe.client.java.sdk', name: 'zowe-client-java-sdk', version: '7.0.4', classifier: 'jar-with-dependencies'
328328

329329
## Publishing to Maven Central
330330

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.zowe.client.java.sdk</groupId>
88
<artifactId>zowe-client-java-sdk</artifactId>
9-
<version>7.0.3</version>
9+
<version>7.0.4</version>
1010

1111
<packaging>jar</packaging>
1212
<name>${project.groupId}:${project.artifactId}</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void updateTeamConfig(final KeyTarConfig config, final String profileName
100100
} catch (IOException e) {
101101
throw new TeamConfigException("Error writing zowe global team configuration file", e);
102102
}
103-
LOG.debug("updateTeamConfig profile {} updated with updatedProperties ******", profileName);
103+
LOG.debug("updateTeamConfig profile {} updated", profileName);
104104
}
105105

106106
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public ConsoleGetResponse getResponseCommon(final String responseKey, final Stri
109109

110110
final String url = connection.getZosmfUrl() + ConsoleConstants.RESOURCE + UrlConstants.URL_PATH_DELIM +
111111
EncodeUtils.encodeURIComponent(consoleName.isBlank() ? ConsoleConstants.RES_DEF_CN : consoleName) +
112-
"/solmsgs/" + responseKey;
112+
"/solmsgs/" + EncodeUtils.encodeURIComponent(responseKey);
113113

114114
request.setUrl(url);
115115

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private String setUrl(final DsnCopyInputData copyInputData) {
143143
UrlConstants.URL_PATH_DELIM;
144144

145145
if (copyInputData.getToVolser().isPresent()) {
146-
url += "-(" + copyInputData.getToVolser().get() + ")/";
146+
url += "-(" + EncodeUtils.encodeURIComponent(copyInputData.getToVolser().get()) + ")/";
147147
}
148148
url += EncodeUtils.encodeURIComponent(toDataSet);
149149
return url;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import zowe.client.sdk.rest.*;
1616
import zowe.client.sdk.rest.exception.ZosmfRequestException;
1717
import zowe.client.sdk.rest.type.ZosmfRequestType;
18+
import zowe.client.sdk.utility.EncodeUtils;
1819
import zowe.client.sdk.utility.JsonUtils;
1920
import zowe.client.sdk.utility.ValidateUtils;
2021
import zowe.client.sdk.zosjobs.JobsConstants;
@@ -126,9 +127,9 @@ public Response cancelCommon(final JobModifyInputData modifyInputData) throws Zo
126127
final String url = connection.getZosmfUrl() +
127128
JobsConstants.RESOURCE +
128129
UrlConstants.URL_PATH_DELIM +
129-
modifyInputData.getJobName().get() +
130+
EncodeUtils.encodeURIComponent(modifyInputData.getJobName().get()) +
130131
UrlConstants.URL_PATH_DELIM +
131-
modifyInputData.getJobId().get();
132+
EncodeUtils.encodeURIComponent(modifyInputData.getJobId().get());
132133

133134
// set version to default value if none given
134135
final String version = modifyInputData.getVersion().orElse(JobsConstants.DEFAULT_VERSION);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import zowe.client.sdk.rest.ZosmfRequestFactory;
1919
import zowe.client.sdk.rest.exception.ZosmfRequestException;
2020
import zowe.client.sdk.rest.type.ZosmfRequestType;
21+
import zowe.client.sdk.utility.EncodeUtils;
2122
import zowe.client.sdk.utility.JsonUtils;
2223
import zowe.client.sdk.utility.ValidateUtils;
2324
import zowe.client.sdk.zosjobs.JobsConstants;
@@ -295,9 +296,9 @@ private static String getUrl(final String zosmfUrl, final JobModifyInputData mod
295296
return zosmfUrl +
296297
JobsConstants.RESOURCE +
297298
UrlConstants.URL_PATH_DELIM +
298-
modifyInputData.getJobName().get() +
299+
EncodeUtils.encodeURIComponent(modifyInputData.getJobName().get()) +
299300
UrlConstants.URL_PATH_DELIM +
300-
modifyInputData.getJobId().get();
301+
EncodeUtils.encodeURIComponent(modifyInputData.getJobId().get());
301302
}
302303

303304
private static String getVersion(final JobModifyInputData modifyInputData) {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import zowe.client.sdk.rest.*;
1616
import zowe.client.sdk.rest.exception.ZosmfRequestException;
1717
import zowe.client.sdk.rest.type.ZosmfRequestType;
18+
import zowe.client.sdk.utility.EncodeUtils;
1819
import zowe.client.sdk.utility.ValidateUtils;
1920
import zowe.client.sdk.zosjobs.JobsConstants;
2021
import zowe.client.sdk.zosjobs.input.JobModifyInputData;
@@ -113,9 +114,9 @@ public Response deleteCommon(final JobModifyInputData modifyInputData) throws Zo
113114
final String url = connection.getZosmfUrl() +
114115
JobsConstants.RESOURCE +
115116
UrlConstants.URL_PATH_DELIM +
116-
modifyInputData.getJobName().get() +
117+
EncodeUtils.encodeURIComponent(modifyInputData.getJobName().get()) +
117118
UrlConstants.URL_PATH_DELIM +
118-
modifyInputData.getJobId().get();
119+
EncodeUtils.encodeURIComponent(modifyInputData.getJobId().get());
119120

120121
final Map<String, String> headers = new HashMap<>();
121122

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public List<Job> getCommon(final JobGetInputData getInputData) throws ZosmfReque
224224

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import zowe.client.sdk.rest.ZosmfRequestFactory;
1818
import zowe.client.sdk.rest.exception.ZosmfRequestException;
1919
import zowe.client.sdk.rest.type.ZosmfRequestType;
20+
import zowe.client.sdk.utility.EncodeUtils;
2021
import zowe.client.sdk.utility.JsonUtils;
2122
import zowe.client.sdk.utility.ValidateUtils;
2223
import zowe.client.sdk.zoslogs.input.ZosLogInputData;
@@ -187,11 +188,11 @@ public List<ZosLogResponse> issueCommand(final ZosLogInputData logInputData,
187188
queryParams.add("timestamp=" + nextTimestamp);
188189
} else {
189190
logInputData.getStartTime()
190-
.ifPresent(startTime -> queryParams.add("time=" + startTime));
191+
.ifPresent(startTime -> queryParams.add("time=" + EncodeUtils.encodeURIComponent(startTime)));
191192
}
192193

193194
logInputData.getTimeRange()
194-
.ifPresent(timeRange -> queryParams.add("timeRange=" + timeRange));
195+
.ifPresent(timeRange -> queryParams.add("timeRange=" + EncodeUtils.encodeURIComponent(timeRange)));
195196

196197
logInputData.getDirection()
197198
.ifPresent(direction -> queryParams.add("direction=" + direction.getValue()));

0 commit comments

Comments
 (0)