Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME_GEL }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD_GEL }}
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<dependency>
<groupId>com.gel</groupId>
<groupId>com.geldata</groupId>
<artifactId>driver</artifactId>
<version>0.4.0</version>
</dependency>
Expand All @@ -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"
)
```

Expand All @@ -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();
Expand All @@ -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() {
Expand All @@ -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

Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -103,7 +103,7 @@ allprojects {
}

subprojects {
archivesBaseName = "com.gel.$project.name"
archivesBaseName = "com.geldata.$project.name"

tasks.withType(Javadoc).configureEach {
title = "$archivesBaseName ${version} API"
Expand Down
8 changes: 4 additions & 4 deletions docs/datatypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`` |
+------------------------------------+---------------------------------------------------------+
Expand All @@ -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]_ |
+------------------------------------+---------------------------------------------------------+
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ project.
:caption: Maven

<dependency>
<groupId>com.gel</groupId>
<groupId>com.geldata</groupId>
<artifactId>driver</artifactId>
</dependency>

.. 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
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/java-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'java'
}

group 'com.gel'
group 'com.geldata'
version '0.0.1-SNAPSHOT'

repositories {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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<Void> run(GelClientPool clientPool);
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion examples/kotlin-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading