Skip to content

Update to use /v2 Module #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 5, 2024
Merged

Update to use /v2 Module #99

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1670da1
Update to use /v2
Dec 5, 2024
ecf9cd6
Update readme
Dec 5, 2024
3e8c0b8
Fixup coverage failure
Dec 5, 2024
aab6366
Add tests for v1.2.2
Dec 5, 2024
a87cb2e
Fix workflow
Dec 5, 2024
d0aeda4
Exclude queues examples on old versions
Dec 5, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# ----------------------------------------------------------------------------------------------------------------------

# This is the version of the coherence-go-client
VERSION ?=2.0.0
VERSION ?=2.0.0-rc1
CURRDIR := $(shell pwd)
USER_ID := $(shell echo "`id -u`:`id -g`")

Expand Down
9 changes: 6 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ docker run -d -p 1408:1408 -p 30000:30000 ghcr.io/oracle/coherence-ce:24.09
```bash
go get github.com/oracle/coherence-go-client@latest
````
After executing this command coherence-go-client is ready to use, and it's source will be in:

> Note: If you wish to use the latest v2.0.0-rc1, please use the following:

```bash
$GOPATH/pkg/mod/github.com/oracle/coherence-go-client@version
```
go get github.com/oracle/coherence-go-client/v2@v2.0.0-rc1
````

## <a name="doc"></a>Documentation

Expand All @@ -72,6 +73,8 @@ issues `Put()`, `Get()` and `Size()` operations.

> Note: Keys and values can also be Go `structs`. See detailed examples [here](examples#basic).

> Note: for v2.0.0-rc1, please import `github.com/oracle/coherence-go-client/v2/coherence`

```go
package main

Expand Down
8 changes: 4 additions & 4 deletions coherence/aggregators/aggregators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/

package aggregators

import (
"github.com/oracle/coherence-go-client/coherence/extractors"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/coherence/processors"
"github.com/oracle/coherence-go-client/v2/coherence/extractors"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/processors"
"math/big"
)

Expand Down
6 changes: 3 additions & 3 deletions coherence/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ package coherence

import (
"context"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/coherence/processors"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/processors"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"time"
)

Expand Down
4 changes: 2 additions & 2 deletions coherence/coherence_test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package coherence

import (
"context"
"github.com/oracle/coherence-go-client/coherence/filters"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"time"
)

Expand Down
12 changes: 6 additions & 6 deletions coherence/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"context"
"errors"
"fmt"
"github.com/oracle/coherence-go-client/coherence/aggregators"
"github.com/oracle/coherence-go-client/coherence/extractors"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/coherence/processors"
pb "github.com/oracle/coherence-go-client/proto"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
"github.com/oracle/coherence-go-client/v2/coherence/aggregators"
"github.com/oracle/coherence-go-client/v2/coherence/extractors"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/processors"
pb "github.com/oracle/coherence-go-client/v2/proto"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/wrapperspb"
Expand Down
2 changes: 1 addition & 1 deletion coherence/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This API fully supports Go Generics and is only supported for use with Go versio
Example:

import (
coherence "github.com/oracle/coherence-go-client/coherence"
coherence "github.com/oracle/coherence-go-client/v2/coherence"
)

...
Expand Down
4 changes: 2 additions & 2 deletions coherence/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"context"
"errors"
"fmt"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/proto"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"github.com/oracle/coherence-go-client/v2/proto"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"io"
Expand Down
4 changes: 2 additions & 2 deletions coherence/filters/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -8,7 +8,7 @@ package filters

