following protobuf conventions

nytimes · Dec 21, 2015 · fcd5e32 · fcd5e32
1 parent 719690a
commit fcd5e32
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 86 deletions.
diff --git a/examples/nyt/client.go b/examples/nyt/client.go
@@ -40,7 +40,7 @@ func (c *ClientImpl) GetMostPopular(resourceType string, section string, timePer
 	}
 
 	err = json.Unmarshal(rawRes, &res)
-	return res.Results, err
+	return res.Result, err
 }
 
 func (c *ClientImpl) SemanticConceptSearch(conceptType, concept string) ([]*SemanticConceptArticle, error) {
@@ -58,11 +58,11 @@ func (c *ClientImpl) SemanticConceptSearch(conceptType, concept string) ([]*Sema
 	}
 
 	err = json.Unmarshal(rawRes, &res)
-	if len(res.Results) == 0 {
+	if len(res.Result) == 0 {
 		return nil, errors.New("no results")
 	}
 
-	return res.Results[0].ArticleList.Results, nil
+	return res.Result[0].ArticleList.Result, nil
 }
 
 func (c *ClientImpl) do(uri string) (body []byte, err error) {

diff --git a/examples/nyt/mostpopular.pb.go b/examples/nyt/mostpopular.pb.go
diff --git a/examples/nyt/mostpopular.proto b/examples/nyt/mostpopular.proto
@@ -6,7 +6,7 @@ message MostPopularResponse  {
     string status = 1;
     string copyright = 2;
     uint32 num_results = 3;
-    repeated MostPopularResult results = 4;
+    repeated MostPopularResult result = 4;
 }
 
 message MostPopularResult  {

diff --git a/examples/nyt/semanticconcept.pb.go b/examples/nyt/semanticconcept.pb.go
diff --git a/examples/nyt/semanticconcept.proto b/examples/nyt/semanticconcept.proto
@@ -6,15 +6,15 @@ message SemanticConceptResponse  {
     string status = 1;
     string copyright = 2;
     uint32 num_results = 3;
-    repeated SemanticConceptResult results = 4;
+    repeated SemanticConceptResult result = 4;
 }
 
 message SemanticConceptResult {
     SemanticConceptArticleList article_list = 1;
 }
 
 message SemanticConceptArticleList {
-    repeated SemanticConceptArticle results = 1;
+    repeated SemanticConceptArticle result = 1;
     uint32 total = 2;
 }
 

diff --git a/examples/servers/rpc/service/mostpopular.go b/examples/servers/rpc/service/mostpopular.go
@@ -35,5 +35,5 @@ func (s *RPCService) GetMostPopularJSON(r *http.Request) (int, interface{}, erro
 	if err != nil {
 		return http.StatusInternalServerError, nil, err
 	}
-	return http.StatusOK, res.Results, nil
+	return http.StatusOK, res.Result, nil
 }
diff --git a/examples/servers/rpc/service/nyt-proxy.pb.go b/examples/servers/rpc/service/nyt-proxy.pb.go
diff --git a/examples/servers/rpc/service/nyt-proxy.proto b/examples/servers/rpc/service/nyt-proxy.proto
@@ -12,7 +12,7 @@ message MostPopularRequest {
 }
 
 message MostPopularResponse {
-    repeated nyt.MostPopularResult results = 1;
+    repeated nyt.MostPopularResult result = 1;
 }
 
 message CatsRequest {