Skip to content

Commit 49d1bbc

Browse files
vietjvietj
committed
Releasing 3.6.0.CR1
1 parent 12730bb commit 49d1bbc

File tree

8 files changed

+312
-320
lines changed

8 files changed

+312
-320
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
</parent>
2525

2626
<artifactId>vertx-shell</artifactId>
27-
<version>3.6.0-SNAPSHOT</version>
27+
<version>3.6.0.CR1</version>
2828

2929
<name>Vert.x Shell</name>
3030

3131
<properties>
32-
<stack.version>3.6.0-SNAPSHOT</stack.version>
32+
<stack.version>3.6.0.CR1</stack.version>
3333
<termd.version>1.1.6</termd.version>
3434
</properties>
3535

‎src/main/asciidoc/dataobjects.adoc

Lines changed: 124 additions & 145 deletions
Large diffs are not rendered by default.

‎src/main/asciidoc/enums.adoc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,16 @@
1212
[frame="topbot"]
1313
|===
1414
^|Name | Description
15-
|[[READY]]`READY`|
16-
+++
15+
|[[READY]]`READY`|+++
1716
The job is ready, it can be running or terminated.
1817
+++
19-
|[[RUNNING]]`RUNNING`|
20-
+++
18+
|[[RUNNING]]`RUNNING`|+++
2119
The job is running, it can be stopped or terminated.
2220
+++
23-
|[[STOPPED]]`STOPPED`|
24-
+++
21+
|[[STOPPED]]`STOPPED`|+++
2522
The job is stopped, it can be running or terminated.
2623
+++
27-
|[[TERMINATED]]`TERMINATED`|
28-
+++
24+
|[[TERMINATED]]`TERMINATED`|+++
2925
The job is terminated.
3026
+++
3127
|===

‎src/main/generated/io/vertx/ext/shell/ShellServerOptionsConverter.java

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,47 @@
1-
/*
2-
* Copyright (c) 2014 Red Hat, Inc. and others
3-
*
4-
* Red Hat licenses this file to you under the Apache License, version 2.0
5-
* (the "License"); you may not use this file except in compliance with the
6-
* License. You may obtain a copy of the License at:
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations
14-
* under the License.
15-
*/
16-
171
package io.vertx.ext.shell;
182

193
import io.vertx.core.json.JsonObject;
204
import io.vertx.core.json.JsonArray;
5+
import java.time.Instant;
6+
import java.time.format.DateTimeFormatter;
217

228
/**
239
* Converter for {@link io.vertx.ext.shell.ShellServerOptions}.
24-
*
2510
* NOTE: This class has been automatically generated from the {@link io.vertx.ext.shell.ShellServerOptions} original class using Vert.x codegen.
2611
*/
2712
public class ShellServerOptionsConverter {
2813

29-
public static void fromJson(JsonObject json, ShellServerOptions obj) {
30-
if (json.getValue("reaperInterval") instanceof Number) {
31-
obj.setReaperInterval(((Number)json.getValue("reaperInterval")).longValue());
32-
}
33-
if (json.getValue("sessionTimeout") instanceof Number) {
34-
obj.setSessionTimeout(((Number)json.getValue("sessionTimeout")).longValue());
35-
}
36-
if (json.getValue("welcomeMessage") instanceof String) {
37-
obj.setWelcomeMessage((String)json.getValue("welcomeMessage"));
14+
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ShellServerOptions obj) {
15+
for (java.util.Map.Entry<String, Object> member : json) {
16+
switch (member.getKey()) {
17+
case "reaperInterval":
18+
if (member.getValue() instanceof Number) {
19+
obj.setReaperInterval(((Number)member.getValue()).longValue());
20+
}
21+
break;
22+
case "sessionTimeout":
23+
if (member.getValue() instanceof Number) {
24+
obj.setSessionTimeout(((Number)member.getValue()).longValue());
25+
}
26+
break;
27+
case "welcomeMessage":
28+
if (member.getValue() instanceof String) {
29+
obj.setWelcomeMessage((String)member.getValue());
30+
}
31+
break;
32+
}
3833
}
3934
}
4035

4136
public static void toJson(ShellServerOptions obj, JsonObject json) {
37+
toJson(obj, json.getMap());
38+
}
39+
40+
public static void toJson(ShellServerOptions obj, java.util.Map<String, Object> json) {
4241
json.put("reaperInterval", obj.getReaperInterval());
4342
json.put("sessionTimeout", obj.getSessionTimeout());
4443
if (obj.getWelcomeMessage() != null) {
4544
json.put("welcomeMessage", obj.getWelcomeMessage());
4645
}
4746
}
48-
}
47+
}