import (
"fmt"
"github.com/oracle/coherence-go-client/coherence/extractors"
"github.com/oracle/coherence-go-client/v2/coherence/extractors"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions coherence/iterator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -10,7 +10,7 @@ import (
"container/list"
"context"
"errors"
pb "github.com/oracle/coherence-go-client/proto"
pb "github.com/oracle/coherence-go-client/v2/proto"
"google.golang.org/protobuf/types/known/wrapperspb"
"io"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion coherence/named_cache_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package coherence
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"time"
)

Expand Down
8 changes: 4 additions & 4 deletions coherence/named_map_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"context"
"errors"
"fmt"
"github.com/oracle/coherence-go-client/coherence/aggregators"
"github.com/oracle/coherence-go-client/coherence/extractors"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/coherence/processors"
"github.com/oracle/coherence-go-client/v2/coherence/aggregators"
"github.com/oracle/coherence-go-client/v2/coherence/extractors"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/processors"
"log"
"sync"
"time"
Expand Down
4 changes: 2 additions & 2 deletions coherence/processors/processors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
package processors

import (
"github.com/oracle/coherence-go-client/coherence/extractors"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/extractors"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"math/big"
)

Expand Down
2 changes: 1 addition & 1 deletion coherence/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"context"
"errors"
"fmt"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"strings"
"sync"
)
Expand Down
2 changes: 1 addition & 1 deletion coherence/queue_dequeue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package coherence

import (
"context"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion coherence/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package coherence
import (
"errors"
"fmt"
"github.com/oracle/coherence-go-client/coherence/discovery"
"github.com/oracle/coherence-go-client/v2/coherence/discovery"
"google.golang.org/grpc/resolver"
"math/rand"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions coherence/v1client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"context"
"errors"
"fmt"
"github.com/oracle/coherence-go-client/proto/v1"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
"github.com/oracle/coherence-go-client/v2/proto/v1"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/anypb"
Expand Down
4 changes: 2 additions & 2 deletions coherence/v1event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package coherence

import (
"context"
"github.com/oracle/coherence-go-client/coherence/filters"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"reflect"
"strings"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion coherence/v1queues.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package coherence

import (
"context"
pb1 "github.com/oracle/coherence-go-client/proto/v1"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/wrapperspb"
)
Expand Down
2 changes: 1 addition & 1 deletion coherence/v1requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package coherence

import (
pb1 "github.com/oracle/coherence-go-client/proto/v1"
pb1 "github.com/oracle/coherence-go-client/v2/proto/v1"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/wrapperspb"
"time"
Expand Down
10 changes: 5 additions & 5 deletions examples/aggregators/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -12,10 +12,10 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/coherence/aggregators"
"github.com/oracle/coherence-go-client/coherence/extractors"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence"
"github.com/oracle/coherence-go-client/v2/coherence/aggregators"
"github.com/oracle/coherence-go-client/v2/coherence/extractors"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"math/big"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/basic/contains/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates.
* Copyright (c) 2023, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -12,7 +12,7 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/v2/coherence"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions examples/basic/crud/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -12,7 +12,7 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/v2/coherence"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions examples/basic/expiry/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -12,7 +12,7 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/v2/coherence"
"time"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/basic/expiry_cache/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -12,7 +12,7 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/v2/coherence"
"time"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/basic/near_cache/high_units/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/v2/coherence"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/near_cache/memory/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/v2/coherence"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions examples/basic/near_cache/ttl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/coherence/filters"
"github.com/oracle/coherence-go-client/coherence/processors"
"github.com/oracle/coherence-go-client/v2/coherence"
"github.com/oracle/coherence-go-client/v2/coherence/filters"
"github.com/oracle/coherence-go-client/v2/coherence/processors"
"time"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/basic/struct/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
* Copyright (c) 2022, 2024 Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at
* https://oss.oracle.com/licenses/upl.
*/
Expand All @@ -12,8 +12,8 @@ package main
import (
"context"
"fmt"
"github.com/oracle/coherence-go-client/coherence"
"github.com/oracle/coherence-go-client/coherence/processors"
"github.com/oracle/coherence-go-client/v2/coherence"
"github.com/oracle/coherence-go-client/v2/coherence/processors"
)

type Person struct {
Expand Down
Loading
Loading