Refactor queues example (#89)

Author: tmiddlet2666

examples/queues/blocking/common/common.go

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 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 common
+
+import "time"
+
+const (
+	QueueNameOrders    = "orders-queue"
+	QueueNameProcessed = "processed-queue"
+)
+
+// Order represents a fictitious order.
+type Order struct {
+	OrderID             string        `json:"orderID"`
+	Customer            string        `json:"customer"`
+	OrderStatus         string        `json:"orderStatus"`
+	OrderTotal          float32       `json:"orderTotal"`
+	CreateTime          time.Time     `json:"createTime"`
+	CompleteTime        time.Time     `json:"completeTime"`
+	OrderProcessingTime time.Duration `json:"orderProcessingTime"`
+}

examples/queues/blocking/processor/main.go

@@ -13,30 +13,15 @@ package main
 import (
 	"context"
 	"github.com/oracle/coherence-go-client/coherence"
+	"github.com/oracle/coherence-go-client/examples/queues/blocking/common"
 	"log"
 	"time"
 )
 
-const (
-	queueNameProcessed = "processed-queue"
-	queueNameOrders    = "orders-queue"
-)
-
-// Order represents a fictitious order.
-type Order struct {
-	OrderID             string        `json:"orderID"`
-	Customer            string        `json:"customer"`
-	OrderStatus         string        `json:"orderStatus"`
-	OrderTotal          float32       `json:"orderTotal"`
-	CreateTime          time.Time     `json:"createTime"`
-	CompleteTime        time.Time     `json:"completeTime"`
-	OrderProcessingTime time.Duration `json:"orderProcessingTime"`
-}
-
 func main() {
 	var (
 		ctx        = context.Background()
-		order      *Order
+		order      *common.Order
 		err        error
 		processed  int
 		processing bool
@@ -49,12 +34,12 @@ func main() {
 	}
 	defer session.Close()
 
-	blockingQueue, err := coherence.GetBlockingNamedQueue[Order](ctx, session, queueNameOrders)
+	blockingQueue, err := coherence.GetBlockingNamedQueue[common.Order](ctx, session, common.QueueNameOrders)
 	if err != nil {
 		panic(err)
 	}
 
-	processedQueue, err := coherence.GetNamedQueue[Order](ctx, session, queueNameProcessed)
+	processedQueue, err := coherence.GetNamedQueue[common.Order](ctx, session, common.QueueNameProcessed)
 	if err != nil {
 		panic(err)
 	}

examples/queues/blocking/publisher/main.go

@@ -14,26 +14,14 @@ import (
 	"fmt"
 	"github.com/google/uuid"
 	"github.com/oracle/coherence-go-client/coherence"
+	"github.com/oracle/coherence-go-client/examples/queues/blocking/common"
 	"log"
 	"math/rand"
 	"os"
 	"strconv"
 	"time"
 )
 
-const queueNameOrders = "orders-queue"
-
-// Order represents a fictitious order.
-type Order struct {
-	OrderID             string        `json:"orderID"`
-	Customer            string        `json:"customer"`
-	OrderStatus         string        `json:"orderStatus"`
-	OrderTotal          float32       `json:"orderTotal"`
-	CreateTime          time.Time     `json:"createTime"`
-	CompleteTime        time.Time     `json:"completeTime"`
-	OrderProcessingTime time.Duration `json:"orderProcessingTime"`
-}
-
 func main() {
 	var (
 		ctx       = context.Background()
@@ -47,32 +35,27 @@ func main() {
 		return
 	}
 
-	if numOrders, err = strconv.Atoi(os.Args[1]); err != nil {
+	if numOrders, err = strconv.Atoi(os.Args[1]); err != nil || numOrders < 0 {
 		log.Println("Invalid value for number of orders")
 		return
 	}
 
-	if numOrders <= 0 {
-		log.Println("Enter a positive number")
-		return
-	}
-
 	// create a new Session to the default gRPC port of 1408 using plain text
 	session, err := coherence.NewSession(ctx, coherence.WithPlainText())
 	if err != nil {
 		panic(err)
 	}
 	defer session.Close()
 
-	orderQueue, err := coherence.GetNamedQueue[Order](ctx, session, queueNameOrders)
+	orderQueue, err := coherence.GetNamedQueue[common.Order](ctx, session, common.QueueNameOrders)
 	if err != nil {
 		panic(err)
 	}
 
 	defer orderQueue.Close()
 
 	for i := 1; i <= numOrders; i++ {
-		newOrder := Order{
+		newOrder := common.Order{
 			OrderID:     uuid.New().String(),
 			Customer:    fmt.Sprintf("Customer %d", i),
 			OrderStatus: "NEW",

examples/queues/blocking/subscriber/main.go

@@ -14,29 +14,15 @@ import (
 	"context"
 	"fmt"
 	"github.com/oracle/coherence-go-client/coherence"
+	"github.com/oracle/coherence-go-client/examples/queues/blocking/common"
 	"log"
 	"time"
 )
 
-const (
-	queueNameProcessed = "processed-queue"
-)
-
-// Order represents a fictitious order.
-type Order struct {
-	OrderID             string        `json:"orderID"`
-	Customer            string        `json:"customer"`
-	OrderStatus         string        `json:"orderStatus"`
-	OrderTotal          float32       `json:"orderTotal"`
-	CreateTime          time.Time     `json:"createTime"`
-	CompleteTime        time.Time     `json:"completeTime"`
-	OrderProcessingTime time.Duration `json:"orderProcessingTime"`
-}
-
 func main() {
 	var (
 		ctx                 = context.Background()
-		order               *Order
+		order               *common.Order
 		err                 error
 		received            int64
 		totalProcessingTime time.Duration
@@ -50,7 +36,7 @@ func main() {
 	}
 	defer session.Close()
 
-	blockingQueue, err := coherence.GetBlockingNamedQueue[Order](ctx, session, queueNameProcessed)
+	blockingQueue, err := coherence.GetBlockingNamedQueue[common.Order](ctx, session, common.QueueNameProcessed)
 	if err != nil {
 		panic(err)
 	}