Cleanup namespaces

Havret · Havret · commit f14165d91e78 · 2022-03-20T18:30:53.000+01:00
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Benchmarks.cs b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Benchmarks.cs
@@ -1,8 +1,10 @@
-using System.Text.Json.Protobuf.Benchmark.Shared;
+using System.Text.Json.Protobuf.Benchmark;
 using BenchmarkDotNet.Attributes;
 using Newtonsoft.Json;
+using Protobuf.System.Text.Json.Benchmark.Shared;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace System.Text.Json.Protobuf.Benchmark.MessageWithOneOfs;
+namespace Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs;
 
 public class Benchmarks
 {
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj
@@ -5,7 +5,6 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>System.Text.Json.Protobuf.Benchmark.MessageWithOneOfs</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Benchmarks.cs b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Benchmarks.cs
@@ -1,8 +1,10 @@
-using System.Text.Json.Protobuf.Benchmark.Shared;
+using System.Text.Json.Protobuf.Benchmark;
 using BenchmarkDotNet.Attributes;
 using Newtonsoft.Json;
+using Protobuf.System.Text.Json.Benchmark.Shared;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace System.Text.Json.Protobuf.Benchmark.MessageWithRepeatedFields;
+namespace Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields;
 
 [MarkdownExporter]
 public class Benchmarks
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj
@@ -5,7 +5,6 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>System.Text.Json.Protobuf.Benchmark.MessageWithRepeatedFields</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/BenchmarkHelper.cs b/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/BenchmarkHelper.cs
@@ -1,6 +1,7 @@
+using System.Text.Json;
 using Newtonsoft.Json;
 
-namespace System.Text.Json.Protobuf.Benchmark.Shared;
+namespace Protobuf.System.Text.Json.Benchmark.Shared;
 
 public static class BenchmarkHelper
 {
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/NewtonsoftProtobufJsonConverter.cs b/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/NewtonsoftProtobufJsonConverter.cs
@@ -4,7 +4,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace System.Text.Json.Protobuf.Benchmark.Shared;
+namespace Protobuf.System.Text.Json.Benchmark.Shared;
 
 public class NewtonsoftProtobufJsonConverter : JsonConverter
 {
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj
@@ -4,7 +4,6 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>System.Text.Json.Protobuf.Benchmark.Shared</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Benchmarks.cs b/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Benchmarks.cs
@@ -1,8 +1,10 @@
-using System.Text.Json.Protobuf.Benchmark.Shared;
+using System.Text.Json.Protobuf.Benchmark;
 using BenchmarkDotNet.Attributes;
 using Newtonsoft.Json;
+using Protobuf.System.Text.Json.Benchmark.Shared;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace System.Text.Json.Protobuf.Benchmark.SimpleMessage;
+namespace Protobuf.System.Text.Json.Benchmark.SimpleMessage;
 
 [MarkdownExporter]
 public class Benchmarks
diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj
@@ -5,7 +5,6 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>System.Text.Json.Protobuf.Benchmark.SimpleMessage</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Protobuf.System.Text.Json/FieldInfo.cs b/src/Protobuf.System.Text.Json/FieldInfo.cs
@@ -1,7 +1,7 @@
-using System.Text.Json.Protobuf.InternalConverters;
 using Google.Protobuf.Reflection;
+using Protobuf.System.Text.Json.InternalConverters;
 
-namespace System.Text.Json.Protobuf;
+namespace Protobuf.System.Text.Json;
 
 internal class FieldInfo
 {
diff --git a/src/Protobuf.System.Text.Json/InternalConverters/FieldConverter.cs b/src/Protobuf.System.Text.Json/InternalConverters/FieldConverter.cs
@@ -1,8 +1,9 @@
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Google.Protobuf;
 using Google.Protobuf.Reflection;
 
-namespace System.Text.Json.Protobuf.InternalConverters;
+namespace Protobuf.System.Text.Json.InternalConverters;
 
 internal class FieldConverter<T> : InternalConverter
 {
diff --git a/src/Protobuf.System.Text.Json/InternalConverters/InternalConverter.cs b/src/Protobuf.System.Text.Json/InternalConverters/InternalConverter.cs
@@ -1,7 +1,8 @@
+using System.Text.Json;
 using Google.Protobuf;
 using Google.Protobuf.Reflection;
 
-namespace System.Text.Json.Protobuf.InternalConverters;
+namespace Protobuf.System.Text.Json.InternalConverters;
 
 internal abstract class InternalConverter
 {
diff --git a/src/Protobuf.System.Text.Json/InternalConverters/InternalConverterFactory.cs b/src/Protobuf.System.Text.Json/InternalConverters/InternalConverterFactory.cs
@@ -1,4 +1,4 @@
-namespace System.Text.Json.Protobuf.InternalConverters;
+namespace Protobuf.System.Text.Json.InternalConverters;
 
 internal class InternalConverterFactory
 {
diff --git a/src/Protobuf.System.Text.Json/InternalConverters/MapConverter.cs b/src/Protobuf.System.Text.Json/InternalConverters/MapConverter.cs
@@ -1,9 +1,10 @@
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Google.Protobuf;
 using Google.Protobuf.Collections;
 using Google.Protobuf.Reflection;
 
-namespace System.Text.Json.Protobuf.InternalConverters;
+namespace Protobuf.System.Text.Json.InternalConverters;
 
 internal class MapConverter<TKey, TValue> : InternalConverter
 {
diff --git a/src/Protobuf.System.Text.Json/InternalConverters/RepeatedFieldConverter.cs b/src/Protobuf.System.Text.Json/InternalConverters/RepeatedFieldConverter.cs
@@ -1,9 +1,10 @@
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Google.Protobuf;
 using Google.Protobuf.Collections;
 using Google.Protobuf.Reflection;
 
-namespace System.Text.Json.Protobuf.InternalConverters;
+namespace Protobuf.System.Text.Json.InternalConverters;
 
 internal class RepeatedFieldConverter<T> : InternalConverter
 {
diff --git a/src/Protobuf.System.Text.Json/JsonProtobufSerializerOptions.cs b/src/Protobuf.System.Text.Json/JsonProtobufSerializerOptions.cs
@@ -1,4 +1,4 @@
-namespace System.Text.Json.Protobuf;
+namespace Protobuf.System.Text.Json;
 
 public class JsonProtobufSerializerOptions
 {
diff --git a/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs b/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Protobuf;
+using Protobuf.System.Text.Json;
 
 // ReSharper disable once CheckNamespace
 namespace System.Text.Json;
diff --git a/src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj b/src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj
@@ -18,7 +18,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <RootNamespace>System.Text.Json.Protobuf</RootNamespace>
+        <RootNamespace>Protobuf.System.Text.Json</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Protobuf.System.Text.Json/ProtobufConverter.cs b/src/Protobuf.System.Text.Json/ProtobufConverter.cs
@@ -1,10 +1,11 @@
 using System.Reflection;
-using System.Text.Json.Protobuf.InternalConverters;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Google.Protobuf;
 using Google.Protobuf.Reflection;
+using Protobuf.System.Text.Json.InternalConverters;
 
-namespace System.Text.Json.Protobuf;
+namespace Protobuf.System.Text.Json;
 
 internal class ProtobufConverter<T> : JsonConverter<T?> where T : class, IMessage, new()
 {
diff --git a/src/Protobuf.System.Text.Json/ProtobufJsonConverterFactory.cs b/src/Protobuf.System.Text.Json/ProtobufJsonConverterFactory.cs
@@ -1,7 +1,8 @@
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Google.Protobuf;
 
-namespace System.Text.Json.Protobuf;
+namespace Protobuf.System.Text.Json;
 
 internal class ProtobufJsonConverterFactory : JsonConverterFactory
 {
diff --git a/src/Protobuf.System.Text.Json/TimestampConverter.cs b/src/Protobuf.System.Text.Json/TimestampConverter.cs
@@ -1,7 +1,9 @@
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Google.Protobuf.WellKnownTypes;
+using Type = System.Type;
 
-namespace System.Text.Json.Protobuf;
+namespace Protobuf.System.Text.Json;
 
 public class TimestampConverter : JsonConverter<Timestamp?>
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/JsonNamingPolicyTests.cs b/test/Protobuf.System.Text.Json.Tests/JsonNamingPolicyTests.cs
@@ -1,8 +1,10 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class JsonNamingPolicyTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/MessageWithComplexPropertyTests.cs b/test/Protobuf.System.Text.Json.Tests/MessageWithComplexPropertyTests.cs
@@ -1,9 +1,11 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class MessageWithComplexPropertyTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/MessageWithEnumFieldTests.cs b/test/Protobuf.System.Text.Json.Tests/MessageWithEnumFieldTests.cs
@@ -1,9 +1,11 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class MessageWithEnumFieldTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/MessageWithMapsTests.cs b/test/Protobuf.System.Text.Json.Tests/MessageWithMapsTests.cs
@@ -1,9 +1,11 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class MessageWithMapsTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/MessageWithOneOfTests.cs b/test/Protobuf.System.Text.Json.Tests/MessageWithOneOfTests.cs
@@ -1,9 +1,11 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class MessageWithOneOfTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/MessageWithRepeatedListTests.cs b/test/Protobuf.System.Text.Json.Tests/MessageWithRepeatedListTests.cs
@@ -1,9 +1,11 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class MessageWithRepeatedListTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/MessageWithTimestampTests.cs b/test/Protobuf.System.Text.Json.Tests/MessageWithTimestampTests.cs
@@ -1,10 +1,13 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
 using Google.Protobuf.WellKnownTypes;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class MessageWithTimestampTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj b/test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj
@@ -3,10 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
-
         <IsPackable>false</IsPackable>
-
-        <RootNamespace>System.Text.Json.Protobuf.Tests</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/test/Protobuf.System.Text.Json.Tests/SimpleMessageTests.cs b/test/Protobuf.System.Text.Json.Tests/SimpleMessageTests.cs
@@ -1,9 +1,11 @@
-using System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+using System.Text.Json.Protobuf.Tests;
+using Protobuf.System.Text.Json.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
 
-namespace System.Text.Json.Protobuf.Tests;
+namespace Protobuf.System.Text.Json.Tests;
 
 public class SimpleMessageTests
 {
diff --git a/test/Protobuf.System.Text.Json.Tests/Utils/TestHelper.cs b/test/Protobuf.System.Text.Json.Tests/Utils/TestHelper.cs
@@ -1,4 +1,6 @@
-namespace System.Text.Json.Protobuf.Tests.Utils;
+using System.Text.Json;
+
+namespace Protobuf.System.Text.Json.Tests.Utils;
 
 public class TestHelper
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
	`1`	`+using System.Text.Json;`
`1`	`2`	`using Newtonsoft.Json;`
`2`	`3`
`3`		`-namespace System.Text.Json.Protobuf.Benchmark.Shared;`
	`4`	`+namespace Protobuf.System.Text.Json.Benchmark.Shared;`
`4`	`5`
`5`	`6`	`public static class BenchmarkHelper`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Newtonsoft.Json;`
`5`	`5`	`using Newtonsoft.Json.Linq;`
`6`	`6`
`7`		`-namespace System.Text.Json.Protobuf.Benchmark.Shared;`
	`7`	`+namespace Protobuf.System.Text.Json.Benchmark.Shared;`
`8`	`8`
`9`	`9`	`public class NewtonsoftProtobufJsonConverter : JsonConverter`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using System.Text.Json.Protobuf.InternalConverters;`
`2`	`1`	`using Google.Protobuf.Reflection;`
	`2`	`+using Protobuf.System.Text.Json.InternalConverters;`
`3`	`3`
`4`		`-namespace System.Text.Json.Protobuf;`
	`4`	`+namespace Protobuf.System.Text.Json;`
`5`	`5`
`6`	`6`	`internal class FieldInfo`
`7`	`7`	`{`