diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1c9106b4..00adc7c6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -49,14 +49,14 @@ jobs: if: ${{ github.event_name != 'pull_request' && ( (vars.runReleaseOnPush || 'true') == 'true' || contains(github.event.head_commit.message, '[release]') ) }} needs: build env: - HAS_CREDENTIALS: ${{ secrets.signingKey != '' && secrets.signingPassword != '' && secrets.sonatypeUsername != '' && secrets.sonatypePassword != '' }} + HAS_CREDENTIALS: ${{ secrets.signingKey != '' && secrets.signingPassword != '' && secrets.SONATYPE_USERNAME_GEL != '' && secrets.SONATYPE_PASSWORD_GEL != '' }} steps: - name: Validate repository secrets for publish if: ${{ env.HAS_CREDENTIALS != 'true' }} run: | echo '### Release Failed ❌' >> $GITHUB_STEP_SUMMARY - echo 'This repository does not have all required secrets: signingKey, signingPassword, sonatypeUsername or sonatypePassword).' >> $GITHUB_STEP_SUMMARY - echo "::error::This repository does not have all required secrets: signingKey, signingPassword, sonatypeUsername or sonatypePassword)." + echo 'This repository does not have all required secrets: signingKey, signingPassword, SONATYPE_USERNAME_GEL or SONATYPE_PASSWORD_GEL).' >> $GITHUB_STEP_SUMMARY + echo "::error::This repository does not have all required secrets: signingKey, signingPassword, SONATYPE_USERNAME_GEL or SONATYPE_PASSWORD_GEL)." exit -1 - uses: actions/checkout@v3 with: @@ -77,5 +77,5 @@ jobs: env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.signingKey }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.signingPassword }} - ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.sonatypeUsername }} - ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.sonatypePassword }} \ No newline at end of file + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME_GEL }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD_GEL }} \ No newline at end of file diff --git a/README.md b/README.md index da0a1bbd..0683618c 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ The Java binding is distrubuted via maven central: #### Gradle ```groovy -implementation 'com.gel:driver:0.4.0' +implementation 'com.geldata:driver:0.4.0' ``` #### Maven ```xml - com.gel + com.geldata driver 0.4.0 @@ -36,7 +36,7 @@ implementation 'com.gel:driver:0.4.0' ```scala libraryDependencies ++= Seq( - "com.gel" % "driver" % "0.4.0" + "com.geldata" % "driver" % "0.4.0" ) ``` @@ -45,7 +45,7 @@ libraryDependencies ++= Seq( The `GelClientPool` class contains all the methods necessary to interact with the Gel database. ```java -import com.gel.driver.GelClientPool; +import com.geldata.driver.GelClientPool; void main() { var clientPool = new GelClientPool(); @@ -59,7 +59,7 @@ The `GelClientPool` uses `CompletionStage` for asynchronous operations, allowing to integrate it with your favorite asynchronous frameworks ```java -import com.gel.driver.GelClientPool; +import com.geldata.driver.GelClientPool; import reactor.core.publisher.Mono; void main() { @@ -75,7 +75,7 @@ This also means it plays nicely with other JVM language that support asynchronou ```kotlin -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool import kotlinx.coroutines.future.await import kotlinx.coroutines.runBlocking @@ -92,7 +92,7 @@ fun main() { ```scala -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool import scala.jdk.FutureConverters.* object Main extends App { diff --git a/build.gradle b/build.gradle index 4e80c84f..b905e1bd 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ ext { project_version = '0.4.0-SNAPSHOT' github_org = 'geldata' project_name = 'gel-java' - artifact_group = 'com.gel' + artifact_group = 'com.geldata' project_description = 'Java binding for Gel' project_url = "https://geldata.com" project_jdk = '11' @@ -103,7 +103,7 @@ allprojects { } subprojects { - archivesBaseName = "com.gel.$project.name" + archivesBaseName = "com.geldata.$project.name" tasks.withType(Javadoc).configureEach { title = "$archivesBaseName ${version} API" diff --git a/docs/datatypes.rst b/docs/datatypes.rst index e667ee09..0c97812f 100644 --- a/docs/datatypes.rst +++ b/docs/datatypes.rst @@ -13,7 +13,7 @@ The Java binding maps the following Gel types to corresponding JVM types: +------------------------------------+---------------------------------------------------------+ | :eql:type:`array` | ``T[]`` | +------------------------------------+---------------------------------------------------------+ -| :eql:type:`anytuple` | ``com.gel.driver.datatypes.Tuple`` | +| :eql:type:`anytuple` | ``com.geldata.driver.datatypes.Tuple`` | +------------------------------------+---------------------------------------------------------+ | :eql:type:`anyenum` | ``enum`` | +------------------------------------+---------------------------------------------------------+ @@ -31,7 +31,7 @@ The Java binding maps the following Gel types to corresponding JVM types: +------------------------------------+---------------------------------------------------------+ | :eql:type:`cal::local_datetime` | ``java.time.LocalDateTime`` | +------------------------------------+---------------------------------------------------------+ -| :eql:type:`cal::relative_duration` | ``com.gel.driver.datatypes.RelativeDuration`` [#f1]_ | +| :eql:type:`cal::relative_duration` | ``com.geldata.driver.datatypes.RelativeDuration`` [#f1]_| +------------------------------------+---------------------------------------------------------+ | :eql:type:`datetime` | ``java.time.OffsetDateTime`` [#f2]_ | +------------------------------------+---------------------------------------------------------+ @@ -51,11 +51,11 @@ The Java binding maps the following Gel types to corresponding JVM types: +------------------------------------+---------------------------------------------------------+ | :eql:type:`decimal` | ``java.math.BigDecimal`` | +------------------------------------+---------------------------------------------------------+ -| :eql:type:`json` | ``com.gel.driver.datatypes.Json`` | +| :eql:type:`json` | ``com.geldata.driver.datatypes.Json`` | +------------------------------------+---------------------------------------------------------+ | :eql:type:`uuid` | ``UUID`` | +------------------------------------+---------------------------------------------------------+ -| :eql:func:`range` | ``com.gel.driver.datatypes.Range`` | +| :eql:func:`range` | ``com.geldata.driver.datatypes.Range`` | +------------------------------------+---------------------------------------------------------+ .. [#f1] ``Period`` and ``Duration`` are implicitly diff --git a/docs/index.rst b/docs/index.rst index c042713a..2e135b88 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -33,14 +33,14 @@ project. :caption: Maven - com.gel + com.geldata driver .. code-tab:: groovy :caption: Gradle - implementation 'com.gel:driver' + implementation 'com.geldata:driver' Once you have the dependency added, you can start using the client. The following is a simple example of how to connect to an Gel instance and @@ -51,7 +51,7 @@ execute a query: .. code-tab:: java :caption: Futures - import com.gel.driver.GelClientPool; + import com.geldata.driver.GelClientPool; import java.util.concurrent.CompletableFuture; public class Main { @@ -67,7 +67,7 @@ execute a query: .. code-tab:: java :caption: Reactor - import com.gel.driver.GelClientPool; + import com.geldata.driver.GelClientPool; import reactor.core.publisher.Mono; public class Main { diff --git a/examples/java-examples/build.gradle b/examples/java-examples/build.gradle index 17a8d123..084f287c 100644 --- a/examples/java-examples/build.gradle +++ b/examples/java-examples/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' } -group 'com.gel' +group 'com.geldata' version '0.0.1-SNAPSHOT' repositories { diff --git a/examples/java-examples/src/main/java/com/gel/examples/AbstractTypes.java b/examples/java-examples/src/main/java/com/gel/examples/AbstractTypes.java index 7f8dd0d3..2fce5131 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/AbstractTypes.java +++ b/examples/java-examples/src/main/java/com/gel/examples/AbstractTypes.java @@ -1,10 +1,11 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelType; + import java.util.concurrent.CompletionStage; public class AbstractTypes implements Example { diff --git a/examples/java-examples/src/main/java/com/gel/examples/BasicQueryFunctions.java b/examples/java-examples/src/main/java/com/gel/examples/BasicQueryFunctions.java index ac235086..db101009 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/BasicQueryFunctions.java +++ b/examples/java-examples/src/main/java/com/gel/examples/BasicQueryFunctions.java @@ -1,9 +1,10 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; + import java.util.concurrent.CompletionStage; public final class BasicQueryFunctions implements Example { diff --git a/examples/java-examples/src/main/java/com/gel/examples/CustomDeserializer.java b/examples/java-examples/src/main/java/com/gel/examples/CustomDeserializer.java index f969764c..fedcf70b 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/CustomDeserializer.java +++ b/examples/java-examples/src/main/java/com/gel/examples/CustomDeserializer.java @@ -1,12 +1,13 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelDeserializer; -import com.gel.driver.annotations.GelName; -import com.gel.driver.annotations.GelType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelDeserializer; +import com.geldata.driver.annotations.GelName; +import com.geldata.driver.annotations.GelType; + import java.util.concurrent.CompletionStage; public final class CustomDeserializer implements Example { diff --git a/examples/java-examples/src/main/java/com/gel/examples/Example.java b/examples/java-examples/src/main/java/com/gel/examples/Example.java index e5679e53..ec1fa5e1 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/Example.java +++ b/examples/java-examples/src/main/java/com/gel/examples/Example.java @@ -1,9 +1,9 @@ -package com.gel.examples; - -import com.gel.driver.GelClientPool; +package com.geldata.examples; import java.util.concurrent.CompletionStage; +import com.geldata.driver.GelClientPool; + public interface Example { CompletionStage run(GelClientPool clientPool); } \ No newline at end of file diff --git a/examples/java-examples/src/main/java/com/gel/examples/GlobalsAndConfig.java b/examples/java-examples/src/main/java/com/gel/examples/GlobalsAndConfig.java index 247874f4..789c8afa 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/GlobalsAndConfig.java +++ b/examples/java-examples/src/main/java/com/gel/examples/GlobalsAndConfig.java @@ -1,9 +1,10 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; + import java.time.Duration; import java.util.HashMap; import java.util.UUID; diff --git a/examples/java-examples/src/main/java/com/gel/examples/JsonResults.java b/examples/java-examples/src/main/java/com/gel/examples/JsonResults.java index 1d1e06c3..94e5103c 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/JsonResults.java +++ b/examples/java-examples/src/main/java/com/gel/examples/JsonResults.java @@ -1,9 +1,10 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelType; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.json.JsonMapper; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelType; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/java-examples/src/main/java/com/gel/examples/LinkProperties.java b/examples/java-examples/src/main/java/com/gel/examples/LinkProperties.java index 2c63e045..865e1bda 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/LinkProperties.java +++ b/examples/java-examples/src/main/java/com/gel/examples/LinkProperties.java @@ -1,11 +1,12 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelLinkType; -import com.gel.driver.annotations.GelType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelLinkType; +import com.geldata.driver.annotations.GelType; + import java.util.Collection; import java.util.concurrent.CompletionStage; diff --git a/examples/java-examples/src/main/java/com/gel/examples/Main.java b/examples/java-examples/src/main/java/com/gel/examples/Main.java index cf4105a7..6eb08405 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/Main.java +++ b/examples/java-examples/src/main/java/com/gel/examples/Main.java @@ -1,11 +1,12 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.*; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.namingstrategies.NamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.*; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.namingstrategies.NamingStrategy; + import java.io.IOException; import java.util.ArrayList; import java.util.function.Supplier; diff --git a/examples/java-examples/src/main/java/com/gel/examples/QueryResults.java b/examples/java-examples/src/main/java/com/gel/examples/QueryResults.java index 6070c073..912f867e 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/QueryResults.java +++ b/examples/java-examples/src/main/java/com/gel/examples/QueryResults.java @@ -1,10 +1,11 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelType; + import java.util.concurrent.CompletionStage; public final class QueryResults implements Example { diff --git a/examples/java-examples/src/main/java/com/gel/examples/Transactions.java b/examples/java-examples/src/main/java/com/gel/examples/Transactions.java index 9ba55f64..baebbdd6 100644 --- a/examples/java-examples/src/main/java/com/gel/examples/Transactions.java +++ b/examples/java-examples/src/main/java/com/gel/examples/Transactions.java @@ -1,9 +1,10 @@ -package com.gel.examples; +package com.geldata.examples; -import com.gel.driver.GelClientPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientPool; + import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/examples/kotlin-examples/build.gradle b/examples/kotlin-examples/build.gradle index abda2a39..333aa418 100644 --- a/examples/kotlin-examples/build.gradle +++ b/examples/kotlin-examples/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.9.0-Beta' } -group 'com.gel' +group 'com.geldata' version '0.0.1-SNAPSHOT' repositories { diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/AbstractTypes.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/AbstractTypes.kt index fa05c0e7..560f5df6 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/AbstractTypes.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/AbstractTypes.kt @@ -1,7 +1,7 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool -import com.gel.driver.annotations.GelType +import com.geldata.driver.GelClientPool +import com.geldata.driver.annotations.GelType import kotlinx.coroutines.future.await import org.slf4j.LoggerFactory diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/BasicQueries.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/BasicQueries.kt index 0c06f77d..dea674c0 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/BasicQueries.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/BasicQueries.kt @@ -1,6 +1,6 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool import kotlinx.coroutines.future.await import org.slf4j.LoggerFactory diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/CustomDeserializer.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/CustomDeserializer.kt index 2c4fe9fb..a6060a08 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/CustomDeserializer.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/CustomDeserializer.kt @@ -1,9 +1,9 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool -import com.gel.driver.annotations.GelDeserializer -import com.gel.driver.annotations.GelName -import com.gel.driver.annotations.GelType +import com.geldata.driver.GelClientPool +import com.geldata.driver.annotations.GelDeserializer +import com.geldata.driver.annotations.GelName +import com.geldata.driver.annotations.GelType import kotlinx.coroutines.future.await import org.slf4j.LoggerFactory diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Example.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Example.kt index 3acc9c65..34534632 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Example.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Example.kt @@ -1,6 +1,6 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool interface Example { suspend fun runAsync(clientPool: GelClientPool) diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/GlobalsAndConfig.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/GlobalsAndConfig.kt index 1ed55198..434e7388 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/GlobalsAndConfig.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/GlobalsAndConfig.kt @@ -1,6 +1,6 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool import kotlinx.coroutines.future.await import org.slf4j.LoggerFactory import java.time.Duration diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/LinkProperties.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/LinkProperties.kt index ca3fc923..50a76765 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/LinkProperties.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/LinkProperties.kt @@ -1,8 +1,8 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool -import com.gel.driver.annotations.GelLinkType -import com.gel.driver.annotations.GelType +import com.geldata.driver.GelClientPool +import com.geldata.driver.annotations.GelLinkType +import com.geldata.driver.annotations.GelType import kotlinx.coroutines.future.await import org.slf4j.LoggerFactory diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Main.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Main.kt index 1df1905f..368af983 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Main.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Main.kt @@ -1,9 +1,9 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool -import com.gel.driver.GelClientConfig -import com.gel.driver.GelConnection -import com.gel.driver.namingstrategies.NamingStrategy +import com.geldata.driver.GelClientPool +import com.geldata.driver.GelClientConfig +import com.geldata.driver.GelConnection +import com.geldata.driver.namingstrategies.NamingStrategy import kotlinx.coroutines.runBlocking import org.slf4j.LoggerFactory import kotlin.system.exitProcess diff --git a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Transactions.kt b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Transactions.kt index fe1c72fa..eefb6d5f 100644 --- a/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Transactions.kt +++ b/examples/kotlin-examples/src/main/kotlin/com/gel/examples/Transactions.kt @@ -1,6 +1,6 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool import kotlinx.coroutines.future.await import org.slf4j.LoggerFactory diff --git a/examples/scala-examples/build.sbt b/examples/scala-examples/build.sbt index 254343fa..c69f70ed 100644 --- a/examples/scala-examples/build.sbt +++ b/examples/scala-examples/build.sbt @@ -3,7 +3,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / scalaVersion := "3.1.3" libraryDependencies ++= Seq( - "com.gel" % "driver" % "0.4.0" from "file:///" + System.getProperty("user.dir") + "/lib/com.gel.driver-0.4.0.jar", + "com.geldata" % "driver" % "0.4.0" from "file:///" + System.getProperty("user.dir") + "/lib/com.geldata.driver-0.4.0.jar", "ch.qos.logback" % "logback-classic" % "1.4.7", "ch.qos.logback" % "logback-core" % "1.4.7", "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.1", @@ -15,5 +15,5 @@ libraryDependencies ++= Seq( lazy val root = (project in file(".")) .settings( name := "scala-examples", - idePackagePrefix := Some("com.gel.examples") + idePackagePrefix := Some("com.geldata.examples") ) diff --git a/examples/scala-examples/src/main/scala/AbstractTypes.scala b/examples/scala-examples/src/main/scala/AbstractTypes.scala index 18da0e5e..c5c99a35 100644 --- a/examples/scala-examples/src/main/scala/AbstractTypes.scala +++ b/examples/scala-examples/src/main/scala/AbstractTypes.scala @@ -1,7 +1,7 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool -import com.gel.driver.annotations.GelType +import com.geldata.driver.GelClientPool +import com.geldata.driver.annotations.GelType import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/examples/scala-examples/src/main/scala/BasicQueryFunctions.scala b/examples/scala-examples/src/main/scala/BasicQueryFunctions.scala index ba43c594..59dcb0c8 100644 --- a/examples/scala-examples/src/main/scala/BasicQueryFunctions.scala +++ b/examples/scala-examples/src/main/scala/BasicQueryFunctions.scala @@ -1,5 +1,5 @@ -package com.gel.examples -import com.gel.driver.GelClientPool +package com.geldata.examples +import com.geldata.driver.GelClientPool import org.slf4j.LoggerFactory import scala.concurrent.{ExecutionContext, Future} diff --git a/examples/scala-examples/src/main/scala/CustomDeserializer.scala b/examples/scala-examples/src/main/scala/CustomDeserializer.scala index ebd0797c..37897638 100644 --- a/examples/scala-examples/src/main/scala/CustomDeserializer.scala +++ b/examples/scala-examples/src/main/scala/CustomDeserializer.scala @@ -1,6 +1,6 @@ -package com.gel.examples -import com.gel.driver.GelClientPool -import com.gel.driver.annotations.{GelDeserializer, GelName, GelType} +package com.geldata.examples +import com.geldata.driver.GelClientPool +import com.geldata.driver.annotations.{GelDeserializer, GelName, GelType} import org.slf4j.LoggerFactory import scala.concurrent.{ExecutionContext, Future} diff --git a/examples/scala-examples/src/main/scala/Example.scala b/examples/scala-examples/src/main/scala/Example.scala index fc2e721e..09244b86 100644 --- a/examples/scala-examples/src/main/scala/Example.scala +++ b/examples/scala-examples/src/main/scala/Example.scala @@ -1,7 +1,7 @@ -package com.gel.examples +package com.geldata.examples import scala.concurrent.{ExecutionContext, Future} -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool trait Example { def run(clientPool: GelClientPool)(implicit context: ExecutionContext): Future[Unit]; diff --git a/examples/scala-examples/src/main/scala/GlobalsAndConfig.scala b/examples/scala-examples/src/main/scala/GlobalsAndConfig.scala index ca71d009..6e712dda 100644 --- a/examples/scala-examples/src/main/scala/GlobalsAndConfig.scala +++ b/examples/scala-examples/src/main/scala/GlobalsAndConfig.scala @@ -1,8 +1,8 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.GelClientPool +import com.geldata.driver.GelClientPool import io.netty.util.internal.shaded.org.jctools.queues.MessagePassingQueue.Consumer -import com.gel.driver.state.Config +import com.geldata.driver.state.Config import org.slf4j.LoggerFactory import java.time.Duration diff --git a/examples/scala-examples/src/main/scala/LinkProperties.scala b/examples/scala-examples/src/main/scala/LinkProperties.scala index c10e2a08..f4e72efa 100644 --- a/examples/scala-examples/src/main/scala/LinkProperties.scala +++ b/examples/scala-examples/src/main/scala/LinkProperties.scala @@ -1,6 +1,6 @@ -package com.gel.examples -import com.gel.driver.GelClientPool -import com.gel.driver.annotations.{GelLinkType, GelType} +package com.geldata.examples +import com.geldata.driver.GelClientPool +import com.geldata.driver.annotations.{GelLinkType, GelType} import org.slf4j.LoggerFactory import java.util diff --git a/examples/scala-examples/src/main/scala/Main.scala b/examples/scala-examples/src/main/scala/Main.scala index 375c7253..f4e20a50 100644 --- a/examples/scala-examples/src/main/scala/Main.scala +++ b/examples/scala-examples/src/main/scala/Main.scala @@ -1,7 +1,7 @@ -package com.gel.examples +package com.geldata.examples -import com.gel.driver.namingstrategies.NamingStrategy -import com.gel.driver.{GelClientPool, GelClientConfig, Transaction} +import com.geldata.driver.namingstrategies.NamingStrategy +import com.geldata.driver.{GelClientPool, GelClientConfig, Transaction} import org.slf4j.{Logger, LoggerFactory} import scala.concurrent.duration.Duration diff --git a/examples/scala-examples/src/main/scala/Transactions.scala b/examples/scala-examples/src/main/scala/Transactions.scala index d772185a..fef296ca 100644 --- a/examples/scala-examples/src/main/scala/Transactions.scala +++ b/examples/scala-examples/src/main/scala/Transactions.scala @@ -1,5 +1,5 @@ -package com.gel.examples -import com.gel.driver.{GelClientPool, Transaction} +package com.geldata.examples +import com.geldata.driver.{GelClientPool, Transaction} import org.slf4j.LoggerFactory import scala.jdk.FutureConverters.* diff --git a/src/driver/build.gradle b/src/driver/build.gradle index 4c750c60..2c3866bb 100644 --- a/src/driver/build.gradle +++ b/src/driver/build.gradle @@ -29,13 +29,13 @@ jar { manifest { attributes 'Implementation-Title': archivesBaseName, 'Implementation-Version': archiveVersion, - 'Automatic-Module-Name': 'com.gel.driver' + 'Automatic-Module-Name': 'com.geldata.driver' } } def deleteOldJar = tasks.register('deleteOldJarInBin') { var path = Paths.get(project.rootDir.toString(), 'examples', 'scala-examples', 'lib') - var paths = path.toFile().listFiles((FileFilter) { File f -> f.name.startsWith('com.gel.driver') }) + var paths = path.toFile().listFiles((FileFilter) { File f -> f.name.startsWith('com.geldata.driver') }) delete files(paths) } diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/ScalarCodec.java b/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/ScalarCodec.java deleted file mode 100644 index 625fe5eb..00000000 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/ScalarCodec.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.gel.driver.binary.codecs.scalars; - -import com.gel.driver.binary.codecs.Codec; - -public interface ScalarCodec extends Codec { -} diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/visitors/CodecVisitor.java b/src/driver/src/main/java/com/gel/driver/binary/codecs/visitors/CodecVisitor.java deleted file mode 100644 index e4df9f44..00000000 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/visitors/CodecVisitor.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.gel.driver.binary.codecs.visitors; - -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.exceptions.GelException; - -@FunctionalInterface -public interface CodecVisitor { - Codec visit(Codec codec) throws GelException; -} diff --git a/src/driver/src/main/java/com/gel/driver/Capabilities.java b/src/driver/src/main/java/com/geldata/driver/Capabilities.java similarity index 87% rename from src/driver/src/main/java/com/gel/driver/Capabilities.java rename to src/driver/src/main/java/com/geldata/driver/Capabilities.java index a6e5ff83..2a35f30e 100644 --- a/src/driver/src/main/java/com/gel/driver/Capabilities.java +++ b/src/driver/src/main/java/com/geldata/driver/Capabilities.java @@ -1,8 +1,9 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum Capabilities implements BinaryEnum { READ_ONLY (0), MODIFICATIONS (1), diff --git a/src/driver/src/main/java/com/gel/driver/ClientType.java b/src/driver/src/main/java/com/geldata/driver/ClientType.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/ClientType.java rename to src/driver/src/main/java/com/geldata/driver/ClientType.java index 6e03e16e..a942ee37 100644 --- a/src/driver/src/main/java/com/gel/driver/ClientType.java +++ b/src/driver/src/main/java/com/geldata/driver/ClientType.java @@ -1,4 +1,4 @@ -package com.gel.driver; +package com.geldata.driver; /** * An enum specifying the client type to use within a client pool. diff --git a/src/driver/src/main/java/com/gel/driver/ConnectionRetryMode.java b/src/driver/src/main/java/com/geldata/driver/ConnectionRetryMode.java similarity index 91% rename from src/driver/src/main/java/com/gel/driver/ConnectionRetryMode.java rename to src/driver/src/main/java/com/geldata/driver/ConnectionRetryMode.java index 1ab69359..1c737d4e 100644 --- a/src/driver/src/main/java/com/gel/driver/ConnectionRetryMode.java +++ b/src/driver/src/main/java/com/geldata/driver/ConnectionRetryMode.java @@ -1,4 +1,4 @@ -package com.gel.driver; +package com.geldata.driver; /** * An enum that specifies retry behavior for retryable errors when connecting to Gel. diff --git a/src/driver/src/main/java/com/gel/driver/ErrorCode.java b/src/driver/src/main/java/com/geldata/driver/ErrorCode.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/ErrorCode.java rename to src/driver/src/main/java/com/geldata/driver/ErrorCode.java index b424a342..308562b6 100644 --- a/src/driver/src/main/java/com/gel/driver/ErrorCode.java +++ b/src/driver/src/main/java/com/geldata/driver/ErrorCode.java @@ -1,11 +1,12 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + /** * Represents different possible error codes returned by Gel. - * @see com.gel.driver.exceptions.GelErrorException + * @see com.geldata.driver.exceptions.GelErrorException */ public enum ErrorCode implements BinaryEnum { INTERNAL_SERVER_ERROR (0x01_00_00_00), diff --git a/src/driver/src/main/java/com/gel/driver/ErrorSeverity.java b/src/driver/src/main/java/com/geldata/driver/ErrorSeverity.java similarity index 75% rename from src/driver/src/main/java/com/gel/driver/ErrorSeverity.java rename to src/driver/src/main/java/com/geldata/driver/ErrorSeverity.java index 6db40615..d0c0ffae 100644 --- a/src/driver/src/main/java/com/gel/driver/ErrorSeverity.java +++ b/src/driver/src/main/java/com/geldata/driver/ErrorSeverity.java @@ -1,11 +1,12 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + /** * Represents the error severity for an error returned by Gel - * @see com.gel.driver.exceptions.GelErrorException + * @see com.geldata.driver.exceptions.GelErrorException */ public enum ErrorSeverity implements BinaryEnum { ERROR (0x78), diff --git a/src/driver/src/main/java/com/gel/driver/GelClientConfig.java b/src/driver/src/main/java/com/geldata/driver/GelClientConfig.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/GelClientConfig.java rename to src/driver/src/main/java/com/geldata/driver/GelClientConfig.java index e8ead96f..2f6cb902 100644 --- a/src/driver/src/main/java/com/gel/driver/GelClientConfig.java +++ b/src/driver/src/main/java/com/geldata/driver/GelClientConfig.java @@ -1,8 +1,9 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.namingstrategies.NamingStrategy; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.namingstrategies.NamingStrategy; + import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.concurrent.TimeUnit; diff --git a/src/driver/src/main/java/com/gel/driver/GelClientPool.java b/src/driver/src/main/java/com/geldata/driver/GelClientPool.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/GelClientPool.java rename to src/driver/src/main/java/com/geldata/driver/GelClientPool.java index bbf1cd7a..7fc28b2f 100644 --- a/src/driver/src/main/java/com/gel/driver/GelClientPool.java +++ b/src/driver/src/main/java/com/geldata/driver/GelClientPool.java @@ -1,18 +1,21 @@ -package com.gel.driver; - -import com.gel.driver.abstractions.ClientQueryDelegate; -import com.gel.driver.clients.*; -import com.gel.driver.datatypes.Json; -import com.gel.driver.exceptions.ConfigurationException; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.state.Config; -import com.gel.driver.state.Session; -import com.gel.driver.util.ClientPoolHolder; +package com.geldata.driver; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.abstractions.ClientQueryDelegate; +import com.geldata.driver.clients.*; +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.exceptions.ConfigurationException; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.state.Config; +import com.geldata.driver.state.Session; +import com.geldata.driver.util.ClientPoolHolder; + +import static com.geldata.driver.util.ComposableUtil.composeWith; + import java.io.IOException; import java.time.Duration; import java.time.Instant; @@ -28,8 +31,6 @@ import java.util.function.Consumer; import java.util.function.Function; -import static com.gel.driver.util.ComposableUtil.composeWith; - /** * Represents a client pool used to interact with Gel. */ diff --git a/src/driver/src/main/java/com/gel/driver/GelConnection.java b/src/driver/src/main/java/com/geldata/driver/GelConnection.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/GelConnection.java rename to src/driver/src/main/java/com/geldata/driver/GelConnection.java index 58b9cf35..8f2c62c4 100644 --- a/src/driver/src/main/java/com/gel/driver/GelConnection.java +++ b/src/driver/src/main/java/com/geldata/driver/GelConnection.java @@ -1,14 +1,5 @@ -package com.gel.driver; - -import com.gel.driver.abstractions.SystemProvider; -import com.gel.driver.abstractions.SystemProvider.GelEnvVar; -import com.gel.driver.datatypes.internal.CloudProfile; -import com.gel.driver.exceptions.ConfigurationException; -import com.gel.driver.util.*; -import com.gel.driver.util.ConfigUtils.ConnectionCredentials; -import com.gel.driver.util.ConfigUtils.DatabaseOrBranch; -import com.gel.driver.util.ConfigUtils.ResolvedField; -import com.gel.driver.util.ConfigUtils.ResolvedFields; +package com.geldata.driver; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; @@ -16,6 +7,16 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.json.JsonMapper; +import com.geldata.driver.abstractions.SystemProvider; +import com.geldata.driver.abstractions.SystemProvider.GelEnvVar; +import com.geldata.driver.datatypes.internal.CloudProfile; +import com.geldata.driver.exceptions.ConfigurationException; +import com.geldata.driver.util.*; +import com.geldata.driver.util.ConfigUtils.ConnectionCredentials; +import com.geldata.driver.util.ConfigUtils.DatabaseOrBranch; +import com.geldata.driver.util.ConfigUtils.ResolvedField; +import com.geldata.driver.util.ConfigUtils.ResolvedFields; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/com/gel/driver/GelQueryable.java b/src/driver/src/main/java/com/geldata/driver/GelQueryable.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/GelQueryable.java rename to src/driver/src/main/java/com/geldata/driver/GelQueryable.java index 02dc0888..c5bae95a 100644 --- a/src/driver/src/main/java/com/gel/driver/GelQueryable.java +++ b/src/driver/src/main/java/com/geldata/driver/GelQueryable.java @@ -1,10 +1,11 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.datatypes.Json; -import com.gel.driver.exceptions.ResultCardinalityMismatchException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.exceptions.ResultCardinalityMismatchException; + import java.util.EnumSet; import java.util.List; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/LogSeverity.java b/src/driver/src/main/java/com/geldata/driver/LogSeverity.java similarity index 85% rename from src/driver/src/main/java/com/gel/driver/LogSeverity.java rename to src/driver/src/main/java/com/geldata/driver/LogSeverity.java index 9307d4a2..32fc09a3 100644 --- a/src/driver/src/main/java/com/gel/driver/LogSeverity.java +++ b/src/driver/src/main/java/com/geldata/driver/LogSeverity.java @@ -1,8 +1,9 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + /** * Represents the message severity within a log message sent by the server. */ diff --git a/src/driver/src/main/java/com/gel/driver/ObjectEnumerator.java b/src/driver/src/main/java/com/geldata/driver/ObjectEnumerator.java similarity index 95% rename from src/driver/src/main/java/com/gel/driver/ObjectEnumerator.java rename to src/driver/src/main/java/com/geldata/driver/ObjectEnumerator.java index 05b287ad..fd30afda 100644 --- a/src/driver/src/main/java/com/gel/driver/ObjectEnumerator.java +++ b/src/driver/src/main/java/com/geldata/driver/ObjectEnumerator.java @@ -1,9 +1,10 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/TLSSecurityMode.java b/src/driver/src/main/java/com/geldata/driver/TLSSecurityMode.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/TLSSecurityMode.java rename to src/driver/src/main/java/com/geldata/driver/TLSSecurityMode.java index 9b5511b7..f7c6e664 100644 --- a/src/driver/src/main/java/com/gel/driver/TLSSecurityMode.java +++ b/src/driver/src/main/java/com/geldata/driver/TLSSecurityMode.java @@ -1,4 +1,4 @@ -package com.gel.driver; +package com.geldata.driver; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/Transaction.java b/src/driver/src/main/java/com/geldata/driver/Transaction.java similarity index 89% rename from src/driver/src/main/java/com/gel/driver/Transaction.java rename to src/driver/src/main/java/com/geldata/driver/Transaction.java index 714386cc..b42915d4 100644 --- a/src/driver/src/main/java/com/gel/driver/Transaction.java +++ b/src/driver/src/main/java/com/geldata/driver/Transaction.java @@ -1,4 +1,4 @@ -package com.gel.driver; +package com.geldata.driver; /** * Represents a generic transaction. diff --git a/src/driver/src/main/java/com/gel/driver/TransactionIsolation.java b/src/driver/src/main/java/com/geldata/driver/TransactionIsolation.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/TransactionIsolation.java rename to src/driver/src/main/java/com/geldata/driver/TransactionIsolation.java index 2594bd24..5322ae4b 100644 --- a/src/driver/src/main/java/com/gel/driver/TransactionIsolation.java +++ b/src/driver/src/main/java/com/geldata/driver/TransactionIsolation.java @@ -1,4 +1,4 @@ -package com.gel.driver; +package com.geldata.driver; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/TransactionSettings.java b/src/driver/src/main/java/com/geldata/driver/TransactionSettings.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/TransactionSettings.java rename to src/driver/src/main/java/com/geldata/driver/TransactionSettings.java index 14d35385..774d6dab 100644 --- a/src/driver/src/main/java/com/gel/driver/TransactionSettings.java +++ b/src/driver/src/main/java/com/geldata/driver/TransactionSettings.java @@ -1,4 +1,4 @@ -package com.gel.driver; +package com.geldata.driver; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/TransactionState.java b/src/driver/src/main/java/com/geldata/driver/TransactionState.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/TransactionState.java rename to src/driver/src/main/java/com/geldata/driver/TransactionState.java index 43850a76..5e7456c8 100644 --- a/src/driver/src/main/java/com/gel/driver/TransactionState.java +++ b/src/driver/src/main/java/com/geldata/driver/TransactionState.java @@ -1,8 +1,9 @@ -package com.gel.driver; +package com.geldata.driver; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + import java.util.HashMap; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/abstractions/ClientQueryDelegate.java b/src/driver/src/main/java/com/geldata/driver/abstractions/ClientQueryDelegate.java similarity index 71% rename from src/driver/src/main/java/com/gel/driver/abstractions/ClientQueryDelegate.java rename to src/driver/src/main/java/com/geldata/driver/abstractions/ClientQueryDelegate.java index 9679e701..ab33cd52 100644 --- a/src/driver/src/main/java/com/gel/driver/abstractions/ClientQueryDelegate.java +++ b/src/driver/src/main/java/com/geldata/driver/abstractions/ClientQueryDelegate.java @@ -1,12 +1,12 @@ -package com.gel.driver.abstractions; - -import com.gel.driver.Capabilities; -import com.gel.driver.GelQueryable; +package com.geldata.driver.abstractions; import java.util.EnumSet; import java.util.Map; import java.util.concurrent.CompletionStage; +import com.geldata.driver.Capabilities; +import com.geldata.driver.GelQueryable; + @FunctionalInterface public interface ClientQueryDelegate { CompletionStage run(GelQueryable client, Class cls, String query, Map args, EnumSet capabilities); diff --git a/src/driver/src/main/java/com/gel/driver/abstractions/OSType.java b/src/driver/src/main/java/com/geldata/driver/abstractions/OSType.java similarity index 62% rename from src/driver/src/main/java/com/gel/driver/abstractions/OSType.java rename to src/driver/src/main/java/com/geldata/driver/abstractions/OSType.java index c7699a70..cb5fcf46 100644 --- a/src/driver/src/main/java/com/gel/driver/abstractions/OSType.java +++ b/src/driver/src/main/java/com/geldata/driver/abstractions/OSType.java @@ -1,4 +1,4 @@ -package com.gel.driver.abstractions; +package com.geldata.driver.abstractions; public enum OSType { WINDOWS, diff --git a/src/driver/src/main/java/com/gel/driver/abstractions/QueryDelegate.java b/src/driver/src/main/java/com/geldata/driver/abstractions/QueryDelegate.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/abstractions/QueryDelegate.java rename to src/driver/src/main/java/com/geldata/driver/abstractions/QueryDelegate.java index 70f18fae..3230bc4f 100644 --- a/src/driver/src/main/java/com/gel/driver/abstractions/QueryDelegate.java +++ b/src/driver/src/main/java/com/geldata/driver/abstractions/QueryDelegate.java @@ -1,11 +1,11 @@ -package com.gel.driver.abstractions; - -import com.gel.driver.Capabilities; +package com.geldata.driver.abstractions; import java.util.EnumSet; import java.util.Map; import java.util.concurrent.CompletionStage; +import com.geldata.driver.Capabilities; + @FunctionalInterface public interface QueryDelegate { CompletionStage run(Class cls, String query, Map args, EnumSet capabilities); diff --git a/src/driver/src/main/java/com/gel/driver/abstractions/SystemProvider.java b/src/driver/src/main/java/com/geldata/driver/abstractions/SystemProvider.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/abstractions/SystemProvider.java rename to src/driver/src/main/java/com/geldata/driver/abstractions/SystemProvider.java index 5fe9879f..cb0de93e 100644 --- a/src/driver/src/main/java/com/gel/driver/abstractions/SystemProvider.java +++ b/src/driver/src/main/java/com/geldata/driver/abstractions/SystemProvider.java @@ -1,4 +1,4 @@ -package com.gel.driver.abstractions; +package com.geldata.driver.abstractions; import java.io.IOException; import java.nio.file.Path; diff --git a/src/driver/src/main/java/com/gel/driver/annotations/GelDeserializer.java b/src/driver/src/main/java/com/geldata/driver/annotations/GelDeserializer.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/annotations/GelDeserializer.java rename to src/driver/src/main/java/com/geldata/driver/annotations/GelDeserializer.java index 0b35c794..50680d6a 100644 --- a/src/driver/src/main/java/com/gel/driver/annotations/GelDeserializer.java +++ b/src/driver/src/main/java/com/geldata/driver/annotations/GelDeserializer.java @@ -1,4 +1,4 @@ -package com.gel.driver.annotations; +package com.geldata.driver.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/driver/src/main/java/com/gel/driver/annotations/GelIgnore.java b/src/driver/src/main/java/com/geldata/driver/annotations/GelIgnore.java similarity index 84% rename from src/driver/src/main/java/com/gel/driver/annotations/GelIgnore.java rename to src/driver/src/main/java/com/geldata/driver/annotations/GelIgnore.java index 70f8f39c..9adb981c 100644 --- a/src/driver/src/main/java/com/gel/driver/annotations/GelIgnore.java +++ b/src/driver/src/main/java/com/geldata/driver/annotations/GelIgnore.java @@ -1,4 +1,4 @@ -package com.gel.driver.annotations; +package com.geldata.driver.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/driver/src/main/java/com/gel/driver/annotations/GelLinkType.java b/src/driver/src/main/java/com/geldata/driver/annotations/GelLinkType.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/annotations/GelLinkType.java rename to src/driver/src/main/java/com/geldata/driver/annotations/GelLinkType.java index 2b7e73d3..18948314 100644 --- a/src/driver/src/main/java/com/gel/driver/annotations/GelLinkType.java +++ b/src/driver/src/main/java/com/geldata/driver/annotations/GelLinkType.java @@ -1,4 +1,4 @@ -package com.gel.driver.annotations; +package com.geldata.driver.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/driver/src/main/java/com/gel/driver/annotations/GelName.java b/src/driver/src/main/java/com/geldata/driver/annotations/GelName.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/annotations/GelName.java rename to src/driver/src/main/java/com/geldata/driver/annotations/GelName.java index c9c19a27..4c0bd776 100644 --- a/src/driver/src/main/java/com/gel/driver/annotations/GelName.java +++ b/src/driver/src/main/java/com/geldata/driver/annotations/GelName.java @@ -1,4 +1,4 @@ -package com.gel.driver.annotations; +package com.geldata.driver.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/driver/src/main/java/com/gel/driver/annotations/GelType.java b/src/driver/src/main/java/com/geldata/driver/annotations/GelType.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/annotations/GelType.java rename to src/driver/src/main/java/com/geldata/driver/annotations/GelType.java index d04ac0b6..f2b41912 100644 --- a/src/driver/src/main/java/com/gel/driver/annotations/GelType.java +++ b/src/driver/src/main/java/com/geldata/driver/annotations/GelType.java @@ -1,4 +1,4 @@ -package com.gel.driver.annotations; +package com.geldata.driver.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/driver/src/main/java/com/gel/driver/async/AsyncEvent.java b/src/driver/src/main/java/com/geldata/driver/async/AsyncEvent.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/async/AsyncEvent.java rename to src/driver/src/main/java/com/geldata/driver/async/AsyncEvent.java index 248d0650..13f2dfa5 100644 --- a/src/driver/src/main/java/com/gel/driver/async/AsyncEvent.java +++ b/src/driver/src/main/java/com/geldata/driver/async/AsyncEvent.java @@ -1,4 +1,4 @@ -package com.gel.driver.async; +package com.geldata.driver.async; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/async/ChannelCompletableFuture.java b/src/driver/src/main/java/com/geldata/driver/async/ChannelCompletableFuture.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/async/ChannelCompletableFuture.java rename to src/driver/src/main/java/com/geldata/driver/async/ChannelCompletableFuture.java index 2ba279be..88441d1a 100644 --- a/src/driver/src/main/java/com/gel/driver/async/ChannelCompletableFuture.java +++ b/src/driver/src/main/java/com/geldata/driver/async/ChannelCompletableFuture.java @@ -1,4 +1,4 @@ -package com.gel.driver.async; +package com.geldata.driver.async; import io.netty.channel.ChannelFuture; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/binary/BinaryEnum.java b/src/driver/src/main/java/com/geldata/driver/binary/BinaryEnum.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/BinaryEnum.java rename to src/driver/src/main/java/com/geldata/driver/binary/BinaryEnum.java index 424cda74..dd21643d 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/BinaryEnum.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/BinaryEnum.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary; +package com.geldata.driver.binary; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public interface BinaryEnum extends SerializableData { diff --git a/src/driver/src/main/java/com/gel/driver/binary/PacketReader.java b/src/driver/src/main/java/com/geldata/driver/binary/PacketReader.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/binary/PacketReader.java rename to src/driver/src/main/java/com/geldata/driver/binary/PacketReader.java index 32f71ad5..7f370173 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/PacketReader.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/PacketReader.java @@ -1,7 +1,5 @@ -package com.gel.driver.binary; +package com.geldata.driver.binary; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.binary.protocol.common.KeyValue; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -11,6 +9,9 @@ import org.joou.ULong; import org.joou.UShort; +import com.geldata.driver.binary.protocol.common.Annotation; +import com.geldata.driver.binary.protocol.common.KeyValue; + import java.lang.reflect.Array; import java.nio.charset.StandardCharsets; import java.util.EnumSet; diff --git a/src/driver/src/main/java/com/gel/driver/binary/PacketSerializer.java b/src/driver/src/main/java/com/geldata/driver/binary/PacketSerializer.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/binary/PacketSerializer.java rename to src/driver/src/main/java/com/geldata/driver/binary/PacketSerializer.java index a1a6a329..428aa266 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/PacketSerializer.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/PacketSerializer.java @@ -1,12 +1,5 @@ -package com.gel.driver.binary; - -import com.gel.driver.binary.protocol.ServerMessageType; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.ConnectionFailedException; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.util.HexUtils; +package com.geldata.driver.binary; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; @@ -18,6 +11,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.ConnectionFailedException; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.util.HexUtils; + import javax.naming.OperationNotSupportedException; import java.net.http.HttpResponse; import java.nio.ByteBuffer; diff --git a/src/driver/src/main/java/com/gel/driver/binary/PacketWriter.java b/src/driver/src/main/java/com/geldata/driver/binary/PacketWriter.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/binary/PacketWriter.java rename to src/driver/src/main/java/com/geldata/driver/binary/PacketWriter.java index 9f48be3c..b0bd7971 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/PacketWriter.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/PacketWriter.java @@ -1,8 +1,5 @@ -package com.gel.driver.binary; +package com.geldata.driver.binary; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.util.BinaryProtocolUtils; -import com.gel.driver.util.TypeUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.jetbrains.annotations.NotNull; @@ -12,15 +9,20 @@ import org.joou.ULong; import org.joou.UShort; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.util.BinaryProtocolUtils; +import com.geldata.driver.util.TypeUtils; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.BinaryProtocolUtils.*; + import java.nio.charset.StandardCharsets; import java.util.EnumSet; import java.util.HashMap; import java.util.UUID; import java.util.function.BiFunction; -import static com.gel.driver.util.BinaryProtocolUtils.*; - public class PacketWriter implements AutoCloseable { private ByteBuf buffer; private final boolean isDynamic; diff --git a/src/driver/src/main/java/com/gel/driver/binary/SerializableData.java b/src/driver/src/main/java/com/geldata/driver/binary/SerializableData.java similarity index 84% rename from src/driver/src/main/java/com/gel/driver/binary/SerializableData.java rename to src/driver/src/main/java/com/geldata/driver/binary/SerializableData.java index c0f626f4..1718c4b2 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/SerializableData.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/SerializableData.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary; +package com.geldata.driver.binary; import javax.naming.OperationNotSupportedException; diff --git a/src/driver/src/main/java/com/gel/driver/binary/builders/CodecBuilder.java b/src/driver/src/main/java/com/geldata/driver/binary/builders/CodecBuilder.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/binary/builders/CodecBuilder.java rename to src/driver/src/main/java/com/geldata/driver/binary/builders/CodecBuilder.java index 3998f609..7d21ac21 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/builders/CodecBuilder.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/builders/CodecBuilder.java @@ -1,26 +1,27 @@ -package com.gel.driver.binary.builders; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.codecs.NullCodec; -import com.gel.driver.binary.codecs.scalars.*; -import com.gel.driver.binary.codecs.scalars.complex.DateTimeCodec; -import com.gel.driver.binary.codecs.scalars.complex.RelativeDurationCodec; -import com.gel.driver.binary.protocol.ProtocolProvider; -import com.gel.driver.binary.protocol.ProtocolVersion; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.IOFormat; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.MissingCodecException; +package com.geldata.driver.binary.builders; + import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.codecs.NullCodec; +import com.geldata.driver.binary.codecs.scalars.*; +import com.geldata.driver.binary.codecs.scalars.complex.DateTimeCodec; +import com.geldata.driver.binary.codecs.scalars.complex.RelativeDurationCodec; +import com.geldata.driver.binary.protocol.ProtocolProvider; +import com.geldata.driver.binary.protocol.ProtocolVersion; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.IOFormat; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.MissingCodecException; + import javax.naming.OperationNotSupportedException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/driver/src/main/java/com/gel/driver/binary/builders/ObjectBuilder.java b/src/driver/src/main/java/com/geldata/driver/binary/builders/ObjectBuilder.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/binary/builders/ObjectBuilder.java rename to src/driver/src/main/java/com/geldata/driver/binary/builders/ObjectBuilder.java index 90c6db8c..a572077e 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/builders/ObjectBuilder.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/builders/ObjectBuilder.java @@ -1,17 +1,18 @@ -package com.gel.driver.binary.builders; - -import com.gel.driver.binary.builders.types.TypeBuilder; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.codecs.ObjectCodec; -import com.gel.driver.binary.codecs.visitors.TypeVisitor; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.NoTypeConverterException; -import com.gel.driver.util.TypeUtils; +package com.geldata.driver.binary.builders; + import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.builders.types.TypeBuilder; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.codecs.ObjectCodec; +import com.geldata.driver.binary.codecs.visitors.TypeVisitor; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.NoTypeConverterException; +import com.geldata.driver.util.TypeUtils; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.InvocationTargetException; import java.util.*; diff --git a/src/driver/src/main/java/com/gel/driver/binary/builders/TypeDeserializerFactory.java b/src/driver/src/main/java/com/geldata/driver/binary/builders/TypeDeserializerFactory.java similarity index 84% rename from src/driver/src/main/java/com/gel/driver/binary/builders/TypeDeserializerFactory.java rename to src/driver/src/main/java/com/geldata/driver/binary/builders/TypeDeserializerFactory.java index 37d5fa5a..5870c39b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/builders/TypeDeserializerFactory.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/builders/TypeDeserializerFactory.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.builders; +package com.geldata.driver.binary.builders; -import com.gel.driver.ObjectEnumerator; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.ObjectEnumerator; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; @FunctionalInterface diff --git a/src/driver/src/main/java/com/gel/driver/binary/builders/internal/ObjectEnumeratorImpl.java b/src/driver/src/main/java/com/geldata/driver/binary/builders/internal/ObjectEnumeratorImpl.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/builders/internal/ObjectEnumeratorImpl.java rename to src/driver/src/main/java/com/geldata/driver/binary/builders/internal/ObjectEnumeratorImpl.java index 79ef350a..948ac6bc 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/builders/internal/ObjectEnumeratorImpl.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/builders/internal/ObjectEnumeratorImpl.java @@ -1,20 +1,22 @@ -package com.gel.driver.binary.builders.internal; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.ObjectEnumerator; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.codecs.ObjectCodec; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.builders.internal; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.ObjectEnumerator; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.codecs.ObjectCodec; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.BinaryProtocolUtils.INT_SIZE; + import java.util.HashMap; import java.util.Map; -import static com.gel.driver.util.BinaryProtocolUtils.INT_SIZE; - public final class ObjectEnumeratorImpl implements ObjectEnumerator { private final @NotNull PacketReader reader; private final CodecContext context; diff --git a/src/driver/src/main/java/com/gel/driver/binary/builders/types/TypeBuilder.java b/src/driver/src/main/java/com/geldata/driver/binary/builders/types/TypeBuilder.java similarity index 84% rename from src/driver/src/main/java/com/gel/driver/binary/builders/types/TypeBuilder.java rename to src/driver/src/main/java/com/geldata/driver/binary/builders/types/TypeBuilder.java index 7143948c..7e897431 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/builders/types/TypeBuilder.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/builders/types/TypeBuilder.java @@ -1,16 +1,17 @@ -package com.gel.driver.binary.builders.types; - -import com.gel.driver.annotations.GelType; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.codecs.ObjectCodec; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.datatypes.Tuple; -import com.gel.driver.datatypes.internal.TupleImpl; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.builders.types; + import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.annotations.GelType; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.codecs.ObjectCodec; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.datatypes.Tuple; +import com.geldata.driver.datatypes.internal.TupleImpl; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/driver/src/main/java/com/gel/driver/binary/builders/types/TypeDeserializerInfo.java b/src/driver/src/main/java/com/geldata/driver/binary/builders/types/TypeDeserializerInfo.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/binary/builders/types/TypeDeserializerInfo.java rename to src/driver/src/main/java/com/geldata/driver/binary/builders/types/TypeDeserializerInfo.java index 7a5a0b5e..e3798293 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/builders/types/TypeDeserializerInfo.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/builders/types/TypeDeserializerInfo.java @@ -1,23 +1,24 @@ -package com.gel.driver.binary.builders.types; - -import com.gel.driver.ObjectEnumerator; -import com.gel.driver.annotations.*; -import com.gel.driver.binary.builders.ObjectBuilder; -import com.gel.driver.binary.builders.TypeDeserializerFactory; -import com.gel.driver.binary.builders.internal.ObjectEnumeratorImpl; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.NoTypeConverterException; -import com.gel.driver.namingstrategies.NamingStrategy; -import com.gel.driver.util.FastInverseIndexer; -import com.gel.driver.util.StringsUtil; -import com.gel.driver.util.TypeUtils; +package com.geldata.driver.binary.builders.types; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reflections.Reflections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.ObjectEnumerator; +import com.geldata.driver.annotations.*; +import com.geldata.driver.binary.builders.ObjectBuilder; +import com.geldata.driver.binary.builders.TypeDeserializerFactory; +import com.geldata.driver.binary.builders.internal.ObjectEnumeratorImpl; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.NoTypeConverterException; +import com.geldata.driver.namingstrategies.NamingStrategy; +import com.geldata.driver.util.FastInverseIndexer; +import com.geldata.driver.util.StringsUtil; +import com.geldata.driver.util.TypeUtils; + import java.lang.reflect.*; import java.util.*; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/ArgumentCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ArgumentCodec.java similarity index 84% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/ArgumentCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/ArgumentCodec.java index f7c0165d..4c22303d 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/ArgumentCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ArgumentCodec.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.exceptions.GelException; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/ArrayCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ArrayCodec.java similarity index 88% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/ArrayCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/ArrayCodec.java index e0f9468a..2086b137 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/ArrayCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ArrayCodec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.Array; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/Codec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/Codec.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/Codec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/Codec.java index 5e0f415b..cfaa67f2 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/Codec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/Codec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/CodecBase.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CodecBase.java similarity index 87% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/CodecBase.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/CodecBase.java index bb6fc5d5..cd54944a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/CodecBase.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CodecBase.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/CodecContext.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CodecContext.java similarity index 66% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/CodecContext.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/CodecContext.java index 429f80b4..bdef20e3 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/CodecContext.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CodecContext.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.codecs.visitors.TypeVisitor; -import com.gel.driver.clients.GelBinaryClient; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.codecs.visitors.TypeVisitor; +import com.geldata.driver.clients.GelBinaryClient; + public final class CodecContext { public final GelBinaryClient client; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/CompilableCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CompilableCodec.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/CompilableCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/CompilableCodec.java index 3c4b5c1d..1d0a166b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/CompilableCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CompilableCodec.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/ComplexCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ComplexCodec.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/ComplexCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/ComplexCodec.java index 9d6b4a93..a9685a87 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/ComplexCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ComplexCodec.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; import java.util.Collection; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/CompoundCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CompoundCodec.java similarity index 85% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/CompoundCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/CompoundCodec.java index f86da11f..3e92f1d3 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/CompoundCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/CompoundCodec.java @@ -1,18 +1,20 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.binary.protocol.common.descriptors.TypeOperation; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.binary.protocol.common.descriptors.TypeOperation; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.BinaryProtocolUtils.INT_SIZE; + import java.util.Collection; import java.util.UUID; -import static com.gel.driver.util.BinaryProtocolUtils.INT_SIZE; - public class CompoundCodec extends CodecBase { private final TypeOperation operation; private final Codec[] innerCodecs; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/EnumerationCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/EnumerationCodec.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/EnumerationCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/EnumerationCodec.java index e45002ff..ba4742e7 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/EnumerationCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/EnumerationCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.scalars.TextCodec; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.scalars.TextCodec; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.Arrays; import java.util.HashSet; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/MultiRangeCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/MultiRangeCodec.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/MultiRangeCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/MultiRangeCodec.java index 6bc694af..73944ef0 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/MultiRangeCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/MultiRangeCodec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.datatypes.MultiRange; -import com.gel.driver.datatypes.Range; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.codecs; + import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.datatypes.MultiRange; +import com.geldata.driver.datatypes.Range; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/NullCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/NullCodec.java similarity index 80% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/NullCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/NullCodec.java index 47b6eed5..2adb9091 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/NullCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/NullCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.builders.CodecBuilder; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.builders.CodecBuilder; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.Type; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/ObjectCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ObjectCodec.java similarity index 91% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/ObjectCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/ObjectCodec.java index ec0f032c..12adea04 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/ObjectCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/ObjectCodec.java @@ -1,17 +1,18 @@ -package com.gel.driver.binary.codecs; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.builders.internal.ObjectEnumeratorImpl; -import com.gel.driver.binary.builders.types.TypeBuilder; -import com.gel.driver.binary.builders.types.TypeDeserializerInfo; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.NoTypeConverterException; +package com.geldata.driver.binary.codecs; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.builders.internal.ObjectEnumeratorImpl; +import com.geldata.driver.binary.builders.types.TypeBuilder; +import com.geldata.driver.binary.builders.types.TypeDeserializerInfo; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.NoTypeConverterException; + import javax.naming.OperationNotSupportedException; import java.util.Map; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/RangeCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/RangeCodec.java similarity index 88% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/RangeCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/RangeCodec.java index 53e610c6..a81ebb9a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/RangeCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/RangeCodec.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.codecs; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.common.RangeFlags; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.datatypes.Range; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.codecs; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.common.RangeFlags; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.datatypes.Range; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.EnumSet; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/RuntimeCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/RuntimeCodec.java similarity index 67% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/RuntimeCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/RuntimeCodec.java index e63c8849..d38565a5 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/RuntimeCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/RuntimeCodec.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; public interface RuntimeCodec extends Codec { ComplexCodec getBroker(); diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/SetCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/SetCodec.java similarity index 89% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/SetCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/SetCodec.java index bbece586..aa5e45c8 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/SetCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/SetCodec.java @@ -1,22 +1,24 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.BinaryProtocolUtils.INT_SIZE; +import static com.geldata.driver.util.BinaryProtocolUtils.LONG_SIZE; + import java.lang.reflect.Array; import java.util.Arrays; import java.util.Collection; import java.util.Set; import java.util.UUID; -import static com.gel.driver.util.BinaryProtocolUtils.INT_SIZE; -import static com.gel.driver.util.BinaryProtocolUtils.LONG_SIZE; - public final class SetCodec extends CodecBase> { private final Codec innerCodec; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/SparseObjectCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/SparseObjectCodec.java similarity index 92% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/SparseObjectCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/SparseObjectCodec.java index b70671f0..afc67d50 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/SparseObjectCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/SparseObjectCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.HashMap; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/TupleCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/TupleCodec.java similarity index 86% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/TupleCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/TupleCodec.java index 8651e2b2..62d824f9 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/TupleCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/TupleCodec.java @@ -1,18 +1,19 @@ -package com.gel.driver.binary.codecs; +package com.geldata.driver.binary.codecs; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.datatypes.Tuple; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.datatypes.Tuple; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; -import java.util.UUID; +import static com.geldata.driver.util.BinaryProtocolUtils.INT_SIZE; -import static com.gel.driver.util.BinaryProtocolUtils.INT_SIZE; +import java.util.UUID; public final class TupleCodec extends CodecBase { public final Codec[] innerCodecs; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/common/RangeFlags.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/common/RangeFlags.java similarity index 82% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/common/RangeFlags.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/common/RangeFlags.java index 9dd41da8..8c8fe335 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/common/RangeFlags.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/common/RangeFlags.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.codecs.common; +package com.geldata.driver.binary.codecs.common; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum RangeFlags implements BinaryEnum { EMPTY (1), INCLUDE_LOWER_BOUNDS (1 << 1), diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/complex/ComplexCodecBase.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/ComplexCodecBase.java similarity index 92% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/complex/ComplexCodecBase.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/ComplexCodecBase.java index 0c2a0e5b..71454158 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/complex/ComplexCodecBase.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/ComplexCodecBase.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs.complex; +package com.geldata.driver.binary.codecs.complex; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.*; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.*; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.Type; import java.util.*; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/complex/ComplexCodecConverter.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/ComplexCodecConverter.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/complex/ComplexCodecConverter.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/ComplexCodecConverter.java index e58279ef..c38a1a80 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/complex/ComplexCodecConverter.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/ComplexCodecConverter.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.codecs.complex; +package com.geldata.driver.binary.codecs.complex; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/complex/RuntimeCodecFactory.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/RuntimeCodecFactory.java similarity index 62% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/complex/RuntimeCodecFactory.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/RuntimeCodecFactory.java index 1f491db1..77b64a7a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/complex/RuntimeCodecFactory.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/complex/RuntimeCodecFactory.java @@ -1,6 +1,6 @@ -package com.gel.driver.binary.codecs.complex; +package com.geldata.driver.binary.codecs.complex; -import com.gel.driver.binary.codecs.RuntimeCodec; +import com.geldata.driver.binary.codecs.RuntimeCodec; @FunctionalInterface public interface RuntimeCodecFactory { diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BigIntCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BigIntCodec.java similarity index 87% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BigIntCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BigIntCodec.java index 894e22ac..2af5100a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BigIntCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BigIntCodec.java @@ -1,15 +1,16 @@ -package com.gel.driver.binary.codecs.scalars; - -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.util.StringsUtil; -import com.gel.driver.util.BinaryProtocolUtils; +package com.geldata.driver.binary.codecs.scalars; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.util.BinaryProtocolUtils; +import com.geldata.driver.util.StringsUtil; + import javax.naming.OperationNotSupportedException; import java.math.BigInteger; import java.util.ArrayList; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BoolCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BoolCodec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BoolCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BoolCodec.java index 6ce8fba7..657e1eff 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BoolCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BoolCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BytesCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BytesCodec.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BytesCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BytesCodec.java index 7782dbb3..f8d1883a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/BytesCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/BytesCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DateDurationCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DateDurationCodec.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DateDurationCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DateDurationCodec.java index 0d10cf41..aab2733c 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DateDurationCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DateDurationCodec.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; import java.time.Period; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DecimalCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DecimalCodec.java similarity index 91% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DecimalCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DecimalCodec.java index 4822120f..11cd43e5 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DecimalCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DecimalCodec.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.util.StringsUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.util.StringsUtil; + import javax.naming.OperationNotSupportedException; import java.math.BigDecimal; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DurationCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DurationCodec.java similarity index 78% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DurationCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DurationCodec.java index a76cd5a6..5281c46f 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/DurationCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/DurationCodec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Float32Codec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Float32Codec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Float32Codec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Float32Codec.java index cb6c4be1..7bc95b28 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Float32Codec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Float32Codec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Float64Codec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Float64Codec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Float64Codec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Float64Codec.java index 411c55af..8c63a12f 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Float64Codec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Float64Codec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer16Codec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer16Codec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer16Codec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer16Codec.java index aadf4d05..9492d35a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer16Codec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer16Codec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer32Codec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer32Codec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer32Codec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer32Codec.java index 2acf5a00..e78ef4ea 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer32Codec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer32Codec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer64Codec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer64Codec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer64Codec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer64Codec.java index 069b0bbd..f915e870 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/Integer64Codec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/Integer64Codec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/JsonCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/JsonCodec.java similarity index 76% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/JsonCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/JsonCodec.java index e02cd511..99c1077b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/JsonCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/JsonCodec.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.codecs.scalars; - -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.datatypes.Json; -import com.gel.driver.util.BinaryProtocolUtils; +package com.geldata.driver.binary.codecs.scalars; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; import java.nio.charset.StandardCharsets; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalDateCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalDateCodec.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalDateCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalDateCodec.java index d2a0bc2b..982e9e7c 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalDateCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalDateCodec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.util.TemporalUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.util.TemporalUtils; + import javax.naming.OperationNotSupportedException; import java.time.LocalDate; import java.time.temporal.ChronoUnit; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalDateTimeCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalDateTimeCodec.java similarity index 76% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalDateTimeCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalDateTimeCodec.java index bb794ce1..29f9ab01 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalDateTimeCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalDateTimeCodec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.util.TemporalUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.util.TemporalUtils; + import javax.naming.OperationNotSupportedException; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalTimeCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalTimeCodec.java similarity index 78% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalTimeCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalTimeCodec.java index c0df570f..a7b67e82 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/LocalTimeCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/LocalTimeCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.time.LocalTime; import java.time.temporal.ChronoUnit; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/MemoryCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/MemoryCodec.java similarity index 72% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/MemoryCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/MemoryCodec.java index 8ccbeeda..f2e02050 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/MemoryCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/MemoryCodec.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.datatypes.Memory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.datatypes.Memory; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/ScalarCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/ScalarCodec.java new file mode 100644 index 00000000..f9bb91f7 --- /dev/null +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/ScalarCodec.java @@ -0,0 +1,6 @@ +package com.geldata.driver.binary.codecs.scalars; + +import com.geldata.driver.binary.codecs.Codec; + +public interface ScalarCodec extends Codec { +} diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/ScalarCodecBase.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/ScalarCodecBase.java similarity index 61% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/ScalarCodecBase.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/ScalarCodecBase.java index 9867b496..987d1233 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/ScalarCodecBase.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/ScalarCodecBase.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.codecs.CodecBase; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.codecs.CodecBase; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; public abstract class ScalarCodecBase extends CodecBase implements ScalarCodec { diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/TextCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/TextCodec.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/TextCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/TextCodec.java index 5c1d4032..cfef94f7 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/TextCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/TextCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.nio.charset.StandardCharsets; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/UUIDCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/UUIDCodec.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/UUIDCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/UUIDCodec.java index 6c983366..d435a76a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/UUIDCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/UUIDCodec.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.scalars; +package com.geldata.driver.binary.codecs.scalars; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/ComplexScalarCodecBase.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/ComplexScalarCodecBase.java similarity index 69% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/ComplexScalarCodecBase.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/ComplexScalarCodecBase.java index 46db35f1..171576a5 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/ComplexScalarCodecBase.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/ComplexScalarCodecBase.java @@ -1,18 +1,19 @@ -package com.gel.driver.binary.codecs.scalars.complex; - -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.ComplexCodec; -import com.gel.driver.binary.codecs.RuntimeCodec; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.codecs.complex.ComplexCodecBase; -import com.gel.driver.binary.codecs.complex.ComplexCodecConverter; -import com.gel.driver.binary.codecs.scalars.ScalarCodec; -import com.gel.driver.binary.codecs.scalars.ScalarCodecBase; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.codecs.scalars.complex; + import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.codecs.ComplexCodec; +import com.geldata.driver.binary.codecs.RuntimeCodec; +import com.geldata.driver.binary.codecs.complex.ComplexCodecBase; +import com.geldata.driver.binary.codecs.complex.ComplexCodecConverter; +import com.geldata.driver.binary.codecs.scalars.ScalarCodec; +import com.geldata.driver.binary.codecs.scalars.ScalarCodecBase; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/DateTimeCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/DateTimeCodec.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/DateTimeCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/DateTimeCodec.java index 0d0b6323..2a7145e7 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/DateTimeCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/DateTimeCodec.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.codecs.scalars.complex; +package com.geldata.driver.binary.codecs.scalars.complex; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.codecs.complex.ComplexCodecConverter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.util.TemporalUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.codecs.complex.ComplexCodecConverter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.util.TemporalUtils; + import javax.naming.OperationNotSupportedException; import java.time.OffsetDateTime; import java.time.ZonedDateTime; diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/RelativeDurationCodec.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/RelativeDurationCodec.java similarity index 80% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/RelativeDurationCodec.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/RelativeDurationCodec.java index 400eb89a..2e1345a1 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/scalars/complex/RelativeDurationCodec.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/scalars/complex/RelativeDurationCodec.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.codecs.scalars.complex; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.codecs.complex.ComplexCodecConverter; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.datatypes.RelativeDuration; +package com.geldata.driver.binary.codecs.scalars.complex; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.codecs.complex.ComplexCodecConverter; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.datatypes.RelativeDuration; + import javax.naming.OperationNotSupportedException; import java.time.Duration; import java.time.Period; diff --git a/src/driver/src/main/java/com/geldata/driver/binary/codecs/visitors/CodecVisitor.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/visitors/CodecVisitor.java new file mode 100644 index 00000000..9cc152b5 --- /dev/null +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/visitors/CodecVisitor.java @@ -0,0 +1,9 @@ +package com.geldata.driver.binary.codecs.visitors; + +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.exceptions.GelException; + +@FunctionalInterface +public interface CodecVisitor { + Codec visit(Codec codec) throws GelException; +} diff --git a/src/driver/src/main/java/com/gel/driver/binary/codecs/visitors/TypeVisitor.java b/src/driver/src/main/java/com/geldata/driver/binary/codecs/visitors/TypeVisitor.java similarity index 95% rename from src/driver/src/main/java/com/gel/driver/binary/codecs/visitors/TypeVisitor.java rename to src/driver/src/main/java/com/geldata/driver/binary/codecs/visitors/TypeVisitor.java index be29f4c2..5e41e7ac 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/codecs/visitors/TypeVisitor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/codecs/visitors/TypeVisitor.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.codecs.visitors; +package com.geldata.driver.binary.codecs.visitors; -import com.gel.driver.binary.builders.types.TypeDeserializerInfo; -import com.gel.driver.binary.codecs.*; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.util.TypeUtils; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.builders.types.TypeDeserializerInfo; +import com.geldata.driver.binary.codecs.*; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.util.TypeUtils; + import java.io.Closeable; import java.util.Stack; import java.util.function.Consumer; diff --git a/src/driver/src/main/java/com/gel/driver/binary/duplexers/ChannelDuplexer.java b/src/driver/src/main/java/com/geldata/driver/binary/duplexers/ChannelDuplexer.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/binary/duplexers/ChannelDuplexer.java rename to src/driver/src/main/java/com/geldata/driver/binary/duplexers/ChannelDuplexer.java index 91da0c4c..5aab64de 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/duplexers/ChannelDuplexer.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/duplexers/ChannelDuplexer.java @@ -1,15 +1,5 @@ -package com.gel.driver.binary.duplexers; - -import com.gel.driver.ErrorCode; -import com.gel.driver.async.ChannelCompletableFuture; -import com.gel.driver.binary.protocol.ProtocolProvider; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.binary.protocol.common.ProtocolError; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.ConnectionFailedException; -import com.gel.driver.exceptions.ConnectionFailedTemporarilyException; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.duplexers; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -18,7 +8,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.ErrorCode; +import com.geldata.driver.async.ChannelCompletableFuture; +import com.geldata.driver.binary.protocol.ProtocolProvider; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.common.ProtocolError; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.ConnectionFailedException; +import com.geldata.driver.exceptions.ConnectionFailedTemporarilyException; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.ComposableUtil.composeWith; +import static com.geldata.driver.util.ComposableUtil.exceptionallyCompose; + import java.util.ArrayDeque; import java.util.Arrays; import java.util.Queue; @@ -28,9 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import static com.gel.driver.util.ComposableUtil.composeWith; -import static com.gel.driver.util.ComposableUtil.exceptionallyCompose; - public class ChannelDuplexer extends Duplexer { private static final Logger logger = LoggerFactory.getLogger(ChannelDuplexer.class); diff --git a/src/driver/src/main/java/com/gel/driver/binary/duplexers/Duplexer.java b/src/driver/src/main/java/com/geldata/driver/binary/duplexers/Duplexer.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/binary/duplexers/Duplexer.java rename to src/driver/src/main/java/com/geldata/driver/binary/duplexers/Duplexer.java index a0fd0f21..0d41f7a2 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/duplexers/Duplexer.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/duplexers/Duplexer.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.duplexers; +package com.geldata.driver.binary.duplexers; -import com.gel.driver.binary.protocol.ProtocolProvider; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.protocol.ProtocolProvider; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/src/driver/src/main/java/com/gel/driver/binary/duplexers/HttpDuplexer.java b/src/driver/src/main/java/com/geldata/driver/binary/duplexers/HttpDuplexer.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/binary/duplexers/HttpDuplexer.java rename to src/driver/src/main/java/com/geldata/driver/binary/duplexers/HttpDuplexer.java index e1d492e8..03b07308 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/duplexers/HttpDuplexer.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/duplexers/HttpDuplexer.java @@ -1,19 +1,23 @@ -package com.gel.driver.binary.duplexers; - -import com.gel.driver.binary.PacketSerializer; -import com.gel.driver.binary.protocol.ProtocolProvider; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.clients.GelHttpClient; -import com.gel.driver.exceptions.ConnectionFailedException; -import com.gel.driver.exceptions.GelException; +package com.geldata.driver.binary.duplexers; + import io.netty.buffer.ByteBufInputStream; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.binary.PacketSerializer; +import com.geldata.driver.binary.protocol.ProtocolProvider; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.clients.GelHttpClient; +import com.geldata.driver.exceptions.ConnectionFailedException; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.ComposableUtil.composeWith; + import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.util.ArrayDeque; @@ -22,8 +26,6 @@ import java.util.Queue; import java.util.concurrent.*; -import static com.gel.driver.util.ComposableUtil.composeWith; - public class HttpDuplexer extends Duplexer { private static final Logger logger = LoggerFactory.getLogger(HttpDuplexer.class); private static final String HTTP_BINARY_CONTENT_TYPE = "application/x.edgedb.v_1_0.binary"; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ClientMessageType.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ClientMessageType.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ClientMessageType.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ClientMessageType.java index 343d68f3..69dd9e93 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ClientMessageType.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ClientMessageType.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; public enum ClientMessageType { AUTHENTICATION_SASL_INITIAL_RESPONSE (0x70), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ExecuteResult.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ExecuteResult.java similarity index 75% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ExecuteResult.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ExecuteResult.java index 448afbad..7abc93df 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ExecuteResult.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ExecuteResult.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; -import com.gel.driver.binary.codecs.Codec; import io.netty.buffer.ByteBuf; import java.util.List; +import com.geldata.driver.binary.codecs.Codec; + public class ExecuteResult { public final Codec codec; public final List data; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ParseResult.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ParseResult.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ParseResult.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ParseResult.java index 8a001138..a5fdada9 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ParseResult.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ParseResult.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; -import com.gel.driver.Capabilities; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.common.Cardinality; import io.netty.buffer.ByteBuf; import java.util.EnumSet; import java.util.UUID; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.common.Cardinality; + public final class ParseResult { public final Codec inCodec; public final Codec outCodec; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolPhase.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolPhase.java similarity index 71% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolPhase.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolPhase.java index 17929ae6..9f48d8a6 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolPhase.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolPhase.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; public enum ProtocolPhase { CONNECTION, diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolProvider.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolProvider.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolProvider.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolProvider.java index 0ef6a0d7..1fc4ab48 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolProvider.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolProvider.java @@ -1,15 +1,16 @@ -package com.gel.driver.binary.protocol; - -import com.gel.driver.GelConnection; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.v1.V1ProtocolProvider; -import com.gel.driver.binary.protocol.v2.V2ProtocolProvider; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.exceptions.MissingCodecException; -import com.gel.driver.exceptions.UnexpectedMessageException; +package com.geldata.driver.binary.protocol; + import org.jetbrains.annotations.Nullable; +import com.geldata.driver.GelConnection; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.v1.V1ProtocolProvider; +import com.geldata.driver.binary.protocol.v2.V2ProtocolProvider; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.exceptions.MissingCodecException; +import com.geldata.driver.exceptions.UnexpectedMessageException; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletionStage; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolVersion.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolVersion.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolVersion.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolVersion.java index 6b52bac8..702bd32e 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ProtocolVersion.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ProtocolVersion.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; import org.joou.UShort; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/QueryParameters.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/QueryParameters.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/QueryParameters.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/QueryParameters.java index c15c2889..3ef37064 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/QueryParameters.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/QueryParameters.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; -import com.gel.driver.Capabilities; -import com.gel.driver.binary.builders.CodecBuilder; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.IOFormat; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.builders.CodecBuilder; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.IOFormat; + import java.util.EnumSet; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/Receivable.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/Receivable.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/Receivable.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/Receivable.java index 264db665..d3fa4a91 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/Receivable.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/Receivable.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/Sendable.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/Sendable.java similarity index 69% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/Sendable.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/Sendable.java index 050fbb89..a4cff354 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/Sendable.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/Sendable.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.SerializableData; -import com.gel.driver.binary.protocol.ClientMessageType; import org.jetbrains.annotations.NotNull; -import javax.naming.OperationNotSupportedException; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.SerializableData; +import com.geldata.driver.binary.protocol.ClientMessageType; + +import static com.geldata.driver.util.BinaryProtocolUtils.BYTE_SIZE; +import static com.geldata.driver.util.BinaryProtocolUtils.INT_SIZE; -import static com.gel.driver.util.BinaryProtocolUtils.BYTE_SIZE; -import static com.gel.driver.util.BinaryProtocolUtils.INT_SIZE; +import javax.naming.OperationNotSupportedException; public abstract class Sendable implements SerializableData { public final ClientMessageType type; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/ServerMessageType.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ServerMessageType.java similarity index 87% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/ServerMessageType.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/ServerMessageType.java index c70cc701..fa1d20c1 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/ServerMessageType.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/ServerMessageType.java @@ -1,6 +1,6 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; -import com.gel.driver.binary.BinaryEnum; +import com.geldata.driver.binary.BinaryEnum; public enum ServerMessageType implements BinaryEnum { AUTHENTICATION (0x52), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/TypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/TypeDescriptor.java similarity index 64% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/TypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/TypeDescriptor.java index ed94410b..90fcab50 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/TypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/TypeDescriptor.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/TypeDescriptorInfo.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/TypeDescriptorInfo.java similarity index 91% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/TypeDescriptorInfo.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/TypeDescriptorInfo.java index c5add95b..d488ae6e 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/TypeDescriptorInfo.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/TypeDescriptorInfo.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol; +package com.geldata.driver.binary.protocol; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/Annotation.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/Annotation.java similarity index 75% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/Annotation.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/Annotation.java index 52e886fd..df8d4056 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/Annotation.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/Annotation.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.SerializableData; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.SerializableData; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class Annotation implements SerializableData { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/AuthStatus.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/AuthStatus.java similarity index 82% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/AuthStatus.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/AuthStatus.java index 4eb45cdc..e8a55cde 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/AuthStatus.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/AuthStatus.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum AuthStatus implements BinaryEnum { AUTHENTICATION_OK (0), AUTHENTICATION_REQUIRED_SASL_MESSAGE (0xa), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/Cardinality.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/Cardinality.java similarity index 80% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/Cardinality.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/Cardinality.java index 209d160b..5de3c43f 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/Cardinality.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/Cardinality.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum Cardinality implements BinaryEnum { NO_RESULT (0x6e), AT_MOST_ONE (0x6f), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/CompilationFlags.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/CompilationFlags.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/CompilationFlags.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/CompilationFlags.java index 4c7f2695..62130d36 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/CompilationFlags.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/CompilationFlags.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum CompilationFlags implements BinaryEnum { NONE (0), IMPLICIT_TYPE_IDS (1), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/ConnectionParam.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ConnectionParam.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/ConnectionParam.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ConnectionParam.java index 6c69c40c..5376740f 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/ConnectionParam.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ConnectionParam.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.SerializableData; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.SerializableData; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class ConnectionParam implements SerializableData { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/DumpObjectDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/DumpObjectDescriptor.java similarity index 87% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/DumpObjectDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/DumpObjectDescriptor.java index d8f72b5c..66d4c992 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/DumpObjectDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/DumpObjectDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.PacketReader; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; + import java.util.UUID; public class DumpObjectDescriptor implements AutoCloseable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/DumpTypeInfo.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/DumpTypeInfo.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/DumpTypeInfo.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/DumpTypeInfo.java index 8a6cd067..50f20c8b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/DumpTypeInfo.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/DumpTypeInfo.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.PacketReader; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; + import java.util.UUID; public class DumpTypeInfo { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/IOFormat.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/IOFormat.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/IOFormat.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/IOFormat.java index 87f64ac0..556200dc 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/IOFormat.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/IOFormat.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum IOFormat implements BinaryEnum { BINARY (0x62), JSON (0x6a), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/KeyValue.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/KeyValue.java similarity index 80% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/KeyValue.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/KeyValue.java index 8107d767..84a51b31 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/KeyValue.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/KeyValue.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.SerializableData; -import com.gel.driver.util.BinaryProtocolUtils; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.SerializableData; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class KeyValue implements SerializableData, AutoCloseable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/ProtocolError.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ProtocolError.java similarity index 63% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/ProtocolError.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ProtocolError.java index 8eef5aaf..b1af18bd 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/ProtocolError.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ProtocolError.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.ErrorCode; -import com.gel.driver.ErrorSeverity; import org.joou.UShort; +import com.geldata.driver.ErrorCode; +import com.geldata.driver.ErrorSeverity; + import java.util.Optional; public interface ProtocolError { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/ProtocolExtension.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ProtocolExtension.java similarity index 80% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/ProtocolExtension.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ProtocolExtension.java index 517accc4..a313d184 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/ProtocolExtension.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/ProtocolExtension.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.common; +package com.geldata.driver.binary.protocol.common; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.SerializableData; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.SerializableData; + import javax.naming.OperationNotSupportedException; public class ProtocolExtension implements SerializableData { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/CodecAncestor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/CodecAncestor.java similarity index 61% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/CodecAncestor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/CodecAncestor.java index e0eb3ba5..e0fb10c9 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/CodecAncestor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/CodecAncestor.java @@ -1,7 +1,7 @@ -package com.gel.driver.binary.protocol.common.descriptors; +package com.geldata.driver.binary.protocol.common.descriptors; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; public final class CodecAncestor { public final Codec codec; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/CodecMetadata.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/CodecMetadata.java similarity index 92% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/CodecMetadata.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/CodecMetadata.java index c8208092..f74f3456 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/CodecMetadata.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/CodecMetadata.java @@ -1,4 +1,4 @@ -package com.gel.driver.binary.protocol.common.descriptors; +package com.geldata.driver.binary.protocol.common.descriptors; public final class CodecMetadata { public final String schemaName; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/ShapeElement.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/ShapeElement.java similarity index 72% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/ShapeElement.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/ShapeElement.java index bd876320..4bb30b71 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/ShapeElement.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/ShapeElement.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.common.descriptors; +package com.geldata.driver.binary.protocol.common.descriptors; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.descriptors.ShapeElementFlags; import org.jetbrains.annotations.NotNull; import org.joou.UInteger; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.descriptors.ShapeElementFlags; + import java.util.EnumSet; public final class ShapeElement { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/ShapeElementFlags.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/ShapeElementFlags.java similarity index 80% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/ShapeElementFlags.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/ShapeElementFlags.java index 286289ac..fc676a1e 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/ShapeElementFlags.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/ShapeElementFlags.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common.descriptors; +package com.geldata.driver.binary.protocol.common.descriptors; -import com.gel.driver.binary.BinaryEnum; import org.joou.UInteger; +import com.geldata.driver.binary.BinaryEnum; + import static org.joou.Unsigned.uint; public enum ShapeElementFlags implements BinaryEnum { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/TupleElement.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/TupleElement.java similarity index 73% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/TupleElement.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/TupleElement.java index 74dd929c..8254c76f 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/TupleElement.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/TupleElement.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.common.descriptors; +package com.geldata.driver.binary.protocol.common.descriptors; -import com.gel.driver.binary.PacketReader; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; + public final class TupleElement { public final @NotNull String name; public final short typePosition; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/TypeOperation.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/TypeOperation.java similarity index 72% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/TypeOperation.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/TypeOperation.java index 50180b16..dee8882a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/common/descriptors/TypeOperation.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/common/descriptors/TypeOperation.java @@ -1,6 +1,6 @@ -package com.gel.driver.binary.protocol.common.descriptors; +package com.geldata.driver.binary.protocol.common.descriptors; -import com.gel.driver.binary.BinaryEnum; +import com.geldata.driver.binary.BinaryEnum; public enum TypeOperation implements BinaryEnum { UNION(1), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/V1ProtocolProvider.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/V1ProtocolProvider.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/V1ProtocolProvider.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/V1ProtocolProvider.java index 06c5af0c..fb24c3d5 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/V1ProtocolProvider.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/V1ProtocolProvider.java @@ -1,22 +1,5 @@ -package com.gel.driver.binary.protocol.v1; - -import com.gel.driver.Capabilities; -import com.gel.driver.ErrorCode; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.builders.CodecBuilder; -import com.gel.driver.binary.codecs.*; -import com.gel.driver.binary.codecs.scalars.TextCodec; -import com.gel.driver.binary.duplexers.Duplexer; -import com.gel.driver.binary.protocol.*; -import com.gel.driver.binary.protocol.common.*; -import com.gel.driver.binary.protocol.v1.descriptors.*; -import com.gel.driver.binary.protocol.v1.receivables.*; -import com.gel.driver.binary.protocol.v1.sendables.*; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.datatypes.Range; -import com.gel.driver.exceptions.*; -import com.gel.driver.util.BinaryProtocolUtils; -import com.gel.driver.util.Scram; +package com.geldata.driver.binary.protocol.v1; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -24,6 +7,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.Capabilities; +import com.geldata.driver.ErrorCode; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.builders.CodecBuilder; +import com.geldata.driver.binary.codecs.*; +import com.geldata.driver.binary.codecs.scalars.TextCodec; +import com.geldata.driver.binary.duplexers.Duplexer; +import com.geldata.driver.binary.protocol.*; +import com.geldata.driver.binary.protocol.common.*; +import com.geldata.driver.binary.protocol.v1.descriptors.*; +import com.geldata.driver.binary.protocol.v1.receivables.*; +import com.geldata.driver.binary.protocol.v1.sendables.*; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.datatypes.Range; +import com.geldata.driver.exceptions.*; +import com.geldata.driver.util.BinaryProtocolUtils; +import com.geldata.driver.util.Scram; + import javax.naming.OperationNotSupportedException; import java.lang.reflect.Array; import java.nio.charset.StandardCharsets; @@ -36,8 +37,8 @@ import java.util.function.Function; import java.util.function.Predicate; -import static com.gel.driver.util.ComposableUtil.composeWith; -import static com.gel.driver.util.ComposableUtil.exceptionallyCompose; +import static com.geldata.driver.util.ComposableUtil.composeWith; +import static com.geldata.driver.util.ComposableUtil.exceptionallyCompose; import static org.joou.Unsigned.ushort; public class V1ProtocolProvider implements ProtocolProvider { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ArrayTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ArrayTypeDescriptor.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ArrayTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ArrayTypeDescriptor.java index 9827943b..9c560d36 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ArrayTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ArrayTypeDescriptor.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; import org.joou.UInteger; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class ArrayTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/BaseScalarTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/BaseScalarTypeDescriptor.java similarity index 65% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/BaseScalarTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/BaseScalarTypeDescriptor.java index 633db9d0..e38d60b5 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/BaseScalarTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/BaseScalarTypeDescriptor.java @@ -1,10 +1,10 @@ -package com.gel.driver.binary.protocol.v1.descriptors; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; +package com.geldata.driver.binary.protocol.v1.descriptors; import java.util.UUID; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + public final class BaseScalarTypeDescriptor implements TypeDescriptor { private final UUID id; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/DescriptorType.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/DescriptorType.java similarity index 87% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/DescriptorType.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/DescriptorType.java index 3fefba67..338e427c 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/DescriptorType.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/DescriptorType.java @@ -1,8 +1,9 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.BinaryEnum; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.BinaryEnum; + public enum DescriptorType implements BinaryEnum { SET_DESCRIPTOR (0x00), OBJECT_SHAPE_DESCRIPTOR (0x01), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/EnumerationTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/EnumerationTypeDescriptor.java similarity index 75% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/EnumerationTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/EnumerationTypeDescriptor.java index 0a8dfc9b..08327c27 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/EnumerationTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/EnumerationTypeDescriptor.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class EnumerationTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/InputShapeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/InputShapeDescriptor.java similarity index 68% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/InputShapeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/InputShapeDescriptor.java index ef039ee7..f5452496 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/InputShapeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/InputShapeDescriptor.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.common.descriptors.ShapeElement; -import com.gel.driver.binary.PacketReader; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.common.descriptors.ShapeElement; + import java.util.UUID; public class InputShapeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/NamedTupleTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/NamedTupleTypeDescriptor.java similarity index 68% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/NamedTupleTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/NamedTupleTypeDescriptor.java index e2f875da..315330bb 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/NamedTupleTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/NamedTupleTypeDescriptor.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.common.descriptors.TupleElement; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.common.descriptors.TupleElement; + import java.util.UUID; public final class NamedTupleTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ObjectShapeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ObjectShapeDescriptor.java similarity index 68% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ObjectShapeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ObjectShapeDescriptor.java index 19d233da..b64a14c2 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ObjectShapeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ObjectShapeDescriptor.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.common.descriptors.ShapeElement; -import com.gel.driver.binary.PacketReader; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.common.descriptors.ShapeElement; + import java.util.UUID; public final class ObjectShapeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/RangeTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/RangeTypeDescriptor.java similarity index 73% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/RangeTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/RangeTypeDescriptor.java index 6a56fb80..e2e3fdbb 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/RangeTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/RangeTypeDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class RangeTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ScalarTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ScalarTypeDescriptor.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ScalarTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ScalarTypeDescriptor.java index 83290a63..da780bf3 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ScalarTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ScalarTypeDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class ScalarTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ScalarTypeNameAnnotation.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ScalarTypeNameAnnotation.java similarity index 72% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ScalarTypeNameAnnotation.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ScalarTypeNameAnnotation.java index 457f4b18..2c8d385b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/ScalarTypeNameAnnotation.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/ScalarTypeNameAnnotation.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class ScalarTypeNameAnnotation implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/SetTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/SetTypeDescriptor.java similarity index 73% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/SetTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/SetTypeDescriptor.java index cbd04391..414d2cf7 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/SetTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/SetTypeDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class SetTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/TupleTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/TupleTypeDescriptor.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/TupleTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/TupleTypeDescriptor.java index 44ccbf50..94baa4e1 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/TupleTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/TupleTypeDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class TupleTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/TypeAnnotationDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/TypeAnnotationDescriptor.java similarity index 76% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/TypeAnnotationDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/TypeAnnotationDescriptor.java index cfd8b71b..127c2f21 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/descriptors/TypeAnnotationDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/descriptors/TypeAnnotationDescriptor.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.protocol.v1.descriptors; +package com.geldata.driver.binary.protocol.v1.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class TypeAnnotationDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/AuthenticationStatus.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/AuthenticationStatus.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/AuthenticationStatus.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/AuthenticationStatus.java index ee29b05a..71b69028 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/AuthenticationStatus.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/AuthenticationStatus.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.AuthStatus; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.AuthStatus; + public class AuthenticationStatus implements Receivable { public final AuthStatus authStatus; @Nullable diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/CommandComplete.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/CommandComplete.java similarity index 76% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/CommandComplete.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/CommandComplete.java index d8591b2a..0f32b48d 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/CommandComplete.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/CommandComplete.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.Capabilities; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.Annotation; + import java.util.EnumSet; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/CommandDataDescription.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/CommandDataDescription.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/CommandDataDescription.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/CommandDataDescription.java index 55ac1e68..cb00dc16 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/CommandDataDescription.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/CommandDataDescription.java @@ -1,15 +1,16 @@ -package com.gel.driver.binary.protocol.v1.receivables; - -import com.gel.driver.Capabilities; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; -import com.gel.driver.binary.protocol.common.Cardinality; +package com.geldata.driver.binary.protocol.v1.receivables; + import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.Annotation; +import com.geldata.driver.binary.protocol.common.Cardinality; + import java.util.EnumSet; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/Data.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/Data.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/Data.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/Data.java index 71d56a6f..c0d507b5 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/Data.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/Data.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; + public class Data implements Receivable { public final @Nullable ByteBuf payloadBuffer; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/DumpBlock.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/DumpBlock.java similarity index 62% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/DumpBlock.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/DumpBlock.java index 5d63d3f0..dc01023a 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/DumpBlock.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/DumpBlock.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; -import com.gel.driver.binary.protocol.common.KeyValue; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.KeyValue; + public class DumpBlock implements Receivable { public final KeyValue @NotNull [] attributes; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/DumpHeader.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/DumpHeader.java similarity index 73% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/DumpHeader.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/DumpHeader.java index 11f218ce..ba7da306 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/DumpHeader.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/DumpHeader.java @@ -1,15 +1,16 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; -import com.gel.driver.binary.protocol.common.DumpObjectDescriptor; -import com.gel.driver.binary.protocol.common.DumpTypeInfo; -import com.gel.driver.binary.protocol.common.KeyValue; import org.jetbrains.annotations.NotNull; import org.joou.UInteger; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.DumpObjectDescriptor; +import com.geldata.driver.binary.protocol.common.DumpTypeInfo; +import com.geldata.driver.binary.protocol.common.KeyValue; + public class DumpHeader implements Receivable { public final KeyValue @NotNull [] attributes; public final @NotNull UShort majorVersion; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ErrorResponse.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ErrorResponse.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ErrorResponse.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ErrorResponse.java index 2ba1507b..044e3389 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ErrorResponse.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ErrorResponse.java @@ -1,16 +1,17 @@ -package com.gel.driver.binary.protocol.v1.receivables; - -import com.gel.driver.ErrorCode; -import com.gel.driver.ErrorSeverity; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; -import com.gel.driver.binary.protocol.common.KeyValue; -import com.gel.driver.binary.protocol.common.ProtocolError; -import com.gel.driver.exceptions.GelErrorException; +package com.geldata.driver.binary.protocol.v1.receivables; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.ErrorCode; +import com.geldata.driver.ErrorSeverity; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.KeyValue; +import com.geldata.driver.binary.protocol.common.ProtocolError; +import com.geldata.driver.exceptions.GelErrorException; + import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/LogMessage.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/LogMessage.java similarity index 67% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/LogMessage.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/LogMessage.java index c062ca34..4bb8cba7 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/LogMessage.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/LogMessage.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.ErrorCode; -import com.gel.driver.LogSeverity; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.ErrorCode; +import com.geldata.driver.LogSeverity; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.Annotation; + public class LogMessage implements Receivable { public final LogSeverity severity; public final ErrorCode code; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ParameterStatus.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ParameterStatus.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ParameterStatus.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ParameterStatus.java index 59595d7d..3604e3de 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ParameterStatus.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ParameterStatus.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; + public class ParameterStatus implements Receivable { public final @NotNull String name; public final @Nullable ByteBuf value; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ReadyForCommand.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ReadyForCommand.java similarity index 61% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ReadyForCommand.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ReadyForCommand.java index b1d66b3e..21393c8b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ReadyForCommand.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ReadyForCommand.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.TransactionState; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.TransactionState; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.Annotation; + public class ReadyForCommand implements Receivable { public final Annotation @NotNull [] annotations; public final TransactionState transactionState; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/RestoreReady.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/RestoreReady.java similarity index 63% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/RestoreReady.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/RestoreReady.java index b63d26fb..65ffaedb 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/RestoreReady.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/RestoreReady.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.Annotation; + public class RestoreReady implements Receivable { public final Annotation @NotNull [] annotations; public final @NotNull UShort jobs; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ServerHandshake.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ServerHandshake.java similarity index 69% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ServerHandshake.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ServerHandshake.java index a7f91b7e..d36c216d 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ServerHandshake.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ServerHandshake.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.common.ProtocolExtension; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.ServerMessageType; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; +import com.geldata.driver.binary.protocol.common.ProtocolExtension; + public class ServerHandshake implements Receivable { public final @NotNull UShort majorVersion; public final @NotNull UShort minorVersion; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ServerKeyData.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ServerKeyData.java similarity index 72% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ServerKeyData.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ServerKeyData.java index 2853ee96..48f9ffbb 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/ServerKeyData.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/ServerKeyData.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; + public class ServerKeyData implements Receivable { public static final int SERVER_KEY_LENGTH = 32; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/StateDataDescription.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/StateDataDescription.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/StateDataDescription.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/StateDataDescription.java index e9dd7515..ec7e0002 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/receivables/StateDataDescription.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/receivables/StateDataDescription.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.receivables; +package com.geldata.driver.binary.protocol.v1.receivables; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.Receivable; -import com.gel.driver.binary.protocol.ServerMessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.Receivable; +import com.geldata.driver.binary.protocol.ServerMessageType; + import java.util.UUID; public class StateDataDescription implements Receivable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/AuthenticationSASLInitialResponse.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/AuthenticationSASLInitialResponse.java similarity index 75% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/AuthenticationSASLInitialResponse.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/AuthenticationSASLInitialResponse.java index ee0893e5..ea141f07 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/AuthenticationSASLInitialResponse.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/AuthenticationSASLInitialResponse.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.util.BinaryProtocolUtils; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class AuthenticationSASLInitialResponse extends Sendable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/AuthenticationSASLResponse.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/AuthenticationSASLResponse.java similarity index 70% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/AuthenticationSASLResponse.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/AuthenticationSASLResponse.java index 7ba1140b..6183d621 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/AuthenticationSASLResponse.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/AuthenticationSASLResponse.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.util.BinaryProtocolUtils; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class AuthenticationSASLResponse extends Sendable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/ClientHandshake.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/ClientHandshake.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/ClientHandshake.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/ClientHandshake.java index fdf08cb2..fd39a550 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/ClientHandshake.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/ClientHandshake.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.binary.protocol.common.ConnectionParam; -import com.gel.driver.binary.protocol.common.ProtocolExtension; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.common.ConnectionParam; +import com.geldata.driver.binary.protocol.common.ProtocolExtension; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class ClientHandshake extends Sendable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Dump.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Dump.java similarity index 64% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Dump.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Dump.java index f7e6600a..2902f8b2 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Dump.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Dump.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.binary.protocol.common.Annotation; -import com.gel.driver.util.BinaryProtocolUtils; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.common.Annotation; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class Dump extends Sendable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Execute.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Execute.java similarity index 85% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Execute.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Execute.java index de376c07..6a5f5c55 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Execute.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Execute.java @@ -1,21 +1,23 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.Capabilities; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.CompilationFlags; -import com.gel.driver.binary.protocol.common.IOFormat; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.CompilationFlags; +import com.geldata.driver.binary.protocol.common.IOFormat; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.BinaryProtocolUtils.*; + import java.util.EnumSet; import java.util.UUID; -import static com.gel.driver.util.BinaryProtocolUtils.*; - public class Execute extends Sendable { private final EnumSet capabilities; private final EnumSet compilationFlags; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Parse.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Parse.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Parse.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Parse.java index cee8f1f9..07c00151 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Parse.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Parse.java @@ -1,16 +1,17 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.Capabilities; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.CompilationFlags; -import com.gel.driver.binary.protocol.common.IOFormat; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.util.BinaryProtocolUtils; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.CompilationFlags; +import com.geldata.driver.binary.protocol.common.IOFormat; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; import java.util.EnumSet; import java.util.UUID; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Restore.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Restore.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Restore.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Restore.java index c7051111..7cabc3f9 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Restore.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Restore.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.binary.protocol.common.KeyValue; -import com.gel.driver.util.BinaryProtocolUtils; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.protocol.common.KeyValue; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class Restore extends Sendable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/RestoreBlock.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/RestoreBlock.java similarity index 69% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/RestoreBlock.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/RestoreBlock.java index 4de322d1..7ab9f193 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/RestoreBlock.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/RestoreBlock.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; -import com.gel.driver.util.BinaryProtocolUtils; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; +import com.geldata.driver.util.BinaryProtocolUtils; + import javax.naming.OperationNotSupportedException; public class RestoreBlock extends Sendable { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/RestoreEOF.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/RestoreEOF.java similarity index 56% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/RestoreEOF.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/RestoreEOF.java index d3a03c30..ea28b248 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/RestoreEOF.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/RestoreEOF.java @@ -1,8 +1,8 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; public class RestoreEOF extends Sendable { public RestoreEOF() { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Sync.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Sync.java similarity index 59% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Sync.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Sync.java index 49600990..9e1a577e 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Sync.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Sync.java @@ -1,8 +1,8 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; public class Sync extends Sendable { public static final Sendable INSTANCE = new Sync(); diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Terminate.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Terminate.java similarity index 60% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Terminate.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Terminate.java index 553afb21..bcda7b75 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v1/sendables/Terminate.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v1/sendables/Terminate.java @@ -1,8 +1,8 @@ -package com.gel.driver.binary.protocol.v1.sendables; +package com.geldata.driver.binary.protocol.v1.sendables; -import com.gel.driver.binary.PacketWriter; -import com.gel.driver.binary.protocol.ClientMessageType; -import com.gel.driver.binary.protocol.Sendable; +import com.geldata.driver.binary.PacketWriter; +import com.geldata.driver.binary.protocol.ClientMessageType; +import com.geldata.driver.binary.protocol.Sendable; public class Terminate extends Sendable { public static final Sendable INSTANCE = new Terminate(); diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/V2ProtocolProvider.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/V2ProtocolProvider.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/V2ProtocolProvider.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/V2ProtocolProvider.java index 577547c9..539969bc 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/V2ProtocolProvider.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/V2ProtocolProvider.java @@ -1,22 +1,23 @@ -package com.gel.driver.binary.protocol.v2; - -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.builders.CodecBuilder; -import com.gel.driver.binary.codecs.*; -import com.gel.driver.binary.protocol.ProtocolProvider; -import com.gel.driver.binary.protocol.ProtocolVersion; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.v1.V1ProtocolProvider; -import com.gel.driver.binary.protocol.v2.descriptors.*; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.datatypes.Range; -import com.gel.driver.exceptions.MissingCodecException; -import com.gel.driver.exceptions.UnexpectedMessageException; +package com.geldata.driver.binary.protocol.v2; + import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.builders.CodecBuilder; +import com.geldata.driver.binary.codecs.*; +import com.geldata.driver.binary.protocol.ProtocolProvider; +import com.geldata.driver.binary.protocol.ProtocolVersion; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.v1.V1ProtocolProvider; +import com.geldata.driver.binary.protocol.v2.descriptors.*; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.datatypes.Range; +import com.geldata.driver.exceptions.MissingCodecException; +import com.geldata.driver.exceptions.UnexpectedMessageException; + import java.lang.reflect.Array; import java.util.HashMap; import java.util.Map; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ArrayTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ArrayTypeDescriptor.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ArrayTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ArrayTypeDescriptor.java index 47e40243..eb2a5321 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ArrayTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ArrayTypeDescriptor.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/CompoundTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/CompoundTypeDescriptor.java similarity index 72% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/CompoundTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/CompoundTypeDescriptor.java index d23fa64f..e7d9a185 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/CompoundTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/CompoundTypeDescriptor.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.binary.protocol.common.descriptors.TypeOperation; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.binary.protocol.common.descriptors.TypeOperation; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/DescriptorType.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/DescriptorType.java similarity index 82% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/DescriptorType.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/DescriptorType.java index b1cc7fbc..73b99a77 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/DescriptorType.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/DescriptorType.java @@ -1,6 +1,6 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.BinaryEnum; +import com.geldata.driver.binary.BinaryEnum; public enum DescriptorType implements BinaryEnum { SET(0), diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/EnumerationTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/EnumerationTypeDescriptor.java similarity index 78% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/EnumerationTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/EnumerationTypeDescriptor.java index 12c08d7e..b799f17b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/EnumerationTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/EnumerationTypeDescriptor.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/InputShapeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/InputShapeDescriptor.java similarity index 64% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/InputShapeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/InputShapeDescriptor.java index f1cd91d6..73d953e9 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/InputShapeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/InputShapeDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.common.descriptors.ShapeElement; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.common.descriptors.ShapeElement; + import java.util.UUID; public class InputShapeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/MetadataDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/MetadataDescriptor.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/MetadataDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/MetadataDescriptor.java index 07643297..4b8e39bf 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/MetadataDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/MetadataDescriptor.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecAncestor; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.Nullable; import org.joou.UShort; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecAncestor; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.function.Function; public interface MetadataDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/MultiRangeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/MultiRangeDescriptor.java similarity index 76% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/MultiRangeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/MultiRangeDescriptor.java index a9b567c2..735cb3e1 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/MultiRangeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/MultiRangeDescriptor.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.Nullable; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/NamedTupleTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/NamedTupleTypeDescriptor.java similarity index 74% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/NamedTupleTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/NamedTupleTypeDescriptor.java index e51cdaeb..3fce6cfe 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/NamedTupleTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/NamedTupleTypeDescriptor.java @@ -1,14 +1,15 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; -import com.gel.driver.binary.protocol.common.descriptors.TupleElement; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; +import com.geldata.driver.binary.protocol.common.descriptors.TupleElement; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ObjectOutputShapeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ObjectOutputShapeDescriptor.java similarity index 79% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ObjectOutputShapeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ObjectOutputShapeDescriptor.java index cd619c60..870ce9d6 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ObjectOutputShapeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ObjectOutputShapeDescriptor.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class ObjectOutputShapeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ObjectTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ObjectTypeDescriptor.java similarity index 71% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ObjectTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ObjectTypeDescriptor.java index 1fb578b7..2a9cb2ca 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ObjectTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ObjectTypeDescriptor.java @@ -1,12 +1,13 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/RangeTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/RangeTypeDescriptor.java similarity index 77% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/RangeTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/RangeTypeDescriptor.java index a5b408a0..6ae9ad11 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/RangeTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/RangeTypeDescriptor.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ScalarTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ScalarTypeDescriptor.java similarity index 76% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ScalarTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ScalarTypeDescriptor.java index 10e7f9f2..aef75a5b 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ScalarTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ScalarTypeDescriptor.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/SetTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/SetTypeDescriptor.java similarity index 69% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/SetTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/SetTypeDescriptor.java index dd993a79..9f8e8e41 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/SetTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/SetTypeDescriptor.java @@ -1,9 +1,10 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class SetTypeDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ShapeElement.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ShapeElement.java similarity index 71% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ShapeElement.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ShapeElement.java index 0b45571b..83ec10ac 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/ShapeElement.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/ShapeElement.java @@ -1,11 +1,12 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.descriptors.ShapeElementFlags; import org.joou.UInteger; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.descriptors.ShapeElementFlags; + public final class ShapeElement { public final ShapeElementFlags flags; public final Cardinality cardinality; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/TupleTypeDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/TupleTypeDescriptor.java similarity index 78% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/TupleTypeDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/TupleTypeDescriptor.java index ce072b11..31a493ec 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/TupleTypeDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/TupleTypeDescriptor.java @@ -1,13 +1,14 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.TypeDescriptor; -import com.gel.driver.binary.protocol.TypeDescriptorInfo; -import com.gel.driver.binary.protocol.common.descriptors.CodecMetadata; import org.jetbrains.annotations.NotNull; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.TypeDescriptor; +import com.geldata.driver.binary.protocol.TypeDescriptorInfo; +import com.geldata.driver.binary.protocol.common.descriptors.CodecMetadata; + import java.util.UUID; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/TypeAnnotationTextDescriptor.java b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/TypeAnnotationTextDescriptor.java similarity index 71% rename from src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/TypeAnnotationTextDescriptor.java rename to src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/TypeAnnotationTextDescriptor.java index 23c85c40..81407d8d 100644 --- a/src/driver/src/main/java/com/gel/driver/binary/protocol/v2/descriptors/TypeAnnotationTextDescriptor.java +++ b/src/driver/src/main/java/com/geldata/driver/binary/protocol/v2/descriptors/TypeAnnotationTextDescriptor.java @@ -1,10 +1,11 @@ -package com.gel.driver.binary.protocol.v2.descriptors; +package com.geldata.driver.binary.protocol.v2.descriptors; -import com.gel.driver.binary.PacketReader; -import com.gel.driver.binary.builders.CodecBuilder; -import com.gel.driver.binary.protocol.TypeDescriptor; import org.joou.UShort; +import com.geldata.driver.binary.PacketReader; +import com.geldata.driver.binary.builders.CodecBuilder; +import com.geldata.driver.binary.protocol.TypeDescriptor; + import java.util.UUID; public final class TypeAnnotationTextDescriptor implements TypeDescriptor { diff --git a/src/driver/src/main/java/com/gel/driver/clients/BaseGelClient.java b/src/driver/src/main/java/com/geldata/driver/clients/BaseGelClient.java similarity index 91% rename from src/driver/src/main/java/com/gel/driver/clients/BaseGelClient.java rename to src/driver/src/main/java/com/geldata/driver/clients/BaseGelClient.java index 762a3d38..82be1e7e 100644 --- a/src/driver/src/main/java/com/gel/driver/clients/BaseGelClient.java +++ b/src/driver/src/main/java/com/geldata/driver/clients/BaseGelClient.java @@ -1,15 +1,16 @@ -package com.gel.driver.clients; - -import com.gel.driver.GelClientConfig; -import com.gel.driver.GelConnection; -import com.gel.driver.GelQueryable; -import com.gel.driver.async.AsyncEvent; -import com.gel.driver.state.Config; -import com.gel.driver.state.Session; +package com.geldata.driver.clients; + import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientConfig; +import com.geldata.driver.GelConnection; +import com.geldata.driver.GelQueryable; +import com.geldata.driver.async.AsyncEvent; +import com.geldata.driver.state.Config; +import com.geldata.driver.state.Session; + import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletionStage; diff --git a/src/driver/src/main/java/com/gel/driver/clients/GelBinaryClient.java b/src/driver/src/main/java/com/geldata/driver/clients/GelBinaryClient.java similarity index 95% rename from src/driver/src/main/java/com/gel/driver/clients/GelBinaryClient.java rename to src/driver/src/main/java/com/geldata/driver/clients/GelBinaryClient.java index b763ee77..662a2af5 100644 --- a/src/driver/src/main/java/com/gel/driver/clients/GelBinaryClient.java +++ b/src/driver/src/main/java/com/geldata/driver/clients/GelBinaryClient.java @@ -1,20 +1,5 @@ -package com.gel.driver.clients; - -import com.gel.driver.*; -import com.gel.driver.binary.builders.CodecBuilder; -import com.gel.driver.binary.builders.ObjectBuilder; -import com.gel.driver.binary.builders.types.TypeBuilder; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.codecs.CodecContext; -import com.gel.driver.binary.duplexers.Duplexer; -import com.gel.driver.binary.protocol.*; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.IOFormat; -import com.gel.driver.datatypes.Json; -import com.gel.driver.exceptions.ConnectionFailedException; -import com.gel.driver.exceptions.GelErrorException; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.ResultCardinalityMismatchException; +package com.geldata.driver.clients; + import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,7 +7,26 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.*; +import com.geldata.driver.binary.builders.CodecBuilder; +import com.geldata.driver.binary.builders.ObjectBuilder; +import com.geldata.driver.binary.builders.types.TypeBuilder; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.codecs.CodecContext; +import com.geldata.driver.binary.duplexers.Duplexer; +import com.geldata.driver.binary.protocol.*; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.IOFormat; +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.exceptions.ConnectionFailedException; +import com.geldata.driver.exceptions.GelErrorException; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.ResultCardinalityMismatchException; + import javax.naming.OperationNotSupportedException; + +import static com.geldata.driver.util.ComposableUtil.exceptionallyCompose; + import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; @@ -30,8 +34,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; -import static com.gel.driver.util.ComposableUtil.exceptionallyCompose; - public abstract class GelBinaryClient extends BaseGelClient { private static final Logger logger = LoggerFactory.getLogger(GelBinaryClient.class); @SuppressWarnings("rawtypes") diff --git a/src/driver/src/main/java/com/gel/driver/clients/GelHttpClient.java b/src/driver/src/main/java/com/geldata/driver/clients/GelHttpClient.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/clients/GelHttpClient.java rename to src/driver/src/main/java/com/geldata/driver/clients/GelHttpClient.java index 89af083e..d386df11 100644 --- a/src/driver/src/main/java/com/gel/driver/clients/GelHttpClient.java +++ b/src/driver/src/main/java/com/geldata/driver/clients/GelHttpClient.java @@ -1,19 +1,20 @@ -package com.gel.driver.clients; - -import com.gel.driver.GelClientConfig; -import com.gel.driver.GelConnection; -import com.gel.driver.TransactionState; -import com.gel.driver.binary.duplexers.Duplexer; -import com.gel.driver.binary.duplexers.HttpDuplexer; -import com.gel.driver.exceptions.ConnectionFailedException; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.ScramException; -import com.gel.driver.util.Scram; -import com.gel.driver.util.SslUtils; +package com.geldata.driver.clients; + import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.GelClientConfig; +import com.geldata.driver.GelConnection; +import com.geldata.driver.TransactionState; +import com.geldata.driver.binary.duplexers.Duplexer; +import com.geldata.driver.binary.duplexers.HttpDuplexer; +import com.geldata.driver.exceptions.ConnectionFailedException; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.ScramException; +import com.geldata.driver.util.Scram; +import com.geldata.driver.util.SslUtils; + import javax.net.ssl.SSLContext; import java.io.IOException; import java.net.ProtocolException; diff --git a/src/driver/src/main/java/com/gel/driver/clients/GelTcpClient.java b/src/driver/src/main/java/com/geldata/driver/clients/GelTcpClient.java similarity index 95% rename from src/driver/src/main/java/com/gel/driver/clients/GelTcpClient.java rename to src/driver/src/main/java/com/geldata/driver/clients/GelTcpClient.java index fd27ff6d..487f2b02 100644 --- a/src/driver/src/main/java/com/gel/driver/clients/GelTcpClient.java +++ b/src/driver/src/main/java/com/geldata/driver/clients/GelTcpClient.java @@ -1,11 +1,5 @@ -package com.gel.driver.clients; - -import com.gel.driver.*; -import com.gel.driver.async.ChannelCompletableFuture; -import com.gel.driver.binary.PacketSerializer; -import com.gel.driver.binary.duplexers.ChannelDuplexer; -import com.gel.driver.exceptions.ConnectionFailedTemporarilyException; -import com.gel.driver.util.SslUtils; +package com.geldata.driver.clients; + import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.PooledByteBufAllocator; @@ -24,6 +18,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.*; +import com.geldata.driver.async.ChannelCompletableFuture; +import com.geldata.driver.binary.PacketSerializer; +import com.geldata.driver.binary.duplexers.ChannelDuplexer; +import com.geldata.driver.exceptions.ConnectionFailedTemporarilyException; +import com.geldata.driver.util.SslUtils; + +import static com.geldata.driver.util.ComposableUtil.exceptionallyCompose; + import java.net.ConnectException; import java.util.ArrayList; import java.util.EnumSet; @@ -37,8 +40,6 @@ import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSessionContext; -import static com.gel.driver.util.ComposableUtil.exceptionallyCompose; - public class GelTcpClient extends GelBinaryClient implements TransactableClient { private static final Logger logger = LoggerFactory.getLogger(GelTcpClient.class); private static final NioEventLoopGroup NETTY_TCP_GROUP = new NioEventLoopGroup(); diff --git a/src/driver/src/main/java/com/gel/driver/clients/StatefulClient.java b/src/driver/src/main/java/com/geldata/driver/clients/StatefulClient.java similarity index 81% rename from src/driver/src/main/java/com/gel/driver/clients/StatefulClient.java rename to src/driver/src/main/java/com/geldata/driver/clients/StatefulClient.java index b8abaf76..cc62a08e 100644 --- a/src/driver/src/main/java/com/gel/driver/clients/StatefulClient.java +++ b/src/driver/src/main/java/com/geldata/driver/clients/StatefulClient.java @@ -1,9 +1,10 @@ -package com.gel.driver.clients; +package com.geldata.driver.clients; -import com.gel.driver.state.Config; -import com.gel.driver.state.Session; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.state.Config; +import com.geldata.driver.state.Session; + import java.util.Map; import java.util.function.Consumer; diff --git a/src/driver/src/main/java/com/gel/driver/clients/TransactableClient.java b/src/driver/src/main/java/com/geldata/driver/clients/TransactableClient.java similarity index 88% rename from src/driver/src/main/java/com/gel/driver/clients/TransactableClient.java rename to src/driver/src/main/java/com/geldata/driver/clients/TransactableClient.java index ffa5b90a..8a5e5225 100644 --- a/src/driver/src/main/java/com/gel/driver/clients/TransactableClient.java +++ b/src/driver/src/main/java/com/geldata/driver/clients/TransactableClient.java @@ -1,9 +1,10 @@ -package com.gel.driver.clients; +package com.geldata.driver.clients; -import com.gel.driver.*; -import com.gel.driver.internal.TransactionImpl; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.*; +import com.geldata.driver.internal.TransactionImpl; + import java.util.concurrent.CompletionStage; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/Json.java b/src/driver/src/main/java/com/geldata/driver/datatypes/Json.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/datatypes/Json.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/Json.java index 2c2aafb4..d491f552 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/Json.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/Json.java @@ -1,4 +1,4 @@ -package com.gel.driver.datatypes; +package com.geldata.driver.datatypes; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/Memory.java b/src/driver/src/main/java/com/geldata/driver/datatypes/Memory.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/datatypes/Memory.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/Memory.java index cfd9d7cb..b88345ef 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/Memory.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/Memory.java @@ -1,4 +1,4 @@ -package com.gel.driver.datatypes; +package com.geldata.driver.datatypes; /** * A class representing the {@code cfg::memory} type. diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/MultiRange.java b/src/driver/src/main/java/com/geldata/driver/datatypes/MultiRange.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/datatypes/MultiRange.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/MultiRange.java index af7d04e2..edfc56b8 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/MultiRange.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/MultiRange.java @@ -1,4 +1,4 @@ -package com.gel.driver.datatypes; +package com.geldata.driver.datatypes; import java.util.Arrays; import java.util.Collection; diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/Range.java b/src/driver/src/main/java/com/geldata/driver/datatypes/Range.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/datatypes/Range.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/Range.java index 931ba147..8dbbee55 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/Range.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/Range.java @@ -1,4 +1,4 @@ -package com.gel.driver.datatypes; +package com.geldata.driver.datatypes; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/RelativeDuration.java b/src/driver/src/main/java/com/geldata/driver/datatypes/RelativeDuration.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/datatypes/RelativeDuration.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/RelativeDuration.java index 9222ac62..b6af4c7c 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/RelativeDuration.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/RelativeDuration.java @@ -1,4 +1,4 @@ -package com.gel.driver.datatypes; +package com.geldata.driver.datatypes; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/Tuple.java b/src/driver/src/main/java/com/geldata/driver/datatypes/Tuple.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/datatypes/Tuple.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/Tuple.java index 0d80f1c0..2f307a33 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/Tuple.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/Tuple.java @@ -1,9 +1,10 @@ -package com.gel.driver.datatypes; +package com.geldata.driver.datatypes; -import com.gel.driver.datatypes.internal.TupleImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.datatypes.internal.TupleImpl; + import java.util.Collection; /** diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/internal/CloudProfile.java b/src/driver/src/main/java/com/geldata/driver/datatypes/internal/CloudProfile.java similarity index 75% rename from src/driver/src/main/java/com/gel/driver/datatypes/internal/CloudProfile.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/internal/CloudProfile.java index a5977964..c91be581 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/internal/CloudProfile.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/internal/CloudProfile.java @@ -1,4 +1,4 @@ -package com.gel.driver.datatypes.internal; +package com.geldata.driver.datatypes.internal; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/driver/src/main/java/com/gel/driver/datatypes/internal/TupleImpl.java b/src/driver/src/main/java/com/geldata/driver/datatypes/internal/TupleImpl.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/datatypes/internal/TupleImpl.java rename to src/driver/src/main/java/com/geldata/driver/datatypes/internal/TupleImpl.java index 787f466b..9506b91e 100644 --- a/src/driver/src/main/java/com/gel/driver/datatypes/internal/TupleImpl.java +++ b/src/driver/src/main/java/com/geldata/driver/datatypes/internal/TupleImpl.java @@ -1,13 +1,14 @@ -package com.gel.driver.datatypes.internal; +package com.geldata.driver.datatypes.internal; -import com.gel.driver.annotations.GelDeserializer; -import com.gel.driver.annotations.GelType; -import com.gel.driver.ObjectEnumerator; -import com.gel.driver.datatypes.Tuple; -import com.gel.driver.exceptions.GelException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.ObjectEnumerator; +import com.geldata.driver.annotations.GelDeserializer; +import com.geldata.driver.annotations.GelType; +import com.geldata.driver.datatypes.Tuple; +import com.geldata.driver.exceptions.GelException; + import javax.naming.OperationNotSupportedException; import java.util.*; import java.util.stream.Collectors; diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/ConfigurationException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/ConfigurationException.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/exceptions/ConfigurationException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/ConfigurationException.java index 77e69c30..5bff5345 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/ConfigurationException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/ConfigurationException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents a generic configuration error. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/ConnectionFailedException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/ConnectionFailedException.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/exceptions/ConnectionFailedException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/ConnectionFailedException.java index 6ae18550..c07f3b2b 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/ConnectionFailedException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/ConnectionFailedException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents a connection failure that cannot be retried. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/ConnectionFailedTemporarilyException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/ConnectionFailedTemporarilyException.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/exceptions/ConnectionFailedTemporarilyException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/ConnectionFailedTemporarilyException.java index 53fab5ef..c2c6e659 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/ConnectionFailedTemporarilyException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/ConnectionFailedTemporarilyException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents a temporary connection failure exception. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/GelErrorException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/GelErrorException.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/exceptions/GelErrorException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/GelErrorException.java index 1d367d80..e172ed0c 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/GelErrorException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/GelErrorException.java @@ -1,10 +1,11 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; -import com.gel.driver.ErrorCode; -import com.gel.driver.util.StringsUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.ErrorCode; +import com.geldata.driver.util.StringsUtil; + import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.function.Function; diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/GelException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/GelException.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/exceptions/GelException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/GelException.java index a41fdc1f..f6f8924a 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/GelException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/GelException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents a generic exception that occurred within the binding. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/InvalidSignatureException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/InvalidSignatureException.java similarity index 89% rename from src/driver/src/main/java/com/gel/driver/exceptions/InvalidSignatureException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/InvalidSignatureException.java index e036f0ca..abd1ac4d 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/InvalidSignatureException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/InvalidSignatureException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception caused by an invalid signature. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/MissingCodecException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/MissingCodecException.java similarity index 92% rename from src/driver/src/main/java/com/gel/driver/exceptions/MissingCodecException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/MissingCodecException.java index 331aea38..1b3add64 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/MissingCodecException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/MissingCodecException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception that occurs when the binding doesn't have a codec for incoming or outgoing data, or the diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/NoTypeConverterException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/NoTypeConverterException.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/exceptions/NoTypeConverterException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/NoTypeConverterException.java index da2b6e93..5fa0e0ad 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/NoTypeConverterException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/NoTypeConverterException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/ResultCardinalityMismatchException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/ResultCardinalityMismatchException.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/exceptions/ResultCardinalityMismatchException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/ResultCardinalityMismatchException.java index 88467906..5c358cf4 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/ResultCardinalityMismatchException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/ResultCardinalityMismatchException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception that occurs when a queries cardinality isn't what the binding was expecting it to be. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/ScramException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/ScramException.java similarity index 95% rename from src/driver/src/main/java/com/gel/driver/exceptions/ScramException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/ScramException.java index 98907d0f..f61ed273 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/ScramException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/ScramException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception thrown because of a malformed scram message. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/TransactionException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/TransactionException.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/exceptions/TransactionException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/TransactionException.java index 4079e3ee..6553a07d 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/TransactionException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/TransactionException.java @@ -1,8 +1,8 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception that was cased within a transaction. - * @see com.gel.driver.Transaction + * @see com.geldata.driver.Transaction */ public final class TransactionException extends GelException { /** diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/UnexpectedDisconnectException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/UnexpectedDisconnectException.java similarity index 89% rename from src/driver/src/main/java/com/gel/driver/exceptions/UnexpectedDisconnectException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/UnexpectedDisconnectException.java index 07ed007e..decb6a02 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/UnexpectedDisconnectException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/UnexpectedDisconnectException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception that was caused by an unexpected disconnection. diff --git a/src/driver/src/main/java/com/gel/driver/exceptions/UnexpectedMessageException.java b/src/driver/src/main/java/com/geldata/driver/exceptions/UnexpectedMessageException.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/exceptions/UnexpectedMessageException.java rename to src/driver/src/main/java/com/geldata/driver/exceptions/UnexpectedMessageException.java index 162c949a..0aa0d528 100644 --- a/src/driver/src/main/java/com/gel/driver/exceptions/UnexpectedMessageException.java +++ b/src/driver/src/main/java/com/geldata/driver/exceptions/UnexpectedMessageException.java @@ -1,4 +1,4 @@ -package com.gel.driver.exceptions; +package com.geldata.driver.exceptions; /** * Represents an exception caused by an unexpected message. diff --git a/src/driver/src/main/java/com/gel/driver/internal/BaseDefaultSystemProvider.java b/src/driver/src/main/java/com/geldata/driver/internal/BaseDefaultSystemProvider.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/internal/BaseDefaultSystemProvider.java rename to src/driver/src/main/java/com/geldata/driver/internal/BaseDefaultSystemProvider.java index 39602d65..aece1262 100644 --- a/src/driver/src/main/java/com/gel/driver/internal/BaseDefaultSystemProvider.java +++ b/src/driver/src/main/java/com/geldata/driver/internal/BaseDefaultSystemProvider.java @@ -1,10 +1,11 @@ -package com.gel.driver.internal; +package com.geldata.driver.internal; -import com.gel.driver.abstractions.OSType; -import com.gel.driver.abstractions.SystemProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.abstractions.OSType; +import com.geldata.driver.abstractions.SystemProvider; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/src/driver/src/main/java/com/gel/driver/internal/DefaultSystemProvider.java b/src/driver/src/main/java/com/geldata/driver/internal/DefaultSystemProvider.java similarity index 66% rename from src/driver/src/main/java/com/gel/driver/internal/DefaultSystemProvider.java rename to src/driver/src/main/java/com/geldata/driver/internal/DefaultSystemProvider.java index 1b50f074..728e8e2a 100644 --- a/src/driver/src/main/java/com/gel/driver/internal/DefaultSystemProvider.java +++ b/src/driver/src/main/java/com/geldata/driver/internal/DefaultSystemProvider.java @@ -1,4 +1,4 @@ -package com.gel.driver.internal; +package com.geldata.driver.internal; public class DefaultSystemProvider extends BaseDefaultSystemProvider { } diff --git a/src/driver/src/main/java/com/gel/driver/internal/TransactionImpl.java b/src/driver/src/main/java/com/geldata/driver/internal/TransactionImpl.java similarity index 90% rename from src/driver/src/main/java/com/gel/driver/internal/TransactionImpl.java rename to src/driver/src/main/java/com/geldata/driver/internal/TransactionImpl.java index 34dcca9f..54411832 100644 --- a/src/driver/src/main/java/com/gel/driver/internal/TransactionImpl.java +++ b/src/driver/src/main/java/com/geldata/driver/internal/TransactionImpl.java @@ -1,19 +1,20 @@ -package com.gel.driver.internal; - -import com.gel.driver.Capabilities; -import com.gel.driver.Transaction; -import com.gel.driver.TransactionSettings; -import com.gel.driver.TransactionState; -import com.gel.driver.abstractions.QueryDelegate; -import com.gel.driver.clients.TransactableClient; -import com.gel.driver.datatypes.Json; -import com.gel.driver.exceptions.GelException; -import com.gel.driver.exceptions.TransactionException; +package com.geldata.driver.internal; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.Capabilities; +import com.geldata.driver.Transaction; +import com.geldata.driver.TransactionSettings; +import com.geldata.driver.TransactionState; +import com.geldata.driver.abstractions.QueryDelegate; +import com.geldata.driver.clients.TransactableClient; +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.exceptions.GelException; +import com.geldata.driver.exceptions.TransactionException; + import java.util.EnumSet; import java.util.List; import java.util.Map; @@ -25,7 +26,7 @@ import java.util.function.Function; public final class TransactionImpl implements Transaction { - private static final Logger logger = LoggerFactory.getLogger(com.gel.driver.Transaction.class); + private static final Logger logger = LoggerFactory.getLogger(com.geldata.driver.Transaction.class); private final TransactableClient client; private final TransactionSettings settings; @@ -37,7 +38,7 @@ public TransactionImpl(TransactableClient client, TransactionSettings settings) this.semaphore = new Semaphore(1); } - public CompletionStage run(@NotNull Function> func) { + public CompletionStage run(@NotNull Function> func) { return start() .thenCompose((v) -> func.apply(this) .thenApply((u) -> (CompletionStage) CompletableFuture.completedFuture(u)) diff --git a/src/driver/src/main/java/com/gel/driver/namingstrategies/CamelCaseNamingStrategy.java b/src/driver/src/main/java/com/geldata/driver/namingstrategies/CamelCaseNamingStrategy.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/namingstrategies/CamelCaseNamingStrategy.java rename to src/driver/src/main/java/com/geldata/driver/namingstrategies/CamelCaseNamingStrategy.java index 9a00a724..9c4075f5 100644 --- a/src/driver/src/main/java/com/gel/driver/namingstrategies/CamelCaseNamingStrategy.java +++ b/src/driver/src/main/java/com/geldata/driver/namingstrategies/CamelCaseNamingStrategy.java @@ -1,8 +1,9 @@ -package com.gel.driver.namingstrategies; +package com.geldata.driver.namingstrategies; -import com.gel.driver.util.StringsUtil; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.util.StringsUtil; + final class CamelCaseNamingStrategy implements NamingStrategy { public static final CamelCaseNamingStrategy INSTANCE = new CamelCaseNamingStrategy(); diff --git a/src/driver/src/main/java/com/gel/driver/namingstrategies/DefaultNamingStrategy.java b/src/driver/src/main/java/com/geldata/driver/namingstrategies/DefaultNamingStrategy.java similarity index 83% rename from src/driver/src/main/java/com/gel/driver/namingstrategies/DefaultNamingStrategy.java rename to src/driver/src/main/java/com/geldata/driver/namingstrategies/DefaultNamingStrategy.java index 659740d3..e8293369 100644 --- a/src/driver/src/main/java/com/gel/driver/namingstrategies/DefaultNamingStrategy.java +++ b/src/driver/src/main/java/com/geldata/driver/namingstrategies/DefaultNamingStrategy.java @@ -1,4 +1,4 @@ -package com.gel.driver.namingstrategies; +package com.geldata.driver.namingstrategies; final class DefaultNamingStrategy implements NamingStrategy { public static final DefaultNamingStrategy INSTANCE = new DefaultNamingStrategy(); diff --git a/src/driver/src/main/java/com/gel/driver/namingstrategies/NamingStrategy.java b/src/driver/src/main/java/com/geldata/driver/namingstrategies/NamingStrategy.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/namingstrategies/NamingStrategy.java rename to src/driver/src/main/java/com/geldata/driver/namingstrategies/NamingStrategy.java index 4c5af9c3..6706a0de 100644 --- a/src/driver/src/main/java/com/gel/driver/namingstrategies/NamingStrategy.java +++ b/src/driver/src/main/java/com/geldata/driver/namingstrategies/NamingStrategy.java @@ -1,4 +1,4 @@ -package com.gel.driver.namingstrategies; +package com.geldata.driver.namingstrategies; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/namingstrategies/PascalNamingStrategy.java b/src/driver/src/main/java/com/geldata/driver/namingstrategies/PascalNamingStrategy.java similarity index 92% rename from src/driver/src/main/java/com/gel/driver/namingstrategies/PascalNamingStrategy.java rename to src/driver/src/main/java/com/geldata/driver/namingstrategies/PascalNamingStrategy.java index b0d5aadd..70e8584c 100644 --- a/src/driver/src/main/java/com/gel/driver/namingstrategies/PascalNamingStrategy.java +++ b/src/driver/src/main/java/com/geldata/driver/namingstrategies/PascalNamingStrategy.java @@ -1,8 +1,9 @@ -package com.gel.driver.namingstrategies; +package com.geldata.driver.namingstrategies; -import com.gel.driver.util.StringsUtil; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.util.StringsUtil; + final class PascalNamingStrategy implements NamingStrategy { public static final PascalNamingStrategy INSTANCE = new PascalNamingStrategy(); diff --git a/src/driver/src/main/java/com/gel/driver/namingstrategies/SnakeCaseNamingStrategy.java b/src/driver/src/main/java/com/geldata/driver/namingstrategies/SnakeCaseNamingStrategy.java similarity index 89% rename from src/driver/src/main/java/com/gel/driver/namingstrategies/SnakeCaseNamingStrategy.java rename to src/driver/src/main/java/com/geldata/driver/namingstrategies/SnakeCaseNamingStrategy.java index 0d1c713e..dec87839 100644 --- a/src/driver/src/main/java/com/gel/driver/namingstrategies/SnakeCaseNamingStrategy.java +++ b/src/driver/src/main/java/com/geldata/driver/namingstrategies/SnakeCaseNamingStrategy.java @@ -1,8 +1,9 @@ -package com.gel.driver.namingstrategies; +package com.geldata.driver.namingstrategies; -import com.gel.driver.util.StringsUtil; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.util.StringsUtil; + final class SnakeCaseNamingStrategy implements NamingStrategy { public static final SnakeCaseNamingStrategy INSTANCE = new SnakeCaseNamingStrategy(); diff --git a/src/driver/src/main/java/com/gel/driver/state/Config.java b/src/driver/src/main/java/com/geldata/driver/state/Config.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/state/Config.java rename to src/driver/src/main/java/com/geldata/driver/state/Config.java index 069ac459..ef67f4c6 100644 --- a/src/driver/src/main/java/com/gel/driver/state/Config.java +++ b/src/driver/src/main/java/com/geldata/driver/state/Config.java @@ -1,4 +1,4 @@ -package com.gel.driver.state; +package com.geldata.driver.state; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/com/gel/driver/state/Session.java b/src/driver/src/main/java/com/geldata/driver/state/Session.java similarity index 99% rename from src/driver/src/main/java/com/gel/driver/state/Session.java rename to src/driver/src/main/java/com/geldata/driver/state/Session.java index d9e3ab03..fabb05e7 100644 --- a/src/driver/src/main/java/com/gel/driver/state/Session.java +++ b/src/driver/src/main/java/com/geldata/driver/state/Session.java @@ -1,4 +1,4 @@ -package com.gel.driver.state; +package com.geldata.driver.state; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/util/BinaryProtocolUtils.java b/src/driver/src/main/java/com/geldata/driver/util/BinaryProtocolUtils.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/util/BinaryProtocolUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/BinaryProtocolUtils.java index 58eaec24..727e3088 100644 --- a/src/driver/src/main/java/com/gel/driver/util/BinaryProtocolUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/BinaryProtocolUtils.java @@ -1,10 +1,11 @@ -package com.gel.driver.util; +package com.geldata.driver.util; -import com.gel.driver.binary.SerializableData; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.geldata.driver.binary.SerializableData; + import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/driver/src/main/java/com/gel/driver/util/CRCHQX.java b/src/driver/src/main/java/com/geldata/driver/util/CRCHQX.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/util/CRCHQX.java rename to src/driver/src/main/java/com/geldata/driver/util/CRCHQX.java index a7174f57..b78656bc 100644 --- a/src/driver/src/main/java/com/gel/driver/util/CRCHQX.java +++ b/src/driver/src/main/java/com/geldata/driver/util/CRCHQX.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; public final class CRCHQX { private static final int[] CRC_TAB_HQX = new int[]{ diff --git a/src/driver/src/main/java/com/gel/driver/util/ClientPoolHolder.java b/src/driver/src/main/java/com/geldata/driver/util/ClientPoolHolder.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/util/ClientPoolHolder.java rename to src/driver/src/main/java/com/geldata/driver/util/ClientPoolHolder.java index c0523005..6daaf6d2 100644 --- a/src/driver/src/main/java/com/gel/driver/util/ClientPoolHolder.java +++ b/src/driver/src/main/java/com/geldata/driver/util/ClientPoolHolder.java @@ -1,11 +1,12 @@ -package com.gel.driver.util; +package com.geldata.driver.util; -import com.gel.driver.clients.BaseGelClient; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.geldata.driver.clients.BaseGelClient; + import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/src/driver/src/main/java/com/gel/driver/util/CollectionUtils.java b/src/driver/src/main/java/com/geldata/driver/util/CollectionUtils.java similarity index 94% rename from src/driver/src/main/java/com/gel/driver/util/CollectionUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/CollectionUtils.java index cec33f4f..9cac21bc 100644 --- a/src/driver/src/main/java/com/gel/driver/util/CollectionUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/CollectionUtils.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/util/ComposableUtil.java b/src/driver/src/main/java/com/geldata/driver/util/ComposableUtil.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/util/ComposableUtil.java rename to src/driver/src/main/java/com/geldata/driver/util/ComposableUtil.java index 137e233b..ad74e4ff 100644 --- a/src/driver/src/main/java/com/gel/driver/util/ComposableUtil.java +++ b/src/driver/src/main/java/com/geldata/driver/util/ComposableUtil.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import io.netty.util.ReferenceCounted; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/util/ConfigUtils.java b/src/driver/src/main/java/com/geldata/driver/util/ConfigUtils.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/util/ConfigUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/ConfigUtils.java index ef99ccb9..0daf96c5 100644 --- a/src/driver/src/main/java/com/gel/driver/util/ConfigUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/ConfigUtils.java @@ -1,18 +1,19 @@ -package com.gel.driver.util; - -import com.gel.driver.TLSSecurityMode; -import com.gel.driver.GelConnection.WaitTime; -import com.gel.driver.abstractions.OSType; -import com.gel.driver.abstractions.SystemProvider; -import com.gel.driver.internal.DefaultSystemProvider; -import com.gel.driver.util.JsonUtils.AsStringDeserializer; -import com.gel.driver.datatypes.internal.CloudProfile; -import com.gel.driver.exceptions.ConfigurationException; +package com.geldata.driver.util; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.json.JsonMapper; +import com.geldata.driver.TLSSecurityMode; +import com.geldata.driver.GelConnection.WaitTime; +import com.geldata.driver.abstractions.OSType; +import com.geldata.driver.abstractions.SystemProvider; +import com.geldata.driver.datatypes.internal.CloudProfile; +import com.geldata.driver.exceptions.ConfigurationException; +import com.geldata.driver.internal.DefaultSystemProvider; +import com.geldata.driver.util.JsonUtils.AsStringDeserializer; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/com/gel/driver/util/EnumsUtil.java b/src/driver/src/main/java/com/geldata/driver/util/EnumsUtil.java similarity index 93% rename from src/driver/src/main/java/com/gel/driver/util/EnumsUtil.java rename to src/driver/src/main/java/com/geldata/driver/util/EnumsUtil.java index bab0e9e7..f53e34e0 100644 --- a/src/driver/src/main/java/com/gel/driver/util/EnumsUtil.java +++ b/src/driver/src/main/java/com/geldata/driver/util/EnumsUtil.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/com/gel/driver/util/FastInverseIndexer.java b/src/driver/src/main/java/com/geldata/driver/util/FastInverseIndexer.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/util/FastInverseIndexer.java rename to src/driver/src/main/java/com/geldata/driver/util/FastInverseIndexer.java index 51c91669..0781db3d 100644 --- a/src/driver/src/main/java/com/gel/driver/util/FastInverseIndexer.java +++ b/src/driver/src/main/java/com/geldata/driver/util/FastInverseIndexer.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/util/HexUtils.java b/src/driver/src/main/java/com/geldata/driver/util/HexUtils.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/util/HexUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/HexUtils.java index 94e2020f..1c1abf78 100644 --- a/src/driver/src/main/java/com/gel/driver/util/HexUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/HexUtils.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; diff --git a/src/driver/src/main/java/com/gel/driver/util/JsonUtils.java b/src/driver/src/main/java/com/geldata/driver/util/JsonUtils.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/util/JsonUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/JsonUtils.java index c9cd1ae8..d432350c 100644 --- a/src/driver/src/main/java/com/gel/driver/util/JsonUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/JsonUtils.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import java.io.IOException; diff --git a/src/driver/src/main/java/com/gel/driver/util/QueryParamUtils.java b/src/driver/src/main/java/com/geldata/driver/util/QueryParamUtils.java similarity index 95% rename from src/driver/src/main/java/com/gel/driver/util/QueryParamUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/QueryParamUtils.java index fa0d2331..f4d06a4c 100644 --- a/src/driver/src/main/java/com/gel/driver/util/QueryParamUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/QueryParamUtils.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/util/Scram.java b/src/driver/src/main/java/com/geldata/driver/util/Scram.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/util/Scram.java rename to src/driver/src/main/java/com/geldata/driver/util/Scram.java index 880d82f2..354c6f70 100644 --- a/src/driver/src/main/java/com/gel/driver/util/Scram.java +++ b/src/driver/src/main/java/com/geldata/driver/util/Scram.java @@ -1,10 +1,11 @@ -package com.gel.driver.util; +package com.geldata.driver.util; -import com.gel.driver.exceptions.ScramException; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.exceptions.ScramException; + import javax.crypto.Mac; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; diff --git a/src/driver/src/main/java/com/gel/driver/util/SslUtils.java b/src/driver/src/main/java/com/geldata/driver/util/SslUtils.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/util/SslUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/SslUtils.java index d0bee2fd..904ba94c 100644 --- a/src/driver/src/main/java/com/gel/driver/util/SslUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/SslUtils.java @@ -1,10 +1,11 @@ -package com.gel.driver.util; +package com.geldata.driver.util; -import com.gel.driver.GelConnection; -import com.gel.driver.TLSSecurityMode; import io.netty.handler.ssl.SslContextBuilder; import org.jetbrains.annotations.NotNull; +import com.geldata.driver.GelConnection; +import com.geldata.driver.TLSSecurityMode; + import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; diff --git a/src/driver/src/main/java/com/gel/driver/util/StringsUtil.java b/src/driver/src/main/java/com/geldata/driver/util/StringsUtil.java similarity index 96% rename from src/driver/src/main/java/com/gel/driver/util/StringsUtil.java rename to src/driver/src/main/java/com/geldata/driver/util/StringsUtil.java index 497f86e2..bd2ea40c 100644 --- a/src/driver/src/main/java/com/gel/driver/util/StringsUtil.java +++ b/src/driver/src/main/java/com/geldata/driver/util/StringsUtil.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/com/gel/driver/util/TemporalUtils.java b/src/driver/src/main/java/com/geldata/driver/util/TemporalUtils.java similarity index 97% rename from src/driver/src/main/java/com/gel/driver/util/TemporalUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/TemporalUtils.java index 9f59da82..44ff955b 100644 --- a/src/driver/src/main/java/com/gel/driver/util/TemporalUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/TemporalUtils.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; diff --git a/src/driver/src/main/java/com/gel/driver/util/TypeUtils.java b/src/driver/src/main/java/com/geldata/driver/util/TypeUtils.java similarity index 98% rename from src/driver/src/main/java/com/gel/driver/util/TypeUtils.java rename to src/driver/src/main/java/com/geldata/driver/util/TypeUtils.java index 186579da..f366ad37 100644 --- a/src/driver/src/main/java/com/gel/driver/util/TypeUtils.java +++ b/src/driver/src/main/java/com/geldata/driver/util/TypeUtils.java @@ -1,4 +1,4 @@ -package com.gel.driver.util; +package com.geldata.driver.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/driver/src/main/java/module-info.java b/src/driver/src/main/java/module-info.java index 31fc7792..c599f2a0 100644 --- a/src/driver/src/main/java/module-info.java +++ b/src/driver/src/main/java/module-info.java @@ -1,10 +1,10 @@ -module com.gel.driver { - exports com.gel.driver; - exports com.gel.driver.datatypes; - exports com.gel.driver.exceptions; - exports com.gel.driver.namingstrategies; - exports com.gel.driver.annotations; - exports com.gel.driver.state; +module com.geldata.driver { + exports com.geldata.driver; + exports com.geldata.driver.datatypes; + exports com.geldata.driver.exceptions; + exports com.geldata.driver.namingstrategies; + exports com.geldata.driver.annotations; + exports com.geldata.driver.state; requires org.jetbrains.annotations; requires com.fasterxml.jackson.core; @@ -20,5 +20,5 @@ requires org.reflections; requires java.net.http; - opens com.gel.driver; + opens com.geldata.driver; } diff --git a/src/driver/src/test/java/ClientTests.java b/src/driver/src/test/java/ClientTests.java index a29530dc..c6e78fda 100644 --- a/src/driver/src/test/java/ClientTests.java +++ b/src/driver/src/test/java/ClientTests.java @@ -1,7 +1,8 @@ -import com.gel.driver.GelClientPool; -import com.gel.driver.exceptions.GelException; import org.junit.jupiter.api.Test; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.exceptions.GelException; + import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/driver/src/test/java/ConnectionTests.java b/src/driver/src/test/java/ConnectionTests.java index c4002a68..8f5187c0 100644 --- a/src/driver/src/test/java/ConnectionTests.java +++ b/src/driver/src/test/java/ConnectionTests.java @@ -1,12 +1,3 @@ -import com.gel.driver.GelConnection; -import com.gel.driver.TLSSecurityMode; -import com.gel.driver.GelConnection.WaitTime; -import com.gel.driver.abstractions.SystemProvider; -import com.gel.driver.internal.BaseDefaultSystemProvider; -import com.gel.driver.util.ConfigUtils; -import com.gel.driver.util.ConfigUtils.ResolvedField; -import com.gel.driver.exceptions.ConfigurationException; - import org.assertj.core.api.Assert; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -18,6 +9,15 @@ import org.junit.jupiter.params.provider.ArgumentsSource; import org.junit.jupiter.params.provider.ValueSource; +import com.geldata.driver.GelConnection; +import com.geldata.driver.TLSSecurityMode; +import com.geldata.driver.GelConnection.WaitTime; +import com.geldata.driver.abstractions.SystemProvider; +import com.geldata.driver.exceptions.ConfigurationException; +import com.geldata.driver.internal.BaseDefaultSystemProvider; +import com.geldata.driver.util.ConfigUtils; +import com.geldata.driver.util.ConfigUtils.ResolvedField; + import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/driver/src/test/java/ProtocolTests.java b/src/driver/src/test/java/ProtocolTests.java index 40d809ab..604b8626 100644 --- a/src/driver/src/test/java/ProtocolTests.java +++ b/src/driver/src/test/java/ProtocolTests.java @@ -1,7 +1,8 @@ -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelType; -import com.gel.driver.exceptions.GelException; import com.fasterxml.jackson.databind.json.JsonMapper; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelType; +import com.geldata.driver.exceptions.GelException; + import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +28,7 @@ public static class TestDatastructure { } /** - * The goal is to test the contract logic in {@linkplain com.gel.driver.binary.PacketSerializer}, specifically + * The goal is to test the contract logic in {@linkplain com.geldata.driver.binary.PacketSerializer}, specifically * the decoder returned from the createDecoder function. To achieve this, we can query something that * returns either multiple data packets amounting up to >16k bytes, or a single data packet that is >16k bytes. */ diff --git a/src/driver/src/test/java/QueryTests.java b/src/driver/src/test/java/QueryTests.java index d3363e77..e8b57b19 100644 --- a/src/driver/src/test/java/QueryTests.java +++ b/src/driver/src/test/java/QueryTests.java @@ -1,10 +1,11 @@ -import com.gel.driver.GelClientPool; -import com.gel.driver.annotations.GelLinkType; -import com.gel.driver.annotations.GelType; -import com.gel.driver.datatypes.MultiRange; -import com.gel.driver.datatypes.Range; import org.junit.jupiter.api.Test; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.annotations.GelLinkType; +import com.geldata.driver.annotations.GelType; +import com.geldata.driver.datatypes.MultiRange; +import com.geldata.driver.datatypes.Range; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/driver/src/test/java/ScramTests.java b/src/driver/src/test/java/ScramTests.java index 0df72d36..2fea582d 100644 --- a/src/driver/src/test/java/ScramTests.java +++ b/src/driver/src/test/java/ScramTests.java @@ -1,7 +1,8 @@ -import com.gel.driver.exceptions.ScramException; -import com.gel.driver.util.Scram; import org.junit.jupiter.api.Test; +import com.geldata.driver.exceptions.ScramException; +import com.geldata.driver.util.Scram; + import java.util.Base64; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/driver/src/test/java/SharedClientTests.java b/src/driver/src/test/java/SharedClientTests.java index c1fa7d93..a0616275 100644 --- a/src/driver/src/test/java/SharedClientTests.java +++ b/src/driver/src/test/java/SharedClientTests.java @@ -34,18 +34,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.shadow.com.univocity.parsers.annotations.Convert; -import com.gel.driver.GelConnection; -import com.gel.driver.GelConnection.WaitTime; -import com.gel.driver.TLSSecurityMode; -import com.gel.driver.abstractions.OSType; -import com.gel.driver.abstractions.SystemProvider; -import com.gel.driver.exceptions.ConfigurationException; -import com.gel.driver.internal.BaseDefaultSystemProvider; -import com.gel.driver.internal.DefaultSystemProvider; -import com.gel.driver.util.ConfigUtils; -import com.gel.driver.util.HexUtils; -import com.gel.driver.util.ConfigUtils.ResolvedField; -import com.gel.driver.util.JsonUtils.AsStringDeserializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; @@ -59,6 +47,18 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.node.IntNode; +import com.geldata.driver.GelConnection; +import com.geldata.driver.TLSSecurityMode; +import com.geldata.driver.GelConnection.WaitTime; +import com.geldata.driver.abstractions.OSType; +import com.geldata.driver.abstractions.SystemProvider; +import com.geldata.driver.exceptions.ConfigurationException; +import com.geldata.driver.internal.BaseDefaultSystemProvider; +import com.geldata.driver.internal.DefaultSystemProvider; +import com.geldata.driver.util.ConfigUtils; +import com.geldata.driver.util.HexUtils; +import com.geldata.driver.util.ConfigUtils.ResolvedField; +import com.geldata.driver.util.JsonUtils.AsStringDeserializer; import net.bytebuddy.implementation.bytecode.Throw; diff --git a/src/driver/src/test/java/shared/ResultAsserter.java b/src/driver/src/test/java/shared/ResultAsserter.java index 209d5f79..4cbf3c0b 100644 --- a/src/driver/src/test/java/shared/ResultAsserter.java +++ b/src/driver/src/test/java/shared/ResultAsserter.java @@ -1,11 +1,13 @@ package shared; -import com.gel.driver.datatypes.Json; -import com.gel.driver.datatypes.Range; -import com.gel.driver.datatypes.RelativeDuration; -import com.gel.driver.datatypes.Tuple; import org.assertj.core.util.Lists; import org.opentest4j.AssertionFailedError; + +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.datatypes.Range; +import com.geldata.driver.datatypes.RelativeDuration; +import com.geldata.driver.datatypes.Tuple; + import shared.models.ResultNode; import java.math.BigDecimal; diff --git a/src/driver/src/test/java/shared/ResultTypeBuilder.java b/src/driver/src/test/java/shared/ResultTypeBuilder.java index 9da65e19..3ff921c2 100644 --- a/src/driver/src/test/java/shared/ResultTypeBuilder.java +++ b/src/driver/src/test/java/shared/ResultTypeBuilder.java @@ -1,16 +1,18 @@ package shared; -import com.gel.driver.annotations.GelLinkType; -import com.gel.driver.annotations.GelType; -import com.gel.driver.datatypes.Json; -import com.gel.driver.datatypes.Range; -import com.gel.driver.datatypes.RelativeDuration; -import com.gel.driver.datatypes.Tuple; -import com.gel.driver.util.StringsUtil; import org.burningwave.core.assembler.ComponentContainer; import org.burningwave.core.classes.*; import org.jetbrains.annotations.Nullable; import org.opentest4j.AssertionFailedError; + +import com.geldata.driver.annotations.GelLinkType; +import com.geldata.driver.annotations.GelType; +import com.geldata.driver.datatypes.Json; +import com.geldata.driver.datatypes.Range; +import com.geldata.driver.datatypes.RelativeDuration; +import com.geldata.driver.datatypes.Tuple; +import com.geldata.driver.util.StringsUtil; + import shared.models.CollectionResultNode; import shared.models.ResultNode; import shared.models.ResultNodeImpl; diff --git a/src/driver/src/test/java/shared/SharedTestsRunner.java b/src/driver/src/test/java/shared/SharedTestsRunner.java index 0ee54b4c..5e7b0365 100644 --- a/src/driver/src/test/java/shared/SharedTestsRunner.java +++ b/src/driver/src/test/java/shared/SharedTestsRunner.java @@ -1,21 +1,22 @@ package shared; -import com.gel.driver.GelClientPool; -import com.gel.driver.GelClientConfig; -import com.gel.driver.binary.builders.ObjectBuilder; -import com.gel.driver.binary.codecs.Codec; -import com.gel.driver.binary.protocol.QueryParameters; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.binary.protocol.common.IOFormat; -import com.gel.driver.clients.BaseGelClient; -import com.gel.driver.clients.GelBinaryClient; -import com.gel.driver.datatypes.RelativeDuration; -import com.gel.driver.exceptions.GelException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.geldata.driver.GelClientConfig; +import com.geldata.driver.GelClientPool; +import com.geldata.driver.binary.builders.ObjectBuilder; +import com.geldata.driver.binary.codecs.Codec; +import com.geldata.driver.binary.protocol.QueryParameters; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.binary.protocol.common.IOFormat; +import com.geldata.driver.clients.BaseGelClient; +import com.geldata.driver.clients.GelBinaryClient; +import com.geldata.driver.datatypes.RelativeDuration; +import com.geldata.driver.exceptions.GelException; + import io.netty.buffer.ByteBuf; import shared.json.CDurationDeserializer; import shared.json.CPeriodDeserializer; diff --git a/src/driver/src/test/java/shared/json/CRelativeDurationDeserializer.java b/src/driver/src/test/java/shared/json/CRelativeDurationDeserializer.java index 9cda0b73..f6f0a495 100644 --- a/src/driver/src/test/java/shared/json/CRelativeDurationDeserializer.java +++ b/src/driver/src/test/java/shared/json/CRelativeDurationDeserializer.java @@ -1,9 +1,9 @@ package shared.json; -import com.gel.driver.datatypes.RelativeDuration; import com.fasterxml.jackson.core.JacksonException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; +import com.geldata.driver.datatypes.RelativeDuration; import java.io.IOException; import java.time.temporal.ChronoUnit; diff --git a/src/driver/src/test/java/shared/json/ResultNodeDeserializer.java b/src/driver/src/test/java/shared/json/ResultNodeDeserializer.java index d31b105b..bc66a742 100644 --- a/src/driver/src/test/java/shared/json/ResultNodeDeserializer.java +++ b/src/driver/src/test/java/shared/json/ResultNodeDeserializer.java @@ -1,6 +1,5 @@ package shared.json; -import com.gel.driver.datatypes.Range; import com.fasterxml.jackson.core.JacksonException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -11,6 +10,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; +import com.geldata.driver.datatypes.Range; + import org.assertj.core.util.Streams; import shared.ResultTypeBuilder; import shared.models.CollectionResultNode; diff --git a/src/driver/src/test/java/shared/json/SessionDeserializer.java b/src/driver/src/test/java/shared/json/SessionDeserializer.java index 1a8da0eb..39f5f08b 100644 --- a/src/driver/src/test/java/shared/json/SessionDeserializer.java +++ b/src/driver/src/test/java/shared/json/SessionDeserializer.java @@ -1,7 +1,5 @@ package shared.json; -import com.gel.driver.state.Config; -import com.gel.driver.state.Session; import com.fasterxml.jackson.core.JacksonException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.TreeNode; @@ -12,6 +10,9 @@ import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; +import com.geldata.driver.state.Config; +import com.geldata.driver.state.Session; + import org.assertj.core.util.Streams; import shared.ResultTypeBuilder; import shared.models.ResultNode; diff --git a/src/driver/src/test/java/shared/models/QueryExecutionArguments.java b/src/driver/src/test/java/shared/models/QueryExecutionArguments.java index f4ab10ae..634715c8 100644 --- a/src/driver/src/test/java/shared/models/QueryExecutionArguments.java +++ b/src/driver/src/test/java/shared/models/QueryExecutionArguments.java @@ -1,10 +1,11 @@ package shared.models; -import com.gel.driver.Capabilities; -import com.gel.driver.binary.PacketSerializer; -import com.gel.driver.binary.protocol.common.Cardinality; -import com.gel.driver.state.Session; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.geldata.driver.Capabilities; +import com.geldata.driver.binary.PacketSerializer; +import com.geldata.driver.binary.protocol.common.Cardinality; +import com.geldata.driver.state.Session; + import shared.json.SessionDeserializer; import java.util.Arrays; diff --git a/tools/testgen/build.gradle b/tools/testgen/build.gradle index a79c2c95..88afa6a8 100644 --- a/tools/testgen/build.gradle +++ b/tools/testgen/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' } -group 'com.gel.testgen' +group 'com.geldata.testgen' version '1.0-SNAPSHOT' repositories { diff --git a/tools/testgen/src/main/java/com/gel/testgen/CodeWriter.java b/tools/testgen/src/main/java/com/gel/testgen/CodeWriter.java index 671b8bc1..97f3468e 100644 --- a/tools/testgen/src/main/java/com/gel/testgen/CodeWriter.java +++ b/tools/testgen/src/main/java/com/gel/testgen/CodeWriter.java @@ -1,4 +1,4 @@ -package com.gel.testgen; +package com.geldata.testgen; import java.io.Closeable; import java.io.IOException; diff --git a/tools/testgen/src/main/java/com/gel/testgen/Main.java b/tools/testgen/src/main/java/com/gel/testgen/Main.java index e75ec250..5fc5295d 100644 --- a/tools/testgen/src/main/java/com/gel/testgen/Main.java +++ b/tools/testgen/src/main/java/com/gel/testgen/Main.java @@ -1,8 +1,8 @@ -package com.gel.testgen; +package com.geldata.testgen; -import com.gel.driver.namingstrategies.NamingStrategy; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.geldata.driver.namingstrategies.NamingStrategy; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/tools/testgen/src/main/java/module-info.java b/tools/testgen/src/main/java/module-info.java index e40bb725..ce630449 100644 --- a/tools/testgen/src/main/java/module-info.java +++ b/tools/testgen/src/main/java/module-info.java @@ -1,7 +1,7 @@ -module com.gel.testgen { +module com.geldata.testgen { requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; - requires com.gel.driver; + requires com.geldata.driver; - exports com.gel.testgen to com.fasterxml.jackson.databind; + exports com.geldata.testgen to com.fasterxml.jackson.databind; } \ No newline at end of file