Cleanups (#1029)

This is a bunch of cleanups and exploratory testing in preparation for
implementing #1006

GitOrigin-RevId: 6b455e766f47574720c5f07bbcfb776dbd6ec8dd

Author: DavidS-ovm

discovery/enginerequests.go

@@ -268,7 +268,7 @@ func (e *Engine) ExecuteQuery(ctx context.Context, query *sdp.Query, items chan<
 					expandedMutex.RLock()
 					for q, adapter := range expanded {
 						log.WithContext(ctx).WithFields(log.Fields{
-							"ovm.query.uuid":    q.ParseUuid().String(),
+							"ovm.query.uuid":    q.GetUUIDParsed().String(),
 							"ovm.query.type":    q.GetType(),
 							"ovm.query.scope":   q.GetScope(),
 							"ovm.query.method":  q.GetMethod().String(),

sdp-go/items.go

@@ -393,7 +393,7 @@ func (q *Query) Reference() *Reference {
 
 // Subject returns a NATS subject for all traffic relating to this query
 func (q *Query) Subject() string {
-	return fmt.Sprintf("query.%v", q.ParseUuid())
+	return fmt.Sprintf("query.%v", q.GetUUIDParsed())
 }
 
 // Copy copies all information from one Query pointer to another
@@ -426,9 +426,9 @@ func (q *Query) TimeoutContext(ctx context.Context) (context.Context, context.Ca
 	return context.WithDeadline(ctx, q.GetDeadline().AsTime())
 }
 
-// ParseUuid returns this request's UUID. If there's an error parsing it,
+// GetUUIDParsed returns this request's UUID. If there's an error parsing it,
 // generates and stores a fresh one
-func (r *Query) ParseUuid() uuid.UUID {
+func (r *Query) GetUUIDParsed() uuid.UUID {
 	if r == nil {
 		return uuid.UUID{}
 	}

stdlib-source/adapters/test/data.go

@@ -33,7 +33,7 @@ import (
 //                        S         S
 //                        v         |
 //                      +--------+  |
-//                      | london | <+
+//       HOBBIES <--S-- | london | <+
 //                      +--------+
 //                        |b
 //                        |
@@ -42,8 +42,8 @@ import (
 //                      | gb |
 //                      +----+
 //
-// arrows indicate edge directions. b annotations indicate blast radius
-// propagation. L indicates a LIST edge, S indicates a SEARCH edge.
+// arrows indicate edge directions. `b` annotations indicate blast radius
+// propagation. `L` indicates a LIST edge, `S` indicates a SEARCH edge.
 
 // this global atomic variable keeps track of the generation count for test
 // items. It is increased every time a new item is created, and is used to
@@ -223,6 +223,18 @@ func london() *sdp.Item {
 				Out: true,
 			},
 		},
+		{
+			Query: &sdp.Query{
+				Type:   "test-hobby",
+				Method: sdp.QueryMethod_SEARCH,
+				Query:  "*",
+				Scope:  "test",
+			},
+			BlastPropagation: &sdp.BlastPropagation{
+				In:  false,
+				Out: false,
+			},
+		},
 	}
 
 	return l