Use json.RawMessage instead of *json.RawMessage

olivere · olivere · commit 1cae66de946e · 2019-03-30T17:19:26.000+01:00
This is a long-standing issue which we can remove now in v7. It is not necessary to use `*json.RawMessage` to access to `Source` of a search hit. We can simply use `json.RawMessage`, as it's a `[]byte`, so the `*json.RawMessage` was a `*[]byte`. This simplifies the code but is a breaking change, but that's okay for a major version. Close olivere#687
diff --git a/bulk_test.go b/bulk_test.go
@@ -104,7 +104,7 @@ func TestBulk(t *testing.T) {
 		t.Fatal("expected doc source to be != nil; got nil")
 	}
 	var updatedTweet tweet
-	err = json.Unmarshal(*doc.Source, &updatedTweet)
+	err = json.Unmarshal(doc.Source, &updatedTweet)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -147,7 +147,7 @@ func TestBulk(t *testing.T) {
 	if doc.Source == nil {
 		t.Fatal("expected doc source to be != nil; got nil")
 	}
-	err = json.Unmarshal(*doc.Source, &updatedTweet)
+	err = json.Unmarshal(doc.Source, &updatedTweet)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -345,7 +345,7 @@ func TestBulkIndexDeleteUpdate(t *testing.T) {
 		t.Fatalf("expected updated[0].GetResult.Found to be != %v; got %v", want, have)
 	}
 	var doc tweet
-	if err := json.Unmarshal(*updated[0].GetResult.Source, &doc); err != nil {
+	if err := json.Unmarshal(updated[0].GetResult.Source, &doc); err != nil {
 		t.Fatalf("expected to unmarshal updated[0].GetResult.Source; got %v", err)
 	}
 	if want, have := 42, doc.Retweets; want != have {
diff --git a/cluster-test/cluster-test.go b/cluster-test/cluster-test.go
@@ -337,7 +337,7 @@ func (t *TestCase) search() {
 
 				// Deserialize hit.Source into a Tweet (could also be just a map[string]interface{}).
 				var tweet Tweet
-				err := json.Unmarshal(*hit.Source, &tweet)
+				err := json.Unmarshal(hit.Source, &tweet)
 				if err != nil {
 					// Deserialization failed
 					//failf("Deserialize failed: %v\n", err)
diff --git a/example_test.go b/example_test.go
@@ -199,7 +199,7 @@ func Example() {
 
 			// Deserialize hit.Source into a Tweet (could also be just a map[string]interface{}).
 			var t Tweet
-			err := json.Unmarshal(*hit.Source, &t)
+			err := json.Unmarshal(hit.Source, &t)
 			if err != nil {
 				// Deserialization failed
 			}
@@ -373,7 +373,7 @@ func ExampleSearchService() {
 
 			// Deserialize hit.Source into a Tweet (could also be just a map[string]interface{}).
 			var t Tweet
-			err := json.Unmarshal(*hit.Source, &t)
+			err := json.Unmarshal(hit.Source, &t)
 			if err != nil {
 				// Deserialization failed
 			}
@@ -473,7 +473,7 @@ func ExampleSearchResult() {
 
 			// Deserialize hit.Source into a Tweet (could also be just a map[string]interface{}).
 			var t Tweet
-			err := json.Unmarshal(*hit.Source, &t)
+			err := json.Unmarshal(hit.Source, &t)
 			if err != nil {
 				// Deserialization failed
 			}
diff --git a/geo_point_test.go b/geo_point_test.go
@@ -103,7 +103,7 @@ func TestGeoPointIndexAndSearch(t *testing.T) {
 		t.Fatalf("TotalHits: want %d, have %d", want, have)
 	}
 	var doc City
-	if err := json.Unmarshal(*res.Hits.Hits[0].Source, &doc); err != nil {
+	if err := json.Unmarshal(res.Hits.Hits[0].Source, &doc); err != nil {
 		t.Fatal(err)
 	}
 	if want, have := munich.Name, doc.Name; want != have {
diff --git a/get.go b/get.go
@@ -255,7 +255,7 @@ type GetResult struct {
 	Routing string                 `json:"_routing"` // routing meta field
 	Parent  string                 `json:"_parent"`  // parent meta field
 	Version *int64                 `json:"_version"` // version number, when Version is set to true in SearchService
-	Source  *json.RawMessage       `json:"_source,omitempty"`
+	Source  json.RawMessage        `json:"_source,omitempty"`
 	Found   bool                   `json:"found,omitempty"`
 	Fields  map[string]interface{} `json:"fields,omitempty"`
 	//Error     string                 `json:"error,omitempty"` // used only in MultiGet
diff --git a/get_test.go b/get_test.go
@@ -78,7 +78,7 @@ func TestGetWithSourceFiltering(t *testing.T) {
 		t.Errorf("expected Source != nil; got %v", res.Source)
 	}
 	var tw tweet
-	err = json.Unmarshal(*res.Source, &tw)
+	err = json.Unmarshal(res.Source, &tw)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/highlight_test.go b/highlight_test.go
@@ -192,7 +192,7 @@ func TestHighlightWithTermQuery(t *testing.T) {
 
 	hit := searchResult.Hits.Hits[0]
 	var tw tweet
-	if err := json.Unmarshal(*hit.Source, &tw); err != nil {
+	if err := json.Unmarshal(hit.Source, &tw); err != nil {
 		t.Fatal(err)
 	}
 	if hit.Highlight == nil || len(hit.Highlight) == 0 {
diff --git a/index_test.go b/index_test.go
@@ -60,7 +60,7 @@ func TestIndexLifecycle(t *testing.T) {
 
 	// Decode the Source field
 	var tweetGot tweet
-	err = json.Unmarshal(*getResult.Source, &tweetGot)
+	err = json.Unmarshal(getResult.Source, &tweetGot)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -143,7 +143,7 @@ func TestIndexLifecycleWithAutomaticIDGeneration(t *testing.T) {
 
 	// Decode the Source field
 	var tweetGot tweet
-	err = json.Unmarshal(*getResult.Source, &tweetGot)
+	err = json.Unmarshal(getResult.Source, &tweetGot)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/mget_test.go b/mget_test.go
@@ -73,7 +73,7 @@ func TestMultiGet(t *testing.T) {
 		t.Errorf("expected Source != nil; got %v", item.Source)
 	}
 	var doc tweet
-	if err := json.Unmarshal(*item.Source, &doc); err != nil {
+	if err := json.Unmarshal(item.Source, &doc); err != nil {
 		t.Fatalf("expected to unmarshal item Source; got %v", err)
 	}
 	if doc.Message != tweet1.Message {
@@ -87,7 +87,7 @@ func TestMultiGet(t *testing.T) {
 	if item.Source == nil {
 		t.Errorf("expected Source != nil; got %v", item.Source)
 	}
-	if err := json.Unmarshal(*item.Source, &doc); err != nil {
+	if err := json.Unmarshal(item.Source, &doc); err != nil {
 		t.Fatalf("expected to unmarshal item Source; got %v", err)
 	}
 	if doc.Message != tweet3.Message {
diff --git a/msearch_test.go b/msearch_test.go
@@ -90,7 +90,7 @@ func TestMultiSearch(t *testing.T) {
 			t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 		}
 		item := make(map[string]interface{})
-		err := json.Unmarshal(*hit.Source, &item)
+		err := json.Unmarshal(hit.Source, &item)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -111,7 +111,7 @@ func TestMultiSearch(t *testing.T) {
 			t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 		}
 		item := make(map[string]interface{})
-		err := json.Unmarshal(*hit.Source, &item)
+		err := json.Unmarshal(hit.Source, &item)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -193,7 +193,7 @@ func TestMultiSearchWithStrings(t *testing.T) {
 			t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 		}
 		item := make(map[string]interface{})
-		err := json.Unmarshal(*hit.Source, &item)
+		err := json.Unmarshal(hit.Source, &item)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -214,7 +214,7 @@ func TestMultiSearchWithStrings(t *testing.T) {
 			t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 		}
 		item := make(map[string]interface{})
-		err := json.Unmarshal(*hit.Source, &item)
+		err := json.Unmarshal(hit.Source, &item)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -295,7 +295,7 @@ func TestMultiSearchWithOneRequest(t *testing.T) {
 			t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 		}
 		item := make(map[string]interface{})
-		err := json.Unmarshal(*hit.Source, &item)
+		err := json.Unmarshal(hit.Source, &item)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/percolate_test.go b/percolate_test.go
@@ -58,7 +58,7 @@ func TestPercolate(t *testing.T) {
 	if hit.Index != testQueryIndex {
 		t.Fatalf("expected SearchResult.Hits.Hit.Index = %q; got %q", testQueryIndex, hit.Index)
 	}
-	got := string(*hit.Source)
+	got := string(hit.Source)
 	expected := `{"query":{"match":{"message":"bonsai tree"}}}`
 	if got != expected {
 		t.Fatalf("expected\n%s\n,got:\n%s", expected, got)
diff --git a/recipes/aws-mapping-v4/main.go b/recipes/aws-mapping-v4/main.go
@@ -168,7 +168,7 @@ func main() {
 			log.Fatal(err)
 		}
 		var tweet Tweet
-		if err = json.Unmarshal(*doc.Source, &tweet); err != nil {
+		if err = json.Unmarshal(doc.Source, &tweet); err != nil {
 			log.Fatal(err)
 		}
 		fmt.Printf("%s at %s: %s (%d retweets)\n",
diff --git a/recipes/mapping/mapping.go b/recipes/mapping/mapping.go
@@ -135,7 +135,7 @@ func main() {
 			log.Fatal(err)
 		}
 		var tweet Tweet
-		if err = json.Unmarshal(*doc.Source, &tweet); err != nil {
+		if err = json.Unmarshal(doc.Source, &tweet); err != nil {
 			log.Fatal(err)
 		}
 		fmt.Printf("%s at %s: %s (%d retweets)\n",
diff --git a/recipes/suggesters/completion/main.go b/recipes/suggesters/completion/main.go
@@ -170,7 +170,7 @@ func main() {
 
 				// The document's source is in opt.Source
 				var city City
-				if err = json.Unmarshal(*opt.Source, &city); err != nil {
+				if err = json.Unmarshal(opt.Source, &city); err != nil {
 					log.Fatal(err)
 				}
 				_ = city
diff --git a/scroll_test.go b/scroll_test.go
@@ -75,7 +75,7 @@ func TestScroll(t *testing.T) {
 				t.Fatalf("expected SearchResult.Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 			}
 			item := make(map[string]interface{})
-			err := json.Unmarshal(*hit.Source, &item)
+			err := json.Unmarshal(hit.Source, &item)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -176,7 +176,7 @@ func TestScrollWithQueryAndSort(t *testing.T) {
 				t.Fatalf("expected SearchResult.Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 			}
 			item := make(map[string]interface{})
-			err := json.Unmarshal(*hit.Source, &item)
+			err := json.Unmarshal(hit.Source, &item)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -296,7 +296,7 @@ func TestScrollWithBody(t *testing.T) {
 					t.Fatalf("#%d: expected SearchResult.Hits.Hit.Index = %q; got %q", i, testIndexName, hit.Index)
 				}
 				item := make(map[string]interface{})
-				err := json.Unmarshal(*hit.Source, &item)
+				err := json.Unmarshal(hit.Source, &item)
 				if err != nil {
 					t.Fatalf("#%d: %v", i, err)
 				}
@@ -359,7 +359,7 @@ func TestScrollWithSlice(t *testing.T) {
 				t.Fatalf("expected SearchResult.Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 			}
 			item := make(map[string]interface{})
-			err := json.Unmarshal(*hit.Source, &item)
+			err := json.Unmarshal(hit.Source, &item)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -495,7 +495,7 @@ func TestScrollWithFilterPath(t *testing.T) {
 				t.Fatalf("expected SearchResult.Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)
 			}
 			item := make(map[string]interface{})
-			err := json.Unmarshal(*hit.Source, &item)
+			err := json.Unmarshal(hit.Source, &item)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/search.go b/search.go
@@ -504,7 +504,7 @@ func (r *SearchResult) Each(typ reflect.Type) []interface{} {
 			slice = append(slice, v.Interface())
 			continue
 		}
-		if err := json.Unmarshal(*hit.Source, v.Addr().Interface()); err == nil {
+		if err := json.Unmarshal(hit.Source, v.Addr().Interface()); err == nil {
 			slice = append(slice, v.Interface())
 		}
 	}
@@ -543,7 +543,7 @@ type SearchHit struct {
 	Version        *int64                         `json:"_version,omitempty"`        // version number, when Version is set to true in SearchService
 	Sort           []interface{}                  `json:"sort,omitempty"`            // sort information
 	Highlight      SearchHitHighlight             `json:"highlight,omitempty"`       // highlighter information
-	Source         *json.RawMessage               `json:"_source,omitempty"`         // stored document source
+	Source         json.RawMessage                `json:"_source,omitempty"`         // stored document source
 	Fields         map[string]interface{}         `json:"fields,omitempty"`          // returned (stored) fields
 	Explanation    *SearchExplanation             `json:"_explanation,omitempty"`    // explains how the score was computed
 	MatchedQueries []string                       `json:"matched_queries,omitempty"` // matched queries
@@ -587,16 +587,16 @@ type SearchSuggestion struct {
 // SearchSuggestionOption is an option of a SearchSuggestion.
 // See https://www.elastic.co/guide/en/elasticsearch/reference/7.0/search-suggesters.html.
 type SearchSuggestionOption struct {
-	Text            string           `json:"text"`
-	Index           string           `json:"_index"`
-	Type            string           `json:"_type"`
-	Id              string           `json:"_id"`
-	Score           float64          `json:"score"`  // term and phrase suggesters uses "score" as of 6.2.4
-	ScoreUnderscore float64          `json:"_score"` // completion and context suggesters uses "_score" as of 6.2.4
-	Highlighted     string           `json:"highlighted"`
-	CollateMatch    bool             `json:"collate_match"`
-	Freq            int              `json:"freq"` // from TermSuggestion.Option in Java API
-	Source          *json.RawMessage `json:"_source"`
+	Text            string          `json:"text"`
+	Index           string          `json:"_index"`
+	Type            string          `json:"_type"`
+	Id              string          `json:"_id"`
+	Score           float64         `json:"score"`  // term and phrase suggesters uses "score" as of 6.2.4
+	ScoreUnderscore float64         `json:"_score"` // completion and context suggesters uses "_score" as of 6.2.4
+	Highlighted     string          `json:"highlighted"`
+	CollateMatch    bool            `json:"collate_match"`
+	Freq            int             `json:"freq"` // from TermSuggestion.Option in Java API
+	Source          json.RawMessage `json:"_source"`
 }
 
 // SearchProfile is a list of shard profiling data collected during
diff --git a/search_aggs.go b/search_aggs.go
diff --git a/search_aggs_test.go b/search_aggs_test.go
diff --git a/search_queries_common_terms_test.go b/search_queries_common_terms_test.go
diff --git a/search_queries_simple_query_string_test.go b/search_queries_simple_query_string_test.go
diff --git a/search_test.go b/search_test.go
diff --git a/update_integration_test.go b/update_integration_test.go

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func TestBulk(t *testing.T) {`
`104`	`104`	`t.Fatal("expected doc source to be != nil; got nil")`
`105`	`105`	`}`
`106`	`106`	`var updatedTweet tweet`
`107`		`- err = json.Unmarshal(*doc.Source, &updatedTweet)`
	`107`	`+ err = json.Unmarshal(doc.Source, &updatedTweet)`
`108`	`108`	`if err != nil {`
`109`	`109`	`t.Fatal(err)`
`110`	`110`	`}`
`@@ -147,7 +147,7 @@ func TestBulk(t *testing.T) {`
`147`	`147`	`if doc.Source == nil {`
`148`	`148`	`t.Fatal("expected doc source to be != nil; got nil")`
`149`	`149`	`}`
`150`		`- err = json.Unmarshal(*doc.Source, &updatedTweet)`
	`150`	`+ err = json.Unmarshal(doc.Source, &updatedTweet)`
`151`	`151`	`if err != nil {`
`152`	`152`	`t.Fatal(err)`
`153`	`153`	`}`
`@@ -345,7 +345,7 @@ func TestBulkIndexDeleteUpdate(t *testing.T) {`
`345`	`345`	`t.Fatalf("expected updated[0].GetResult.Found to be != %v; got %v", want, have)`
`346`	`346`	`}`
`347`	`347`	`var doc tweet`
`348`		`- if err := json.Unmarshal(*updated[0].GetResult.Source, &doc); err != nil {`
	`348`	`+ if err := json.Unmarshal(updated[0].GetResult.Source, &doc); err != nil {`
`349`	`349`	`t.Fatalf("expected to unmarshal updated[0].GetResult.Source; got %v", err)`
`350`	`350`	`}`
`351`	`351`	`if want, have := 42, doc.Retweets; want != have {`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func TestGeoPointIndexAndSearch(t *testing.T) {`
`103`	`103`	`t.Fatalf("TotalHits: want %d, have %d", want, have)`
`104`	`104`	`}`
`105`	`105`	`var doc City`
`106`		`- if err := json.Unmarshal(*res.Hits.Hits[0].Source, &doc); err != nil {`
	`106`	`+ if err := json.Unmarshal(res.Hits.Hits[0].Source, &doc); err != nil {`
`107`	`107`	`t.Fatal(err)`
`108`	`108`	`}`
`109`	`109`	`if want, have := munich.Name, doc.Name; want != have {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func TestGetWithSourceFiltering(t *testing.T) {`
`78`	`78`	`t.Errorf("expected Source != nil; got %v", res.Source)`
`79`	`79`	`}`
`80`	`80`	`var tw tweet`
`81`		`- err = json.Unmarshal(*res.Source, &tw)`
	`81`	`+ err = json.Unmarshal(res.Source, &tw)`
`82`	`82`	`if err != nil {`
`83`	`83`	`t.Fatal(err)`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func TestHighlightWithTermQuery(t *testing.T) {`
`192`	`192`
`193`	`193`	`hit := searchResult.Hits.Hits[0]`
`194`	`194`	`var tw tweet`
`195`		`- if err := json.Unmarshal(*hit.Source, &tw); err != nil {`
	`195`	`+ if err := json.Unmarshal(hit.Source, &tw); err != nil {`
`196`	`196`	`t.Fatal(err)`
`197`	`197`	`}`
`198`	`198`	`if hit.Highlight == nil \|\| len(hit.Highlight) == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func TestMultiGet(t *testing.T) {`
`73`	`73`	`t.Errorf("expected Source != nil; got %v", item.Source)`
`74`	`74`	`}`
`75`	`75`	`var doc tweet`
`76`		`- if err := json.Unmarshal(*item.Source, &doc); err != nil {`
	`76`	`+ if err := json.Unmarshal(item.Source, &doc); err != nil {`
`77`	`77`	`t.Fatalf("expected to unmarshal item Source; got %v", err)`
`78`	`78`	`}`
`79`	`79`	`if doc.Message != tweet1.Message {`
`@@ -87,7 +87,7 @@ func TestMultiGet(t *testing.T) {`
`87`	`87`	`if item.Source == nil {`
`88`	`88`	`t.Errorf("expected Source != nil; got %v", item.Source)`
`89`	`89`	`}`
`90`		`- if err := json.Unmarshal(*item.Source, &doc); err != nil {`
	`90`	`+ if err := json.Unmarshal(item.Source, &doc); err != nil {`
`91`	`91`	`t.Fatalf("expected to unmarshal item Source; got %v", err)`
`92`	`92`	`}`
`93`	`93`	`if doc.Message != tweet3.Message {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func TestMultiSearch(t *testing.T) {`
`90`	`90`	`t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)`
`91`	`91`	`}`
`92`	`92`	`item := make(map[string]interface{})`
`93`		`- err := json.Unmarshal(*hit.Source, &item)`
	`93`	`+ err := json.Unmarshal(hit.Source, &item)`
`94`	`94`	`if err != nil {`
`95`	`95`	`t.Fatal(err)`
`96`	`96`	`}`
`@@ -111,7 +111,7 @@ func TestMultiSearch(t *testing.T) {`
`111`	`111`	`t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)`
`112`	`112`	`}`
`113`	`113`	`item := make(map[string]interface{})`
`114`		`- err := json.Unmarshal(*hit.Source, &item)`
	`114`	`+ err := json.Unmarshal(hit.Source, &item)`
`115`	`115`	`if err != nil {`
`116`	`116`	`t.Fatal(err)`
`117`	`117`	`}`
`@@ -193,7 +193,7 @@ func TestMultiSearchWithStrings(t *testing.T) {`
`193`	`193`	`t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)`
`194`	`194`	`}`
`195`	`195`	`item := make(map[string]interface{})`
`196`		`- err := json.Unmarshal(*hit.Source, &item)`
	`196`	`+ err := json.Unmarshal(hit.Source, &item)`
`197`	`197`	`if err != nil {`
`198`	`198`	`t.Fatal(err)`
`199`	`199`	`}`
`@@ -214,7 +214,7 @@ func TestMultiSearchWithStrings(t *testing.T) {`
`214`	`214`	`t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)`
`215`	`215`	`}`
`216`	`216`	`item := make(map[string]interface{})`
`217`		`- err := json.Unmarshal(*hit.Source, &item)`
	`217`	`+ err := json.Unmarshal(hit.Source, &item)`
`218`	`218`	`if err != nil {`
`219`	`219`	`t.Fatal(err)`
`220`	`220`	`}`
`@@ -295,7 +295,7 @@ func TestMultiSearchWithOneRequest(t *testing.T) {`
`295`	`295`	`t.Errorf("expected Hits.Hit.Index = %q; got %q", testIndexName, hit.Index)`
`296`	`296`	`}`
`297`	`297`	`item := make(map[string]interface{})`
`298`		`- err := json.Unmarshal(*hit.Source, &item)`
	`298`	`+ err := json.Unmarshal(hit.Source, &item)`
`299`	`299`	`if err != nil {`
`300`	`300`	`t.Fatal(err)`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func TestPercolate(t *testing.T) {`
`58`	`58`	`if hit.Index != testQueryIndex {`
`59`	`59`	`t.Fatalf("expected SearchResult.Hits.Hit.Index = %q; got %q", testQueryIndex, hit.Index)`
`60`	`60`	`}`
`61`		`- got := string(*hit.Source)`
	`61`	`+ got := string(hit.Source)`
`62`	`62`	expected := `{"query":{"match":{"message":"bonsai tree"}}}`
`63`	`63`	`if got != expected {`
`64`	`64`	`t.Fatalf("expected\n%s\n,got:\n%s", expected, got)`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func main() {`
`168`	`168`	`log.Fatal(err)`
`169`	`169`	`}`
`170`	`170`	`var tweet Tweet`
`171`		`- if err = json.Unmarshal(*doc.Source, &tweet); err != nil {`
	`171`	`+ if err = json.Unmarshal(doc.Source, &tweet); err != nil {`
`172`	`172`	`log.Fatal(err)`
`173`	`173`	`}`
`174`	`174`	`fmt.Printf("%s at %s: %s (%d retweets)\n",`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func main() {`
`135`	`135`	`log.Fatal(err)`
`136`	`136`	`}`
`137`	`137`	`var tweet Tweet`
`138`		`- if err = json.Unmarshal(*doc.Source, &tweet); err != nil {`
	`138`	`+ if err = json.Unmarshal(doc.Source, &tweet); err != nil {`
`139`	`139`	`log.Fatal(err)`
`140`	`140`	`}`
`141`	`141`	`fmt.Printf("%s at %s: %s (%d retweets)\n",`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func main() {`
`170`	`170`
`171`	`171`	`// The document's source is in opt.Source`
`172`	`172`	`var city City`
`173`		`- if err = json.Unmarshal(*opt.Source, &city); err != nil {`
	`173`	`+ if err = json.Unmarshal(opt.Source, &city); err != nil {`
`174`	`174`	`log.Fatal(err)`
`175`	`175`	`}`
`176`	`176`	`_ = city`