Merge pull request #29 from cloudoptlab/3.x

3.0.0.0-BETA3

Author: T-baby

cloudopt-next-web/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     api "io.vertx:vertx-web:${rootProject.property('vertx_version')}"
     api "io.vertx:vertx-lang-kotlin:${rootProject.property('vertx_version')}"
     api "io.vertx:vertx-lang-kotlin-coroutines:${rootProject.property('vertx_version')}"
-    implementation "io.netty:netty-all:4.1.56.Final"
+    api "io.netty:netty-all:4.1.56.Final"
     api project(":cloudopt-next-waf")
     api project(":cloudopt-next-logging")
     api project(":cloudopt-next-utils")

gradle.properties

@@ -1,4 +1,4 @@
-project_version=3.0.0.0-BETA3
+project_version=3.0.0.0-BETA4
 java_version=11
 kotlin_version=1.4.0
 vertx_version=4.0.0

plugins/cloudopt-next-client/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    implementation project(":cloudopt-next-web")
-    implementation "io.vertx:vertx-web-client:${rootProject.property('vertx_version')}"
+    api project(":cloudopt-next-web")
+    api "io.vertx:vertx-web-client:${rootProject.property('vertx_version')}"
 }
 
 description = 'Cloudopt Next Http Client'

…otlin/cloudopt/next/client/HttpClient.kt …n/net/cloudopt/next/client/HttpClient.ktplugins/cloudopt-next-client/src/main/kotlin/cloudopt/next/client/HttpClient.kt renamed to plugins/cloudopt-next-client/src/main/kotlin/net/cloudopt/next/client/HttpClient.kt plugins/cloudopt-next-client/src/main/kotlin/cloudopt/next/client/HttpClient.kt renamed to plugins/cloudopt-next-client/src/main/kotlin/net/cloudopt/next/client/HttpClient.kt

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cloudopt.next.client
+package net.cloudopt.next.client
 
 import io.vertx.core.buffer.Buffer
 import io.vertx.ext.web.client.HttpRequest
 import io.vertx.ext.web.client.WebClient
 import io.vertx.ext.web.client.WebClientOptions
-import net.cloudopt.next.web.NextServer
 import net.cloudopt.next.web.Worker
 
 

…/kotlin/cloudopt/next/client/TestCase.kt …lin/net/cloudopt/next/client/TestCase.ktplugins/cloudopt-next-client/src/test/kotlin/cloudopt/next/client/TestCase.kt renamed to plugins/cloudopt-next-client/src/test/kotlin/net/cloudopt/next/client/TestCase.kt plugins/cloudopt-next-client/src/test/kotlin/cloudopt/next/client/TestCase.kt renamed to plugins/cloudopt-next-client/src/test/kotlin/net/cloudopt/next/client/TestCase.kt

@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cloudopt.next.client
-
-import io.vertx.ext.web.client.WebClientOptions
+package net.cloudopt.next.client
 
 
 /*
@@ -30,9 +28,9 @@ fun main(args: Array<String>) {
     var client = HttpClient("https://www.cloudopt.net").setPort(443)
 
 
-    client.get("/api/v1/grade/website/www.baidu.com").send().onSuccess { response->
+    client.get("/api/v2/grade/website/www.baidu.com").send().onSuccess { response ->
         print(response.bodyAsString())
-    }.onFailure{err->
+    }.onFailure { err ->
         println("Connection failure!")
     }
 }

plugins/cloudopt-next-encrypt/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation "org.bouncycastle:bcprov-jdk15on:1.68"
+    api "org.bouncycastle:bcprov-jdk15on:1.68"
 }
 
 description = "Cloudopt Next Encrypt"

plugins/cloudopt-next-i18n/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    implementation project(":cloudopt-next-utils")
-    implementation project(":cloudopt-next-json")
+    api project(":cloudopt-next-utils")
+    api project(":cloudopt-next-json")
     testImplementation project(':cloudopt-next-logging')
 }
 

plugins/cloudopt-next-jooq/src/main/kotlin/net/cloudopt/next/jooq/JooqManager.kt

@@ -33,16 +33,16 @@ import java.sql.Connection
 object JooqManager {
 
     @JvmStatic
-    var connection: Connection? = null
+    lateinit var connection: Connection
 
     @JvmStatic
-    var dsl: DSLContext? = null
+    lateinit var dsl: DSLContext
 
     @JvmStatic
-    var transactionProvider: TransactionProvider? = null
+    lateinit var transactionProvider: TransactionProvider
 
     @JvmStatic
-    var connectionProvider: ConnectionProvider? = null
+    lateinit var connectionProvider: ConnectionProvider
 
     @JvmStatic
     var settings: Settings = SettingsTools.defaultSettings()

plugins/cloudopt-next-kafka/build.gradle

@@ -1,8 +1,8 @@
 dependencies {
-    implementation project(":cloudopt-next-web")
-    implementation project(":cloudopt-next-utils")
-    implementation project(":cloudopt-next-logging")
-    implementation "io.vertx:vertx-kafka-client:${rootProject.property('vertx_version')}"
+    api project(":cloudopt-next-web")
+    api project(":cloudopt-next-utils")
+    api project(":cloudopt-next-logging")
+    api "io.vertx:vertx-kafka-client:${rootProject.property('vertx_version')}"
     compileOnly "org.apache.kafka:kafka-clients:2.4.1"
     testImplementation "org.apache.kafka:kafka-clients:2.4.1"
     compileOnly "org.apache.kafka:kafka-streams:2.4.1"

plugins/cloudopt-next-redis/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    implementation project(":cloudopt-next-web")
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:${property('kotlin_version')}"
+    api project(":cloudopt-next-web")
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:${property('kotlin_version')}"
     compileOnly "io.lettuce:lettuce-core:6.0.2.RELEASE"
     testImplementation "io.lettuce:lettuce-core:6.0.2.RELEASE"
 }