Regen code

Author: vietj

mqtt-examples/src/main/groovy/io/vertx/example/mqtt/app/client.groovy

@@ -5,11 +5,9 @@ import io.vertx.core.buffer.Buffer
 import io.netty.handler.codec.mqtt.MqttQoS
 @Field def MQTT_MESSAGE = "Hello Vert.x MQTT Client"
 @Field def BROKER_HOST = "localhost"
-@Field def BROKER_PORT = 1883
 @Field def MQTT_TOPIC = "/my_topic"
+@Field def BROKER_PORT = 1883
 def options = [
-  port:BROKER_PORT,
-  host:BROKER_HOST,
   keepAliveTimeSeconds:2
 ]
 
@@ -22,7 +20,7 @@ client.publishHandler({ publish ->
 })
 
 // handle response on subscribe request
-client.subscribeCompleteHandler({ h ->
+client.subscribeCompletionHandler({ h ->
   println("Receive SUBACK from server with granted QoS : ${h.grantedQoSLevels()}")
 
   // let's publish a message to the subscribed topic
@@ -37,7 +35,7 @@ client.subscribeCompleteHandler({ h ->
 })
 
 // handle response on unsubscribe request
-client.unsubscribeCompleteHandler({ h ->
+client.unsubscribeCompletionHandler({ h ->
   println("Receive UNSUBACK from server")
   vertx.setTimer(5000, { l ->
     client.disconnect({ d ->
@@ -47,7 +45,7 @@ client.unsubscribeCompleteHandler({ h ->
 })
 
 // connect to a server
-client.connect({ ch ->
+client.connect(BROKER_PORT, BROKER_HOST, { ch ->
   if (ch.succeeded()) {
     println("Connected to a server")
     client.subscribe(MQTT_TOPIC, 0)

mqtt-examples/src/main/groovy/io/vertx/example/mqtt/app/server.groovy

@@ -44,7 +44,7 @@ mqttServer.endpointHandler({ endpoint ->
 
       endpoint.publishRelease(messageId)
 
-    }).publishCompleteHandler({ messageId ->
+    }).publishCompletionHandler({ messageId ->
 
       println("Received ack for message = ${messageId}")
     })

mqtt-examples/src/main/groovy/io/vertx/example/mqtt/simple/client.groovy

@@ -6,14 +6,9 @@ import io.netty.handler.codec.mqtt.MqttQoS
 @Field def BROKER_HOST = "localhost"
 @Field def BROKER_PORT = 1883
 @Field def MQTT_TOPIC = "/my_topic"
-def options = [
-  port:BROKER_PORT,
-  host:BROKER_HOST
-]
+def mqttClient = MqttClient.create(vertx)
 
-def mqttClient = MqttClient.create(vertx, options)
-
-mqttClient.connect({ ch ->
+mqttClient.connect(BROKER_PORT, BROKER_HOST, { ch ->
   if (ch.succeeded()) {
     println("Connected to a server")
 

mqtt-examples/src/main/groovy/io/vertx/example/mqtt/ssl/client.groovy

@@ -7,14 +7,12 @@ import io.netty.handler.codec.mqtt.MqttQoS
 @Field def BROKER_PORT = 8883
 @Field def MQTT_TOPIC = "/my_topic"
 def options = [:]
-options.port = BROKER_PORT
-options.host = BROKER_HOST
 options.ssl = true
 options.trustAll = true
 
 def mqttClient = MqttClient.create(vertx, options)
 
-mqttClient.connect({ ch ->
+mqttClient.connect(BROKER_PORT, BROKER_HOST, { ch ->
   if (ch.succeeded()) {
     println("Connected to a server")
 

mqtt-examples/src/main/js/io/vertx/example/mqtt/app/client.js

@@ -3,11 +3,9 @@ var MqttClient = require("vertx-mqtt-server-js/mqtt_client");
 var Buffer = require("vertx-js/buffer");
 var MQTT_MESSAGE = "Hello Vert.x MQTT Client";
 var BROKER_HOST = "localhost";
-var BROKER_PORT = 1883;
 var MQTT_TOPIC = "/my_topic";
+var BROKER_PORT = 1883;
 var options = {
-  "port" : BROKER_PORT,
-  "host" : BROKER_HOST,
   "keepAliveTimeSeconds" : 2
 };
 
@@ -20,7 +18,7 @@ client.publishHandler(function (publish) {
 });
 
 // handle response on subscribe request
-client.subscribeCompleteHandler(function (h) {
+client.subscribeCompletionHandler(function (h) {
   console.log("Receive SUBACK from server with granted QoS : " + h.grantedQoSLevels());
 
   // let's publish a message to the subscribed topic
@@ -35,7 +33,7 @@ client.subscribeCompleteHandler(function (h) {
 });
 
 // handle response on unsubscribe request
-client.unsubscribeCompleteHandler(function (h) {
+client.unsubscribeCompletionHandler(function (h) {
   console.log("Receive UNSUBACK from server");
   vertx.setTimer(5000, function (l) {
     client.disconnect(function (d, d_err) {
@@ -45,7 +43,7 @@ client.unsubscribeCompleteHandler(function (h) {
 });
 
 // connect to a server
-client.connect(function (ch, ch_err) {
+client.connect(BROKER_PORT, BROKER_HOST, function (ch, ch_err) {
   if (ch_err == null) {
     console.log("Connected to a server");
     client.subscribe(MQTT_TOPIC, 0);

mqtt-examples/src/main/js/io/vertx/example/mqtt/app/server.js

@@ -43,7 +43,7 @@ mqttServer.endpointHandler(function (endpoint) {
 
       endpoint.publishRelease(messageId);
 
-    }).publishCompleteHandler(function (messageId) {
+    }).publishCompletionHandler(function (messageId) {
 
       console.log("Received ack for message = " + messageId);
     });

mqtt-examples/src/main/js/io/vertx/example/mqtt/simple/client.js

@@ -4,14 +4,9 @@ var MQTT_MESSAGE = "Hello Vert.x MQTT Client";
 var BROKER_HOST = "localhost";
 var BROKER_PORT = 1883;
 var MQTT_TOPIC = "/my_topic";
-var options = {
-  "port" : BROKER_PORT,
-  "host" : BROKER_HOST
-};
+var mqttClient = MqttClient.create(vertx);
 
-var mqttClient = MqttClient.create(vertx, options);
-
-mqttClient.connect(function (ch, ch_err) {
+mqttClient.connect(BROKER_PORT, BROKER_HOST, function (ch, ch_err) {
   if (ch_err == null) {
     console.log("Connected to a server");
 

mqtt-examples/src/main/js/io/vertx/example/mqtt/ssl/client.js

@@ -6,14 +6,12 @@ var BROKER_PORT = 8883;
 var MQTT_TOPIC = "/my_topic";
 var options = {
 };
-options.port = BROKER_PORT;
-options.host = BROKER_HOST;
 options.ssl = true;
 options.trustAll = true;
 
 var mqttClient = MqttClient.create(vertx, options);
 
-mqttClient.connect(function (ch, ch_err) {
+mqttClient.connect(BROKER_PORT, BROKER_HOST, function (ch, ch_err) {
   if (ch_err == null) {
     console.log("Connected to a server");
 

mqtt-examples/src/main/kotlin/io/vertx/example/mqtt/app/Client.kt

@@ -10,12 +10,10 @@ import io.vertx.mqtt.MqttClientOptions
 class Client : io.vertx.core.AbstractVerticle()  {
   var MQTT_MESSAGE = "Hello Vert.x MQTT Client"
   var BROKER_HOST = "localhost"
-  var BROKER_PORT = 1883
   var MQTT_TOPIC = "/my_topic"
+  var BROKER_PORT = 1883
   override fun start() {
     var options = MqttClientOptions(
-      port = BROKER_PORT,
-      host = BROKER_HOST,
       keepAliveTimeSeconds = 2)
 
     var client = MqttClient.create(Vertx.vertx(), options)
@@ -27,7 +25,7 @@ class Client : io.vertx.core.AbstractVerticle()  {
     })
 
     // handle response on subscribe request
-    client.subscribeCompleteHandler({ h ->
+    client.subscribeCompletionHandler({ h ->
       println("Receive SUBACK from server with granted QoS : ${h.grantedQoSLevels()}")
 
       // let's publish a message to the subscribed topic
@@ -42,7 +40,7 @@ class Client : io.vertx.core.AbstractVerticle()  {
     })
 
     // handle response on unsubscribe request
-    client.unsubscribeCompleteHandler({ h ->
+    client.unsubscribeCompletionHandler({ h ->
       println("Receive UNSUBACK from server")
       vertx.setTimer(5000, { l ->
         client.disconnect({ d ->
@@ -52,7 +50,7 @@ class Client : io.vertx.core.AbstractVerticle()  {
     })
 
     // connect to a server
-    client.connect({ ch ->
+    client.connect(BROKER_PORT, BROKER_HOST, { ch ->
       if (ch.succeeded()) {
         println("Connected to a server")
         client.subscribe(MQTT_TOPIC, 0)

mqtt-examples/src/main/kotlin/io/vertx/example/mqtt/app/Server.kt

@@ -49,7 +49,7 @@ class Server : io.vertx.core.AbstractVerticle()  {
 
           endpoint.publishRelease(messageId)
 
-        }).publishCompleteHandler({ messageId ->
+        }).publishCompletionHandler({ messageId ->
 
           println("Received ack for message = ${messageId}")
         })

mqtt-examples/src/main/kotlin/io/vertx/example/mqtt/simple/Client.kt

@@ -2,23 +2,17 @@ package io.vertx.example.mqtt.simple
 
 import io.netty.handler.codec.mqtt.MqttQoS
 import io.vertx.core.buffer.Buffer
-import io.vertx.kotlin.mqtt.*
 import io.vertx.mqtt.MqttClient
-import io.vertx.mqtt.MqttClientOptions
 
 class Client : io.vertx.core.AbstractVerticle()  {
   var MQTT_MESSAGE = "Hello Vert.x MQTT Client"
   var BROKER_HOST = "localhost"
   var BROKER_PORT = 1883
   var MQTT_TOPIC = "/my_topic"
   override fun start() {
-    var options = MqttClientOptions(
-      port = BROKER_PORT,
-      host = BROKER_HOST)
+    var mqttClient = MqttClient.create(vertx)
 
-    var mqttClient = MqttClient.create(vertx, options)
-
-    mqttClient.connect({ ch ->
+    mqttClient.connect(BROKER_PORT, BROKER_HOST, { ch ->
       if (ch.succeeded()) {
         println("Connected to a server")
 

mqtt-examples/src/main/kotlin/io/vertx/example/mqtt/ssl/Client.kt

@@ -13,14 +13,12 @@ class Client : io.vertx.core.AbstractVerticle()  {
   var MQTT_TOPIC = "/my_topic"
   override fun start() {
     var options = MqttClientOptions()
-    options.port = BROKER_PORT
-    options.host = BROKER_HOST
     options.ssl = true
     options.trustAll = true
 
     var mqttClient = MqttClient.create(vertx, options)
 
-    mqttClient.connect({ ch ->
+    mqttClient.connect(BROKER_PORT, BROKER_HOST, { ch ->
       if (ch.succeeded()) {
         println("Connected to a server")
 

mqtt-examples/src/main/ruby/io/vertx/example/mqtt/app/client.rb

@@ -3,11 +3,9 @@
 require 'vertx/buffer'
 @MQTT_MESSAGE = "Hello Vert.x MQTT Client"
 @BROKER_HOST = "localhost"
-@BROKER_PORT = 1883
 @MQTT_TOPIC = "/my_topic"
+@BROKER_PORT = 1883
 options = {
-  'port' => @BROKER_PORT,
-  'host' => @BROKER_HOST,
   'keepAliveTimeSeconds' => 2
 }
 
@@ -20,7 +18,7 @@
 }
 
 # handle response on subscribe request
-client.subscribe_complete_handler() { |h|
+client.subscribe_completion_handler() { |h|
   puts "Receive SUBACK from server with granted QoS : #{h.granted_qo_s_levels()}"
 
   # let's publish a message to the subscribed topic
@@ -35,7 +33,7 @@
 }
 
 # handle response on unsubscribe request
-client.unsubscribe_complete_handler() { |h|
+client.unsubscribe_completion_handler() { |h|
   puts "Receive UNSUBACK from server"
   $vertx.set_timer(5000) { |l|
     client.disconnect() { |d_err,d|
@@ -45,7 +43,7 @@
 }
 
 # connect to a server
-client.connect() { |ch_err,ch|
+client.connect(@BROKER_PORT, @BROKER_HOST) { |ch_err,ch|
   if (ch_err == nil)
     puts "Connected to a server"
     client.subscribe(@MQTT_TOPIC, 0)

mqtt-examples/src/main/ruby/io/vertx/example/mqtt/app/server.rb

@@ -43,7 +43,7 @@
 
       endpoint.publish_release(messageId)
 
-    }.publish_complete_handler() { |messageId|
+    }.publish_completion_handler() { |messageId|
 
       puts "Received ack for message = #{messageId}"
     }

mqtt-examples/src/main/ruby/io/vertx/example/mqtt/simple/client.rb

@@ -4,14 +4,9 @@
 @BROKER_HOST = "localhost"
 @BROKER_PORT = 1883
 @MQTT_TOPIC = "/my_topic"
-options = {
-  'port' => @BROKER_PORT,
-  'host' => @BROKER_HOST
-}
-
-mqttClient = VertxMqttServer::MqttClient.create($vertx, options)
+mqttClient = VertxMqttServer::MqttClient.create($vertx)
 
-mqttClient.connect() { |ch_err,ch|
+mqttClient.connect(@BROKER_PORT, @BROKER_HOST) { |ch_err,ch|
   if (ch_err == nil)
     puts "Connected to a server"
 

mqtt-examples/src/main/ruby/io/vertx/example/mqtt/ssl/client.rb

@@ -6,14 +6,12 @@
 @MQTT_TOPIC = "/my_topic"
 options = {
 }
-options['port'] = @BROKER_PORT
-options['host'] = @BROKER_HOST
 options['ssl'] = true
 options['trustAll'] = true
 
 mqttClient = VertxMqttServer::MqttClient.create($vertx, options)
 
-mqttClient.connect() { |ch_err,ch|
+mqttClient.connect(@BROKER_PORT, @BROKER_HOST) { |ch_err,ch|
   if (ch_err == nil)
     puts "Connected to a server"
 

service-proxy-examples/service-provider/src/main/generated/io/vertx/examples/service/rxjava/ProcessorService.java

@@ -34,6 +34,24 @@
 @io.vertx.lang.rxjava.RxGen(io.vertx.examples.service.ProcessorService.class)
 public class ProcessorService {
 
+  @Override
+  public String toString() {
+    return delegate.toString();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ProcessorService that = (ProcessorService) o;
+    return delegate.equals(that.delegate);
+  }
+  
+  @Override
+  public int hashCode() {
+    return delegate.hashCode();
+  }
+
   public static final io.vertx.lang.rxjava.TypeArg<ProcessorService> __TYPE_ARG = new io.vertx.lang.rxjava.TypeArg<>(
     obj -> new ProcessorService((io.vertx.examples.service.ProcessorService) obj),
     ProcessorService::getDelegate

web-examples/src/main/groovy/io/vertx/example/web/oauth2/server.groovy

@@ -8,8 +8,8 @@ import io.vertx.ext.web.handler.UserSessionHandler
 import io.vertx.ext.web.handler.OAuth2AuthHandler
 import io.vertx.ext.auth.oauth2.AccessToken
 import io.vertx.ext.web.templ.HandlebarsTemplateEngine
-@Field def CLIENT_SECRET = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-@Field def CLIENT_ID = "xxxxxxxxxxxxxxxxxxxx"
+@Field def CLIENT_SECRET = "3155eafd33fc947e0fe9f44127055ce1fe876704"
+@Field def CLIENT_ID = "57cdaa1952a3f4ee3df8"
 @Field def engine = HandlebarsTemplateEngine.create()
 // To simplify the development of the web components we use a Router to route all HTTP requests
 // to organize our code in a reusable way.

web-examples/src/main/groovy/io/vertx/example/web/oauth2/views/advanced.hbs

@@ -12,7 +12,7 @@
   {{#if userInfo.private_emails}}
   With your permission, we were also able to dig up your private email addresses:
   {{#each userInfo.private_emails}}
-    {{email}},
+    {{email}}{{#unless @last}},{{/unless}}
   {{/each}}
   {{else}}
   Also, you're a bit secretive about your private email addresses.

web-examples/src/main/js/io/vertx/example/web/oauth2/server.js

@@ -7,8 +7,8 @@ var UserSessionHandler = require("vertx-web-js/user_session_handler");
 var OAuth2AuthHandler = require("vertx-web-js/o_auth2_auth_handler");
 var AccessToken = require("vertx-auth-oauth2-js/access_token");
 var HandlebarsTemplateEngine = require("vertx-web-js/handlebars_template_engine");
-var CLIENT_SECRET = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-var CLIENT_ID = "xxxxxxxxxxxxxxxxxxxx";
+var CLIENT_SECRET = "3155eafd33fc947e0fe9f44127055ce1fe876704";
+var CLIENT_ID = "57cdaa1952a3f4ee3df8";
 var engine = HandlebarsTemplateEngine.create();
 // To simplify the development of the web components we use a Router to route all HTTP requests
 // to organize our code in a reusable way.