‎src/main/generated/io/vertx/ext/shell/ShellServiceOptionsConverter.java

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,48 @@
1-
/*
2-
* Copyright (c) 2014 Red Hat, Inc. and others
3-
*
4-
* Red Hat licenses this file to you under the Apache License, version 2.0
5-
* (the "License"); you may not use this file except in compliance with the
6-
* License. You may obtain a copy of the License at:
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations
14-
* under the License.
15-
*/
16-
171
package io.vertx.ext.shell;
182

193
import io.vertx.core.json.JsonObject;
204
import io.vertx.core.json.JsonArray;
5+
import java.time.Instant;
6+
import java.time.format.DateTimeFormatter;
217

228
/**
239
* Converter for {@link io.vertx.ext.shell.ShellServiceOptions}.
24-
*
2510
* NOTE: This class has been automatically generated from the {@link io.vertx.ext.shell.ShellServiceOptions} original class using Vert.x codegen.
2611
*/
2712
public class ShellServiceOptionsConverter {
2813

29-
public static void fromJson(JsonObject json, ShellServiceOptions obj) {
30-
if (json.getValue("httpOptions") instanceof JsonObject) {
31-
obj.setHttpOptions(new io.vertx.ext.shell.term.HttpTermOptions((JsonObject)json.getValue("httpOptions")));
32-
}
33-
if (json.getValue("sshOptions") instanceof JsonObject) {
34-
obj.setSSHOptions(new io.vertx.ext.shell.term.SSHTermOptions((JsonObject)json.getValue("sshOptions")));
35-
}
36-
if (json.getValue("telnetOptions") instanceof JsonObject) {
37-
obj.setTelnetOptions(new io.vertx.ext.shell.term.TelnetTermOptions((JsonObject)json.getValue("telnetOptions")));
14+
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ShellServiceOptions obj) {
15+
for (java.util.Map.Entry<String, Object> member : json) {
16+
switch (member.getKey()) {
17+
case "httpOptions":
18+
if (member.getValue() instanceof JsonObject) {
19+
obj.setHttpOptions(new io.vertx.ext.shell.term.HttpTermOptions((JsonObject)member.getValue()));
20+
}
21+
break;
22+
case "sshOptions":
23+
if (member.getValue() instanceof JsonObject) {
24+
obj.setSSHOptions(new io.vertx.ext.shell.term.SSHTermOptions((JsonObject)member.getValue()));
25+
}
26+
break;
27+
case "telnetOptions":
28+
if (member.getValue() instanceof JsonObject) {
29+
obj.setTelnetOptions(new io.vertx.ext.shell.term.TelnetTermOptions((JsonObject)member.getValue()));
30+
}
31+
break;
32+
}
3833
}
3934
}
4035

4136
public static void toJson(ShellServiceOptions obj, JsonObject json) {
37+
toJson(obj, json.getMap());
38+
}
39+
40+
public static void toJson(ShellServiceOptions obj, java.util.Map<String, Object> json) {
4241
if (obj.getHttpOptions() != null) {
4342
json.put("httpOptions", obj.getHttpOptions().toJson());
4443
}
4544
if (obj.getTelnetOptions() != null) {
4645
json.put("telnetOptions", obj.getTelnetOptions().toJson());
4746
}
4847
}
49-
}
48+
}

‎src/main/generated/io/vertx/ext/shell/term/HttpTermOptionsConverter.java

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,82 @@
1-
/*
2-
* Copyright (c) 2014 Red Hat, Inc. and others
3-
*
4-
* Red Hat licenses this file to you under the Apache License, version 2.0
5-
* (the "License"); you may not use this file except in compliance with the
6-
* License. You may obtain a copy of the License at:
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations
14-
* under the License.
15-
*/
16-
171
package io.vertx.ext.shell.term;
182

193
import io.vertx.core.json.JsonObject;
204
import io.vertx.core.json.JsonArray;
5+
import java.time.Instant;
6+
import java.time.format.DateTimeFormatter;
217

