wkt any. removed 'any' from generating a standard NewPopulated method and rather use a jsonpb friendly version. when you marshal with jsonpb it expects a registered proto message since it has to unmarshal it in order to format it in the 'any' json format. The new populated method just uses a random Duration wkt which is already in the same package.

Author: jmarais

protoc-gen-gogotypes/main.go

@@ -53,21 +53,17 @@ func main() {
 
 	vanity.ForEachFile(files, vanity.TurnOnMessageNameAll)
 
-	for _, file := range files {
-		if strings.HasSuffix(file.GetName(), "struct.proto") {
-			// TODO struct can also get a compare method when
-			// https://github.com/gogo/protobuf/issues/221 is fixed
-			//continue
-		}
-		vanity.TurnOnCompareAll(file)
-	}
+	vanity.ForEachFile(files, vanity.TurnOnCompareAll)
 
 	for _, file := range files {
 		if strings.HasSuffix(file.GetName(), "timestamp.proto") ||
 			strings.HasSuffix(file.GetName(), "duration.proto") {
 			continue
 		}
 		vanity.TurnOnStringerAll(file)
+		if strings.HasSuffix(file.GetName(), "any.proto") {
+			continue
+		}
 		vanity.TurnOnPopulateAll(file)
 	}
 

test/types/combos/both/types.pb.go

@@ -32,7 +32,7 @@ package types;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-//import "google/protobuf/any.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
@@ -62,10 +62,8 @@ message KnownTypes {
   google.protobuf.BoolValue bool = 9;
   google.protobuf.StringValue str = 10;
   google.protobuf.BytesValue bytes = 11;
-
-  // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed
   google.protobuf.Struct st = 12;
-  // google.protobuf.Any an = 14;
+  google.protobuf.Any an = 14;
 }
 
 message ProtoTypes {

test/types/combos/both/types.proto

@@ -32,7 +32,7 @@ package types;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-//import "google/protobuf/any.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
@@ -62,10 +62,8 @@ message KnownTypes {
   google.protobuf.BoolValue bool = 9;
   google.protobuf.StringValue str = 10;
   google.protobuf.BytesValue bytes = 11;
-
-  // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed
   google.protobuf.Struct st = 12;
-  // google.protobuf.Any an = 14;
+  google.protobuf.Any an = 14;
 }
 
 message ProtoTypes {

test/types/combos/marshaler/types.pb.go

@@ -32,7 +32,7 @@ package types;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-//import "google/protobuf/any.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
@@ -62,10 +62,8 @@ message KnownTypes {
   google.protobuf.BoolValue bool = 9;
   google.protobuf.StringValue str = 10;
   google.protobuf.BytesValue bytes = 11;
-
-  // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed
   google.protobuf.Struct st = 12;
-  // google.protobuf.Any an = 14;
+  google.protobuf.Any an = 14;
 }
 
 message ProtoTypes {

test/types/combos/marshaler/types.proto

@@ -32,7 +32,7 @@ package types;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-//import "google/protobuf/any.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
@@ -62,10 +62,8 @@ message KnownTypes {
   google.protobuf.BoolValue bool = 9;
   google.protobuf.StringValue str = 10;
   google.protobuf.BytesValue bytes = 11;
-
-  // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed
   google.protobuf.Struct st = 12;
-  // google.protobuf.Any an = 14;
+  google.protobuf.Any an = 14;
 }
 
 message ProtoTypes {

test/types/combos/neither/types.pb.go

@@ -32,7 +32,7 @@ package types;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-//import "google/protobuf/any.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
@@ -62,10 +62,8 @@ message KnownTypes {
   google.protobuf.BoolValue bool = 9;
   google.protobuf.StringValue str = 10;
   google.protobuf.BytesValue bytes = 11;
-
-  // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed
   google.protobuf.Struct st = 12;
-  // google.protobuf.Any an = 14;
+  google.protobuf.Any an = 14;
 }
 
 message ProtoTypes {