diff --git a/main_test.go b/main_test.go index e56c826..b39a20f 100644 --- a/main_test.go +++ b/main_test.go @@ -94,7 +94,7 @@ func Test_EmitOnly(t *testing.T) { } func Test_NamespaceMap(t *testing.T) { - runTest(t, "namespace_map", map[string]string{"namespace_map": "testdata:mynamespace"}) + runTest(t, "namespace_map", map[string]string{"namespace_map": "testdata.model:mynamespace"}) } func Test_PreserveNonStringMaps(t *testing.T) { diff --git a/testdata/base/AOneOf.avsc b/testdata/base/AOneOf.avsc index 77270ee..8366d6d 100644 --- a/testdata/base/AOneOf.avsc +++ b/testdata/base/AOneOf.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -9,7 +9,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -21,7 +21,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -34,4 +34,4 @@ "default": null } ] -} \ No newline at end of file +} diff --git a/testdata/base/Foobar.avsc b/testdata/base/Foobar.avsc index 7a82ec1..7873175 100644 --- a/testdata/base/Foobar.avsc +++ b/testdata/base/Foobar.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -27,7 +27,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -41,7 +41,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -49,7 +49,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -73,7 +73,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -81,7 +81,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -102,7 +102,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -110,7 +110,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -121,7 +121,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -140,9 +140,9 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/base/StringList.avsc b/testdata/base/StringList.avsc index fec2273..0a23b52 100644 --- a/testdata/base/StringList.avsc +++ b/testdata/base/StringList.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -12,4 +12,4 @@ "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/base/TypeA.avsc b/testdata/base/TypeA.avsc index a0de7f4..0930b64 100644 --- a/testdata/base/TypeA.avsc +++ b/testdata/base/TypeA.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/base/TypeB.avsc b/testdata/base/TypeB.avsc index e3e6c51..8e38365 100644 --- a/testdata/base/TypeB.avsc +++ b/testdata/base/TypeB.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/base/Widget.avsc b/testdata/base/Widget.avsc index 82ab640..fea170e 100644 --- a/testdata/base/Widget.avsc +++ b/testdata/base/Widget.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Widget", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "from_date", @@ -23,7 +23,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -40,7 +40,7 @@ }, { "name": "strings", - "type": "testdata.StringList", + "type": "testdata.model.StringList", "default": "" }, { @@ -50,7 +50,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -58,7 +58,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -70,7 +70,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -92,7 +92,7 @@ "type": { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -118,7 +118,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -132,7 +132,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -140,7 +140,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -164,7 +164,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -172,7 +172,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -193,7 +193,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -201,7 +201,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -209,7 +209,7 @@ "name": "string_list_map", "type": { "type": "map", - "values": "testdata.StringList" + "values": "testdata.model.StringList" }, "default": {} }, @@ -217,7 +217,7 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } @@ -225,4 +225,4 @@ } } ] -} \ No newline at end of file +} diff --git a/testdata/base/Yowza.avsc b/testdata/base/Yowza.avsc index ab10b59..5be7b4f 100644 --- a/testdata/base/Yowza.avsc +++ b/testdata/base/Yowza.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -9,4 +9,4 @@ "default": 0 } ] -} \ No newline at end of file +} diff --git a/testdata/collapse_fields/AOneOf.avsc b/testdata/collapse_fields/AOneOf.avsc index 77270ee..8366d6d 100644 --- a/testdata/collapse_fields/AOneOf.avsc +++ b/testdata/collapse_fields/AOneOf.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -9,7 +9,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -21,7 +21,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -34,4 +34,4 @@ "default": null } ] -} \ No newline at end of file +} diff --git a/testdata/collapse_fields/Foobar.avsc b/testdata/collapse_fields/Foobar.avsc index 17fce7f..9d34e3a 100644 --- a/testdata/collapse_fields/Foobar.avsc +++ b/testdata/collapse_fields/Foobar.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -27,7 +27,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -41,7 +41,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -49,7 +49,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -73,7 +73,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -81,7 +81,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -102,7 +102,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -110,7 +110,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -139,4 +139,4 @@ "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/collapse_fields/TypeA.avsc b/testdata/collapse_fields/TypeA.avsc index a0de7f4..0930b64 100644 --- a/testdata/collapse_fields/TypeA.avsc +++ b/testdata/collapse_fields/TypeA.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/collapse_fields/TypeB.avsc b/testdata/collapse_fields/TypeB.avsc index e3e6c51..8e38365 100644 --- a/testdata/collapse_fields/TypeB.avsc +++ b/testdata/collapse_fields/TypeB.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/collapse_fields/Widget.avsc b/testdata/collapse_fields/Widget.avsc index 4035ab1..162a8ee 100644 --- a/testdata/collapse_fields/Widget.avsc +++ b/testdata/collapse_fields/Widget.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Widget", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "from_date", @@ -44,7 +44,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -52,7 +52,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -64,7 +64,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -86,7 +86,7 @@ "type": { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -112,7 +112,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -126,7 +126,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -134,7 +134,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -158,7 +158,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -166,7 +166,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -187,7 +187,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -195,7 +195,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -225,4 +225,4 @@ } } ] -} \ No newline at end of file +} diff --git a/testdata/collapse_fields/Yowza.avsc b/testdata/collapse_fields/Yowza.avsc index ab10b59..5be7b4f 100644 --- a/testdata/collapse_fields/Yowza.avsc +++ b/testdata/collapse_fields/Yowza.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -9,4 +9,4 @@ "default": 0 } ] -} \ No newline at end of file +} diff --git a/testdata/emit_only/Widget.avsc b/testdata/emit_only/Widget.avsc index 82ab640..fea170e 100644 --- a/testdata/emit_only/Widget.avsc +++ b/testdata/emit_only/Widget.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Widget", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "from_date", @@ -23,7 +23,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -40,7 +40,7 @@ }, { "name": "strings", - "type": "testdata.StringList", + "type": "testdata.model.StringList", "default": "" }, { @@ -50,7 +50,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -58,7 +58,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -70,7 +70,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -92,7 +92,7 @@ "type": { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -118,7 +118,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -132,7 +132,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -140,7 +140,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -164,7 +164,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -172,7 +172,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -193,7 +193,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -201,7 +201,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -209,7 +209,7 @@ "name": "string_list_map", "type": { "type": "map", - "values": "testdata.StringList" + "values": "testdata.model.StringList" }, "default": {} }, @@ -217,7 +217,7 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } @@ -225,4 +225,4 @@ } } ] -} \ No newline at end of file +} diff --git a/testdata/foobar.proto b/testdata/foobar.proto index 03efd2a..ad2f9ac 100644 --- a/testdata/foobar.proto +++ b/testdata/foobar.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package testdata; +package testdata.model; message StringList { repeated string data = 1; diff --git a/testdata/prefix_schema_files_with_package/testdata/AOneOf.avsc b/testdata/prefix_schema_files_with_package/testdata.model/AOneOf.avsc similarity index 83% rename from testdata/prefix_schema_files_with_package/testdata/AOneOf.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/AOneOf.avsc index 77270ee..8366d6d 100644 --- a/testdata/prefix_schema_files_with_package/testdata/AOneOf.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/AOneOf.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -9,7 +9,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -21,7 +21,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -34,4 +34,4 @@ "default": null } ] -} \ No newline at end of file +} diff --git a/testdata/prefix_schema_files_with_package/testdata/Foobar.avsc b/testdata/prefix_schema_files_with_package/testdata.model/Foobar.avsc similarity index 85% rename from testdata/prefix_schema_files_with_package/testdata/Foobar.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/Foobar.avsc index 7a82ec1..7873175 100644 --- a/testdata/prefix_schema_files_with_package/testdata/Foobar.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/Foobar.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -27,7 +27,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -41,7 +41,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -49,7 +49,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -73,7 +73,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -81,7 +81,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -102,7 +102,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -110,7 +110,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -121,7 +121,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -140,9 +140,9 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/prefix_schema_files_with_package/testdata/StringList.avsc b/testdata/prefix_schema_files_with_package/testdata.model/StringList.avsc similarity index 84% rename from testdata/prefix_schema_files_with_package/testdata/StringList.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/StringList.avsc index fec2273..0a23b52 100644 --- a/testdata/prefix_schema_files_with_package/testdata/StringList.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/StringList.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -12,4 +12,4 @@ "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/prefix_schema_files_with_package/testdata/TypeA.avsc b/testdata/prefix_schema_files_with_package/testdata.model/TypeA.avsc similarity index 79% rename from testdata/prefix_schema_files_with_package/testdata/TypeA.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/TypeA.avsc index a0de7f4..0930b64 100644 --- a/testdata/prefix_schema_files_with_package/testdata/TypeA.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/TypeA.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/prefix_schema_files_with_package/testdata/TypeB.avsc b/testdata/prefix_schema_files_with_package/testdata.model/TypeB.avsc similarity index 79% rename from testdata/prefix_schema_files_with_package/testdata/TypeB.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/TypeB.avsc index e3e6c51..8e38365 100644 --- a/testdata/prefix_schema_files_with_package/testdata/TypeB.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/TypeB.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/prefix_schema_files_with_package/testdata/Widget.avsc b/testdata/prefix_schema_files_with_package/testdata.model/Widget.avsc similarity index 86% rename from testdata/prefix_schema_files_with_package/testdata/Widget.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/Widget.avsc index 82ab640..fea170e 100644 --- a/testdata/prefix_schema_files_with_package/testdata/Widget.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/Widget.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Widget", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "from_date", @@ -23,7 +23,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -40,7 +40,7 @@ }, { "name": "strings", - "type": "testdata.StringList", + "type": "testdata.model.StringList", "default": "" }, { @@ -50,7 +50,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -58,7 +58,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -70,7 +70,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -92,7 +92,7 @@ "type": { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -118,7 +118,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -132,7 +132,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -140,7 +140,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -164,7 +164,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -172,7 +172,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -193,7 +193,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -201,7 +201,7 @@ "name": "a_yowza_map", "type": { "type": "map", - "values": "testdata.Yowza" + "values": "testdata.model.Yowza" }, "default": {} }, @@ -209,7 +209,7 @@ "name": "string_list_map", "type": { "type": "map", - "values": "testdata.StringList" + "values": "testdata.model.StringList" }, "default": {} }, @@ -217,7 +217,7 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } @@ -225,4 +225,4 @@ } } ] -} \ No newline at end of file +} diff --git a/testdata/prefix_schema_files_with_package/testdata/Yowza.avsc b/testdata/prefix_schema_files_with_package/testdata.model/Yowza.avsc similarity index 79% rename from testdata/prefix_schema_files_with_package/testdata/Yowza.avsc rename to testdata/prefix_schema_files_with_package/testdata.model/Yowza.avsc index ab10b59..5be7b4f 100644 --- a/testdata/prefix_schema_files_with_package/testdata/Yowza.avsc +++ b/testdata/prefix_schema_files_with_package/testdata.model/Yowza.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -9,4 +9,4 @@ "default": 0 } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/AOneOf.avsc b/testdata/preserve_non_string_maps/AOneOf.avsc index 77270ee..8366d6d 100644 --- a/testdata/preserve_non_string_maps/AOneOf.avsc +++ b/testdata/preserve_non_string_maps/AOneOf.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -9,7 +9,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -21,7 +21,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -34,4 +34,4 @@ "default": null } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/AYowzaMapEntry.avsc b/testdata/preserve_non_string_maps/AYowzaMapEntry.avsc index 3d992e0..ae4ca96 100644 --- a/testdata/preserve_non_string_maps/AYowzaMapEntry.avsc +++ b/testdata/preserve_non_string_maps/AYowzaMapEntry.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "AYowzaMapEntry", - "namespace": "testdata.Foobar", + "namespace": "testdata.model.Foobar", "fields": [ { "name": "key", @@ -13,7 +13,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -24,4 +24,4 @@ } } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/Foobar.avsc b/testdata/preserve_non_string_maps/Foobar.avsc index ecb3b48..2338df6 100644 --- a/testdata/preserve_non_string_maps/Foobar.avsc +++ b/testdata/preserve_non_string_maps/Foobar.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -27,7 +27,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -41,7 +41,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -49,7 +49,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -73,7 +73,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -81,7 +81,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -102,7 +102,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -113,7 +113,7 @@ "items": { "type": "record", "name": "AYowzaMapEntry", - "namespace": "testdata.Foobar", + "namespace": "testdata.model.Foobar", "fields": [ { "name": "key", @@ -122,7 +122,7 @@ }, { "name": "value", - "type": "testdata.Yowza", + "type": "testdata.model.Yowza", "default": "" } ] @@ -137,7 +137,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -156,9 +156,9 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/StringList.avsc b/testdata/preserve_non_string_maps/StringList.avsc index fec2273..0a23b52 100644 --- a/testdata/preserve_non_string_maps/StringList.avsc +++ b/testdata/preserve_non_string_maps/StringList.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -12,4 +12,4 @@ "default": [] } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/TypeA.avsc b/testdata/preserve_non_string_maps/TypeA.avsc index a0de7f4..0930b64 100644 --- a/testdata/preserve_non_string_maps/TypeA.avsc +++ b/testdata/preserve_non_string_maps/TypeA.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/TypeB.avsc b/testdata/preserve_non_string_maps/TypeB.avsc index e3e6c51..8e38365 100644 --- a/testdata/preserve_non_string_maps/TypeB.avsc +++ b/testdata/preserve_non_string_maps/TypeB.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -9,4 +9,4 @@ "default": "" } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/Widget.avsc b/testdata/preserve_non_string_maps/Widget.avsc index cce1f05..513f9cc 100644 --- a/testdata/preserve_non_string_maps/Widget.avsc +++ b/testdata/preserve_non_string_maps/Widget.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Widget", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "from_date", @@ -23,7 +23,7 @@ "values": { "type": "record", "name": "StringList", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "data", @@ -40,7 +40,7 @@ }, { "name": "strings", - "type": "testdata.StringList", + "type": "testdata.model.StringList", "default": "" }, { @@ -50,7 +50,7 @@ { "type": "record", "name": "AOneOf", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "oneof_types", @@ -58,7 +58,7 @@ { "type": "record", "name": "TypeA", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "foo", @@ -70,7 +70,7 @@ { "type": "record", "name": "TypeB", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "bar", @@ -92,7 +92,7 @@ "type": { "type": "record", "name": "Foobar", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "name", @@ -118,7 +118,7 @@ "type": { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -132,7 +132,7 @@ "name": "blarps", "type": { "type": "array", - "items": "testdata.Blarp" + "items": "testdata.model.Blarp" }, "default": [] }, @@ -140,7 +140,7 @@ "name": "yowzas", "type": { "type": "array", - "items": "testdata.Yowza" + "items": "testdata.model.Yowza" }, "default": [] }, @@ -164,7 +164,7 @@ "name": "optional_blarp", "type": [ "null", - "testdata.Blarp" + "testdata.model.Blarp" ], "default": null }, @@ -172,7 +172,7 @@ "name": "optional_yowza", "type": [ "null", - "testdata.Yowza" + "testdata.model.Yowza" ], "default": null }, @@ -193,7 +193,7 @@ "name": "a_blarp_map", "type": { "type": "map", - "values": "testdata.Blarp" + "values": "testdata.model.Blarp" }, "default": {} }, @@ -204,7 +204,7 @@ "items": { "type": "record", "name": "AYowzaMapEntry", - "namespace": "testdata.Foobar", + "namespace": "testdata.model.Foobar", "fields": [ { "name": "key", @@ -213,7 +213,7 @@ }, { "name": "value", - "type": "testdata.Yowza", + "type": "testdata.model.Yowza", "default": "" } ] @@ -225,7 +225,7 @@ "name": "string_list_map", "type": { "type": "map", - "values": "testdata.StringList" + "values": "testdata.model.StringList" }, "default": {} }, @@ -233,7 +233,7 @@ "name": "string_lists", "type": { "type": "array", - "items": "testdata.StringList" + "items": "testdata.model.StringList" }, "default": [] } @@ -241,4 +241,4 @@ } } ] -} \ No newline at end of file +} diff --git a/testdata/preserve_non_string_maps/Yowza.avsc b/testdata/preserve_non_string_maps/Yowza.avsc index ab10b59..5be7b4f 100644 --- a/testdata/preserve_non_string_maps/Yowza.avsc +++ b/testdata/preserve_non_string_maps/Yowza.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "Yowza", - "namespace": "testdata", + "namespace": "testdata.model", "fields": [ { "name": "hoo_boy", @@ -9,4 +9,4 @@ "default": 0 } ] -} \ No newline at end of file +} diff --git a/testdata/widget.proto b/testdata/widget.proto index 906edb5..8d11aa8 100644 --- a/testdata/widget.proto +++ b/testdata/widget.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package testdata; +package testdata.model; import "testdata/foobar.proto"; import "google/protobuf/timestamp.proto";