228
/**
239
* Converter for {@link io.vertx.ext.shell.term.HttpTermOptions}.
24-
*
2510
* NOTE: This class has been automatically generated from the {@link io.vertx.ext.shell.term.HttpTermOptions} original class using Vert.x codegen.
2611
*/
2712
public class HttpTermOptionsConverter {
2813

29-
public static void fromJson(JsonObject json, HttpTermOptions obj) {
30-
if (json.getValue("charset") instanceof String) {
31-
obj.setCharset((String)json.getValue("charset"));
32-
}
33-
if (json.getValue("intputrc") instanceof String) {
34-
obj.setIntputrc((String)json.getValue("intputrc"));
35-
}
36-
if (json.getValue("shellHtmlResource") instanceof String) {
37-
obj.setShellHtmlResource(io.vertx.core.buffer.Buffer.buffer(java.util.Base64.getDecoder().decode((String)json.getValue("shellHtmlResource"))));
38-
}
39-
if (json.getValue("sockJSHandlerOptions") instanceof JsonObject) {
40-
obj.setSockJSHandlerOptions(new io.vertx.ext.web.handler.sockjs.SockJSHandlerOptions((JsonObject)json.getValue("sockJSHandlerOptions")));
41-
}
42-
if (json.getValue("sockJSPath") instanceof String) {
43-
obj.setSockJSPath((String)json.getValue("sockJSPath"));
44-
}
45-
if (json.getValue("termJsResource") instanceof String) {
46-
obj.setTermJsResource(io.vertx.core.buffer.Buffer.buffer(java.util.Base64.getDecoder().decode((String)json.getValue("termJsResource"))));
47-
}
48-
if (json.getValue("vertsShellJsResource") instanceof String) {
49-
obj.setVertsShellJsResource(io.vertx.core.buffer.Buffer.buffer(java.util.Base64.getDecoder().decode((String)json.getValue("vertsShellJsResource"))));
14+
public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpTermOptions obj) {
15+
for (java.util.Map.Entry<String, Object> member : json) {
16+
switch (member.getKey()) {
17+
case "authOptions":
18+
break;
19+
case "charset":
20+
if (member.getValue() instanceof String) {
21+
obj.setCharset((String)member.getValue());
22+
}
23+
break;
24+
case "intputrc":
25+
if (member.getValue() instanceof String) {
26+
obj.setIntputrc((String)member.getValue());
27+
}
28+
break;
29+
case "shellHtmlResource":
30+
if (member.getValue() instanceof String) {
31+
obj.setShellHtmlResource(io.vertx.core.buffer.Buffer.buffer(java.util.Base64.getDecoder().decode((String)member.getValue())));
32+
}
33+
break;
34+
case "sockJSHandlerOptions":
35+
if (member.getValue() instanceof JsonObject) {
36+
obj.setSockJSHandlerOptions(new io.vertx.ext.web.handler.sockjs.SockJSHandlerOptions((JsonObject)member.getValue()));
37+
}
38+
break;
39+
case "sockJSPath":
40+
if (member.getValue() instanceof String) {
41+
obj.setSockJSPath((String)member.getValue());
42+
}
43+
break;
44+
case "termJsResource":
45+
if (member.getValue() instanceof String) {
46+
obj.setTermJsResource(io.vertx.core.buffer.Buffer.buffer(java.util.Base64.getDecoder().decode((String)member.getValue())));
47+
}
48+
break;
49+
case "vertsShellJsResource":
50+
if (member.getValue() instanceof String) {
51+
obj.setVertsShellJsResource(io.vertx.core.buffer.Buffer.buffer(java.util.Base64.getDecoder().decode((String)member.getValue())));
52+
}
53+
break;
54+
}
5055
}
5156
}
5257

5358
public static void toJson(HttpTermOptions obj, JsonObject json) {
59+
toJson(obj, json.getMap());
60+
}
61+
62+
public static void toJson(HttpTermOptions obj, java.util.Map<String, Object> json) {
5463
if (obj.getCharset() != null) {
5564
json.put("charset", obj.getCharset());
5665
}
5766
if (obj.getIntputrc() != null) {
5867
json.put("intputrc", obj.getIntputrc());
5968
}
6069
if (obj.getShellHtmlResource() != null) {
61-
json.put("shellHtmlResource", obj.getShellHtmlResource().getBytes());
70+
json.put("shellHtmlResource", java.util.Base64.getEncoder().encodeToString(obj.getShellHtmlResource().getBytes()));
6271
}
6372
if (obj.getSockJSPath() != null) {
6473
json.put("sockJSPath", obj.getSockJSPath());
6574
}
6675
if (obj.getTermJsResource() != null) {
67-
json.put("termJsResource", obj.getTermJsResource().getBytes());
76+
json.put("termJsResource", java.util.Base64.getEncoder().encodeToString(obj.getTermJsResource().getBytes()));
6877
}
6978
if (obj.getVertsShellJsResource() != null) {
70-
json.put("vertsShellJsResource", obj.getVertsShellJsResource().getBytes());
79+
json.put("vertsShellJsResource", java.util.Base64.getEncoder().encodeToString(obj.getVertsShellJsResource().getBytes()));
7180
}
7281
}
73-
}
82+
}

0 commit comments

Comments
 (0)