AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Rename Preconditions to ProtoPreconditions

Browse Source 
(Generated code changes in next commit.)
This commit is contained in:
Jon Skeet 2016-02-04 06:51:54 +00:00
parent c78222a366
commit 7762f163a4
16 changed files with 94 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -133,7 +133,7 @@ csharp_EXTRA_DIST= \
csharp/src/Google.Protobuf/LimitedInputStream.cs \ csharp/src/Google.Protobuf/LimitedInputStream.cs \
csharp/src/Google.Protobuf/MessageExtensions.cs \ csharp/src/Google.Protobuf/MessageExtensions.cs \
csharp/src/Google.Protobuf/MessageParser.cs \ csharp/src/Google.Protobuf/MessageParser.cs \
csharp/src/Google.Protobuf/Preconditions.cs \ csharp/src/Google.Protobuf/ProtoPreconditions.cs \
csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs \ csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs \
csharp/src/Google.Protobuf/Reflection/Descriptor.cs \ csharp/src/Google.Protobuf/Reflection/Descriptor.cs \
csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs \ csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs \

6
csharp/src/Google.Protobuf/CodedInputStream.cs
View File

@ -115,7 +115,7 @@ namespace Google.Protobuf
/// <summary> /// <summary>
/// Creates a new CodedInputStream reading data from the given byte array. /// Creates a new CodedInputStream reading data from the given byte array.
/// </summary> /// </summary>
public CodedInputStream(byte[] buffer) : this(null, Preconditions.CheckNotNull(buffer, "buffer"), 0, buffer.Length) public CodedInputStream(byte[] buffer) : this(null, ProtoPreconditions.CheckNotNull(buffer, "buffer"), 0, buffer.Length)
{ {
} }
@ -123,7 +123,7 @@ namespace Google.Protobuf
/// Creates a new CodedInputStream that reads from the given byte array slice. /// Creates a new CodedInputStream that reads from the given byte array slice.
/// </summary> /// </summary>
public CodedInputStream(byte[] buffer, int offset, int length) public CodedInputStream(byte[] buffer, int offset, int length)
: this(null, Preconditions.CheckNotNull(buffer, "buffer"), offset, offset + length) : this(null, ProtoPreconditions.CheckNotNull(buffer, "buffer"), offset, offset + length)
{ {
if (offset < 0 || offset > buffer.Length) if (offset < 0 || offset > buffer.Length)
{ {
@ -140,7 +140,7 @@ namespace Google.Protobuf
/// </summary> /// </summary>
public CodedInputStream(Stream input) : this(input, new byte[BufferSize], 0, 0) public CodedInputStream(Stream input) : this(input, new byte[BufferSize], 0, 0)
{ {
Preconditions.CheckNotNull(input, "input"); ProtoPreconditions.CheckNotNull(input, "input");
} }
/// <summary> /// <summary>

16
csharp/src/Google.Protobuf/Collections/MapField.cs
View File

@ -123,7 +123,7 @@ namespace Google.Protobuf.Collections
/// <returns><c>true</c> if the map contains the given key; <c>false</c> otherwise.</returns> /// <returns><c>true</c> if the map contains the given key; <c>false</c> otherwise.</returns>
public bool ContainsKey(TKey key) public bool ContainsKey(TKey key)
{ {
Preconditions.CheckNotNullUnconstrained(key, "key"); ProtoPreconditions.CheckNotNullUnconstrained(key, "key");
return map.ContainsKey(key); return map.ContainsKey(key);
} }
@ -140,7 +140,7 @@ namespace Google.Protobuf.Collections
/// <returns><c>true</c> if the map contained the given key before the entry was removed; <c>false</c> otherwise.</returns> /// <returns><c>true</c> if the map contained the given key before the entry was removed; <c>false</c> otherwise.</returns>
public bool Remove(TKey key) public bool Remove(TKey key)
{ {
Preconditions.CheckNotNullUnconstrained(key, "key"); ProtoPreconditions.CheckNotNullUnconstrained(key, "key");
LinkedListNode<KeyValuePair<TKey, TValue>> node; LinkedListNode<KeyValuePair<TKey, TValue>> node;
if (map.TryGetValue(key, out node)) if (map.TryGetValue(key, out node))
{ {
@ -188,7 +188,7 @@ namespace Google.Protobuf.Collections
{ {
get get
{ {
Preconditions.CheckNotNullUnconstrained(key, "key"); ProtoPreconditions.CheckNotNullUnconstrained(key, "key");
TValue value; TValue value;
if (TryGetValue(key, out value)) if (TryGetValue(key, out value))
{ {
@ -198,11 +198,11 @@ namespace Google.Protobuf.Collections
} }
set set
{ {
Preconditions.CheckNotNullUnconstrained(key, "key"); ProtoPreconditions.CheckNotNullUnconstrained(key, "key");
// value == null check here is redundant, but avoids boxing. // value == null check here is redundant, but avoids boxing.
if (value == null) if (value == null)
{ {
Preconditions.CheckNotNullUnconstrained(value, "value"); ProtoPreconditions.CheckNotNullUnconstrained(value, "value");
} }
LinkedListNode<KeyValuePair<TKey, TValue>> node; LinkedListNode<KeyValuePair<TKey, TValue>> node;
var pair = new KeyValuePair<TKey, TValue>(key, value); var pair = new KeyValuePair<TKey, TValue>(key, value);
@ -234,7 +234,7 @@ namespace Google.Protobuf.Collections
/// <param name="entries">The entries to add to the map.</param> /// <param name="entries">The entries to add to the map.</param>
public void Add(IDictionary<TKey, TValue> entries) public void Add(IDictionary<TKey, TValue> entries)
{ {
Preconditions.CheckNotNull(entries, "entries"); ProtoPreconditions.CheckNotNull(entries, "entries");
foreach (var pair in entries) foreach (var pair in entries)
{ {
Add(pair.Key, pair.Value); Add(pair.Key, pair.Value);
@ -501,7 +501,7 @@ namespace Google.Protobuf.Collections
void IDictionary.Remove(object key) void IDictionary.Remove(object key)
{ {
Preconditions.CheckNotNull(key, "key"); ProtoPreconditions.CheckNotNull(key, "key");
if (!(key is TKey)) if (!(key is TKey))
{ {
return; return;
@ -530,7 +530,7 @@ namespace Google.Protobuf.Collections
{ {
get get
{ {
Preconditions.CheckNotNull(key, "key"); ProtoPreconditions.CheckNotNull(key, "key");
if (!(key is TKey)) if (!(key is TKey))
{ {
return null; return null;

2
csharp/src/Google.Protobuf/Google.Protobuf.csproj
View File

@ -123,7 +123,7 @@
<Compile Include="Reflection\RepeatedFieldAccessor.cs" /> <Compile Include="Reflection\RepeatedFieldAccessor.cs" />
<Compile Include="Reflection\ServiceDescriptor.cs" /> <Compile Include="Reflection\ServiceDescriptor.cs" />
<Compile Include="Reflection\SingleFieldAccessor.cs" /> <Compile Include="Reflection\SingleFieldAccessor.cs" />
<Compile Include="Preconditions.cs" /> <Compile Include="ProtoPreconditions.cs" />
<Compile Include="Reflection\TypeRegistry.cs" /> <Compile Include="Reflection\TypeRegistry.cs" />
<Compile Include="WellKnownTypes\Any.cs" /> <Compile Include="WellKnownTypes\Any.cs" />
<Compile Include="WellKnownTypes\AnyPartial.cs" /> <Compile Include="WellKnownTypes\AnyPartial.cs" />

6
csharp/src/Google.Protobuf/JsonFormatter.cs
View File

@ -141,7 +141,7 @@ namespace Google.Protobuf
/// <returns>The formatted message.</returns> /// <returns>The formatted message.</returns>
public string Format(IMessage message) public string Format(IMessage message)
{ {
Preconditions.CheckNotNull(message, nameof(message)); ProtoPreconditions.CheckNotNull(message, nameof(message));
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (message.Descriptor.IsWellKnownType) if (message.Descriptor.IsWellKnownType)
{ {
@ -173,7 +173,7 @@ namespace Google.Protobuf
/// <returns>The diagnostic-only JSON representation of the message</returns> /// <returns>The diagnostic-only JSON representation of the message</returns>
public static string ToDiagnosticString(IMessage message) public static string ToDiagnosticString(IMessage message)
{ {
Preconditions.CheckNotNull(message, nameof(message)); ProtoPreconditions.CheckNotNull(message, nameof(message));
return diagnosticFormatter.Format(message); return diagnosticFormatter.Format(message);
} }
@ -858,7 +858,7 @@ namespace Google.Protobuf
public Settings(bool formatDefaultValues, TypeRegistry typeRegistry) public Settings(bool formatDefaultValues, TypeRegistry typeRegistry)
{ {
FormatDefaultValues = formatDefaultValues; FormatDefaultValues = formatDefaultValues;
TypeRegistry = Preconditions.CheckNotNull(typeRegistry, nameof(typeRegistry)); TypeRegistry = ProtoPreconditions.CheckNotNull(typeRegistry, nameof(typeRegistry));
} }
} }
} }

14
csharp/src/Google.Protobuf/JsonParser.cs
View File

@ -374,7 +374,7 @@ namespace Google.Protobuf
/// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception> /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
public T Parse<T>(string json) where T : IMessage, new() public T Parse<T>(string json) where T : IMessage, new()
{ {
Preconditions.CheckNotNull(json, nameof(json)); ProtoPreconditions.CheckNotNull(json, nameof(json));
return Parse<T>(new StringReader(json)); return Parse<T>(new StringReader(json));
} }
@ -387,7 +387,7 @@ namespace Google.Protobuf
/// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception> /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
public T Parse<T>(TextReader jsonReader) where T : IMessage, new() public T Parse<T>(TextReader jsonReader) where T : IMessage, new()
{ {
Preconditions.CheckNotNull(jsonReader, nameof(jsonReader)); ProtoPreconditions.CheckNotNull(jsonReader, nameof(jsonReader));
T message = new T(); T message = new T();
Merge(message, jsonReader); Merge(message, jsonReader);
return message; return message;
@ -402,8 +402,8 @@ namespace Google.Protobuf
/// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception> /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
public IMessage Parse(string json, MessageDescriptor descriptor) public IMessage Parse(string json, MessageDescriptor descriptor)
{ {
Preconditions.CheckNotNull(json, nameof(json)); ProtoPreconditions.CheckNotNull(json, nameof(json));
Preconditions.CheckNotNull(descriptor, nameof(descriptor)); ProtoPreconditions.CheckNotNull(descriptor, nameof(descriptor));
return Parse(new StringReader(json), descriptor); return Parse(new StringReader(json), descriptor);
} }
@ -416,8 +416,8 @@ namespace Google.Protobuf
/// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception> /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
public IMessage Parse(TextReader jsonReader, MessageDescriptor descriptor) public IMessage Parse(TextReader jsonReader, MessageDescriptor descriptor)
{ {
Preconditions.CheckNotNull(jsonReader, nameof(jsonReader)); ProtoPreconditions.CheckNotNull(jsonReader, nameof(jsonReader));
Preconditions.CheckNotNull(descriptor, nameof(descriptor)); ProtoPreconditions.CheckNotNull(descriptor, nameof(descriptor));
IMessage message = descriptor.Parser.CreateTemplate(); IMessage message = descriptor.Parser.CreateTemplate();
Merge(message, jsonReader); Merge(message, jsonReader);
return message; return message;
@ -1011,7 +1011,7 @@ namespace Google.Protobuf
public Settings(int recursionLimit, TypeRegistry typeRegistry) public Settings(int recursionLimit, TypeRegistry typeRegistry)
{ {
RecursionLimit = recursionLimit; RecursionLimit = recursionLimit;
TypeRegistry = Preconditions.CheckNotNull(typeRegistry, nameof(typeRegistry)); TypeRegistry = ProtoPreconditions.CheckNotNull(typeRegistry, nameof(typeRegistry));
} }
} }
} }

28
csharp/src/Google.Protobuf/MessageExtensions.cs
View File

@ -46,8 +46,8 @@ namespace Google.Protobuf
/// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param> /// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param>
public static void MergeFrom(this IMessage message, byte[] data) public static void MergeFrom(this IMessage message, byte[] data)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
Preconditions.CheckNotNull(data, "data"); ProtoPreconditions.CheckNotNull(data, "data");
CodedInputStream input = new CodedInputStream(data); CodedInputStream input = new CodedInputStream(data);
message.MergeFrom(input); message.MergeFrom(input);
input.CheckReadEndOfStreamTag(); input.CheckReadEndOfStreamTag();
@ -60,8 +60,8 @@ namespace Google.Protobuf
/// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param> /// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param>
public static void MergeFrom(this IMessage message, ByteString data) public static void MergeFrom(this IMessage message, ByteString data)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
Preconditions.CheckNotNull(data, "data"); ProtoPreconditions.CheckNotNull(data, "data");
CodedInputStream input = data.CreateCodedInput(); CodedInputStream input = data.CreateCodedInput();
message.MergeFrom(input); message.MergeFrom(input);
input.CheckReadEndOfStreamTag(); input.CheckReadEndOfStreamTag();
@ -74,8 +74,8 @@ namespace Google.Protobuf
/// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param> /// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param>
public static void MergeFrom(this IMessage message, Stream input) public static void MergeFrom(this IMessage message, Stream input)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
Preconditions.CheckNotNull(input, "input"); ProtoPreconditions.CheckNotNull(input, "input");
CodedInputStream codedInput = new CodedInputStream(input); CodedInputStream codedInput = new CodedInputStream(input);
message.MergeFrom(codedInput); message.MergeFrom(codedInput);
codedInput.CheckReadEndOfStreamTag(); codedInput.CheckReadEndOfStreamTag();
@ -92,8 +92,8 @@ namespace Google.Protobuf
/// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param> /// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param>
public static void MergeDelimitedFrom(this IMessage message, Stream input) public static void MergeDelimitedFrom(this IMessage message, Stream input)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
Preconditions.CheckNotNull(input, "input"); ProtoPreconditions.CheckNotNull(input, "input");
int size = (int) CodedInputStream.ReadRawVarint32(input); int size = (int) CodedInputStream.ReadRawVarint32(input);
Stream limitedStream = new LimitedInputStream(input, size); Stream limitedStream = new LimitedInputStream(input, size);
message.MergeFrom(limitedStream); message.MergeFrom(limitedStream);
@ -106,7 +106,7 @@ namespace Google.Protobuf
/// <returns>The message data as a byte array.</returns> /// <returns>The message data as a byte array.</returns>
public static byte[] ToByteArray(this IMessage message) public static byte[] ToByteArray(this IMessage message)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
byte[] result = new byte[message.CalculateSize()]; byte[] result = new byte[message.CalculateSize()];
CodedOutputStream output = new CodedOutputStream(result); CodedOutputStream output = new CodedOutputStream(result);
message.WriteTo(output); message.WriteTo(output);
@ -121,8 +121,8 @@ namespace Google.Protobuf
/// <param name="output">The stream to write to.</param> /// <param name="output">The stream to write to.</param>
public static void WriteTo(this IMessage message, Stream output) public static void WriteTo(this IMessage message, Stream output)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
Preconditions.CheckNotNull(output, "output"); ProtoPreconditions.CheckNotNull(output, "output");
CodedOutputStream codedOutput = new CodedOutputStream(output); CodedOutputStream codedOutput = new CodedOutputStream(output);
message.WriteTo(codedOutput); message.WriteTo(codedOutput);
codedOutput.Flush(); codedOutput.Flush();
@ -135,8 +135,8 @@ namespace Google.Protobuf
/// <param name="output">The output stream to write to.</param> /// <param name="output">The output stream to write to.</param>
public static void WriteDelimitedTo(this IMessage message, Stream output) public static void WriteDelimitedTo(this IMessage message, Stream output)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
Preconditions.CheckNotNull(output, "output"); ProtoPreconditions.CheckNotNull(output, "output");
CodedOutputStream codedOutput = new CodedOutputStream(output); CodedOutputStream codedOutput = new CodedOutputStream(output);
codedOutput.WriteRawVarint32((uint)message.CalculateSize()); codedOutput.WriteRawVarint32((uint)message.CalculateSize());
message.WriteTo(codedOutput); message.WriteTo(codedOutput);
@ -150,7 +150,7 @@ namespace Google.Protobuf
/// <returns>The message data as a byte string.</returns> /// <returns>The message data as a byte string.</returns>
public static ByteString ToByteString(this IMessage message) public static ByteString ToByteString(this IMessage message)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
return ByteString.AttachBytes(message.ToByteArray()); return ByteString.AttachBytes(message.ToByteArray());
} }
} }

8
csharp/src/Google.Protobuf/MessageParser.cs
View File

@ -64,7 +64,7 @@ namespace Google.Protobuf
/// <returns>The newly parsed message.</returns> /// <returns>The newly parsed message.</returns>
public IMessage ParseFrom(byte[] data) public IMessage ParseFrom(byte[] data)
{ {
Preconditions.CheckNotNull(data, "data"); ProtoPreconditions.CheckNotNull(data, "data");
IMessage message = factory(); IMessage message = factory();
message.MergeFrom(data); message.MergeFrom(data);
return message; return message;
@ -77,7 +77,7 @@ namespace Google.Protobuf
/// <returns>The parsed message.</returns> /// <returns>The parsed message.</returns>
public IMessage ParseFrom(ByteString data) public IMessage ParseFrom(ByteString data)
{ {
Preconditions.CheckNotNull(data, "data"); ProtoPreconditions.CheckNotNull(data, "data");
IMessage message = factory(); IMessage message = factory();
message.MergeFrom(data); message.MergeFrom(data);
return message; return message;
@ -191,7 +191,7 @@ namespace Google.Protobuf
/// <returns>The newly parsed message.</returns> /// <returns>The newly parsed message.</returns>
public new T ParseFrom(byte[] data) public new T ParseFrom(byte[] data)
{ {
Preconditions.CheckNotNull(data, "data"); ProtoPreconditions.CheckNotNull(data, "data");
T message = factory(); T message = factory();
message.MergeFrom(data); message.MergeFrom(data);
return message; return message;
@ -204,7 +204,7 @@ namespace Google.Protobuf
/// <returns>The parsed message.</returns> /// <returns>The parsed message.</returns>
public new T ParseFrom(ByteString data) public new T ParseFrom(ByteString data)
{ {
Preconditions.CheckNotNull(data, "data"); ProtoPreconditions.CheckNotNull(data, "data");
T message = factory(); T message = factory();
message.MergeFrom(data); message.MergeFrom(data);
return message; return message;

9
csharp/src/Google.Protobuf/Preconditions.cs → csharp/src/Google.Protobuf/ProtoPreconditions.cs
View File

@ -35,9 +35,14 @@ using System;
namespace Google.Protobuf namespace Google.Protobuf
{ {
/// <summary> /// <summary>
/// Helper methods for throwing exceptions /// Helper methods for throwing exceptions when preconditions are not met.
/// </summary> /// </summary>
public static class Preconditions /// <remarks>
/// This class is used internally and by generated code; it is not particularly
/// expected to be used from application code, although nothing prevents it
/// from being used that way.
/// </remarks>
public static class ProtoPreconditions
{ {
/// <summary> /// <summary>
/// Throws an ArgumentNullException if the given value is null, otherwise /// Throws an ArgumentNullException if the given value is null, otherwise

54
csharp/src/Google.Protobuf/Reflection/Descriptor.cs
View File

@ -317,7 +317,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -330,7 +330,7 @@ namespace Google.Protobuf.Reflection {
public string Package { public string Package {
get { return package_; } get { return package_; }
set { set {
package_ = pb::Preconditions.CheckNotNull(value, "value"); package_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -446,7 +446,7 @@ namespace Google.Protobuf.Reflection {
public string Syntax { public string Syntax {
get { return syntax_; } get { return syntax_; }
set { set {
syntax_ = pb::Preconditions.CheckNotNull(value, "value"); syntax_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -702,7 +702,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1275,7 +1275,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1326,7 +1326,7 @@ namespace Google.Protobuf.Reflection {
public string TypeName { public string TypeName {
get { return typeName_; } get { return typeName_; }
set { set {
typeName_ = pb::Preconditions.CheckNotNull(value, "value"); typeName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1340,7 +1340,7 @@ namespace Google.Protobuf.Reflection {
public string Extendee { public string Extendee {
get { return extendee_; } get { return extendee_; }
set { set {
extendee_ = pb::Preconditions.CheckNotNull(value, "value"); extendee_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1357,7 +1357,7 @@ namespace Google.Protobuf.Reflection {
public string DefaultValue { public string DefaultValue {
get { return defaultValue_; } get { return defaultValue_; }
set { set {
defaultValue_ = pb::Preconditions.CheckNotNull(value, "value"); defaultValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1387,7 +1387,7 @@ namespace Google.Protobuf.Reflection {
public string JsonName { public string JsonName {
get { return jsonName_; } get { return jsonName_; }
set { set {
jsonName_ = pb::Preconditions.CheckNotNull(value, "value"); jsonName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1720,7 +1720,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1828,7 +1828,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -1986,7 +1986,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2152,7 +2152,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2313,7 +2313,7 @@ namespace Google.Protobuf.Reflection {
public string Name { public string Name {
get { return name_; } get { return name_; }
set { set {
name_ = pb::Preconditions.CheckNotNull(value, "value"); name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2327,7 +2327,7 @@ namespace Google.Protobuf.Reflection {
public string InputType { public string InputType {
get { return inputType_; } get { return inputType_; }
set { set {
inputType_ = pb::Preconditions.CheckNotNull(value, "value"); inputType_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2337,7 +2337,7 @@ namespace Google.Protobuf.Reflection {
public string OutputType { public string OutputType {
get { return outputType_; } get { return outputType_; }
set { set {
outputType_ = pb::Preconditions.CheckNotNull(value, "value"); outputType_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2583,7 +2583,7 @@ namespace Google.Protobuf.Reflection {
public string JavaPackage { public string JavaPackage {
get { return javaPackage_; } get { return javaPackage_; }
set { set {
javaPackage_ = pb::Preconditions.CheckNotNull(value, "value"); javaPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2600,7 +2600,7 @@ namespace Google.Protobuf.Reflection {
public string JavaOuterClassname { public string JavaOuterClassname {
get { return javaOuterClassname_; } get { return javaOuterClassname_; }
set { set {
javaOuterClassname_ = pb::Preconditions.CheckNotNull(value, "value"); javaOuterClassname_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2687,7 +2687,7 @@ namespace Google.Protobuf.Reflection {
public string GoPackage { public string GoPackage {
get { return goPackage_; } get { return goPackage_; }
set { set {
goPackage_ = pb::Preconditions.CheckNotNull(value, "value"); goPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2773,7 +2773,7 @@ namespace Google.Protobuf.Reflection {
public string ObjcClassPrefix { public string ObjcClassPrefix {
get { return objcClassPrefix_; } get { return objcClassPrefix_; }
set { set {
objcClassPrefix_ = pb::Preconditions.CheckNotNull(value, "value"); objcClassPrefix_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -2786,7 +2786,7 @@ namespace Google.Protobuf.Reflection {
public string CsharpNamespace { public string CsharpNamespace {
get { return csharpNamespace_; } get { return csharpNamespace_; }
set { set {
csharpNamespace_ = pb::Preconditions.CheckNotNull(value, "value"); csharpNamespace_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -4369,7 +4369,7 @@ namespace Google.Protobuf.Reflection {
public string IdentifierValue { public string IdentifierValue {
get { return identifierValue_; } get { return identifierValue_; }
set { set {
identifierValue_ = pb::Preconditions.CheckNotNull(value, "value"); identifierValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -4409,7 +4409,7 @@ namespace Google.Protobuf.Reflection {
public pb::ByteString StringValue { public pb::ByteString StringValue {
get { return stringValue_; } get { return stringValue_; }
set { set {
stringValue_ = pb::Preconditions.CheckNotNull(value, "value"); stringValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -4419,7 +4419,7 @@ namespace Google.Protobuf.Reflection {
public string AggregateValue { public string AggregateValue {
get { return aggregateValue_; } get { return aggregateValue_; }
set { set {
aggregateValue_ = pb::Preconditions.CheckNotNull(value, "value"); aggregateValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -4621,7 +4621,7 @@ namespace Google.Protobuf.Reflection {
public string NamePart_ { public string NamePart_ {
get { return namePart_; } get { return namePart_; }
set { set {
namePart_ = pb::Preconditions.CheckNotNull(value, "value"); namePart_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -5004,7 +5004,7 @@ namespace Google.Protobuf.Reflection {
public string LeadingComments { public string LeadingComments {
get { return leadingComments_; } get { return leadingComments_; }
set { set {
leadingComments_ = pb::Preconditions.CheckNotNull(value, "value"); leadingComments_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }
@ -5014,7 +5014,7 @@ namespace Google.Protobuf.Reflection {
public string TrailingComments { public string TrailingComments {
get { return trailingComments_; } get { return trailingComments_; }
set { set {
trailingComments_ = pb::Preconditions.CheckNotNull(value, "value"); trailingComments_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
} }
} }

4
csharp/src/Google.Protobuf/Reflection/TypeRegistry.cs
View File

@ -91,7 +91,7 @@ namespace Google.Protobuf.Reflection
/// <returns>A type registry for the given files.</returns> /// <returns>A type registry for the given files.</returns>
public static TypeRegistry FromFiles(IEnumerable<FileDescriptor> fileDescriptors) public static TypeRegistry FromFiles(IEnumerable<FileDescriptor> fileDescriptors)
{ {
Preconditions.CheckNotNull(fileDescriptors, nameof(fileDescriptors)); ProtoPreconditions.CheckNotNull(fileDescriptors, nameof(fileDescriptors));
var builder = new Builder(); var builder = new Builder();
foreach (var file in fileDescriptors) foreach (var file in fileDescriptors)
{ {
@ -128,7 +128,7 @@ namespace Google.Protobuf.Reflection
/// <returns>A type registry for the given files.</returns> /// <returns>A type registry for the given files.</returns>
public static TypeRegistry FromMessages(IEnumerable<MessageDescriptor> messageDescriptors) public static TypeRegistry FromMessages(IEnumerable<MessageDescriptor> messageDescriptors)
{ {
Preconditions.CheckNotNull(messageDescriptors, nameof(messageDescriptors)); ProtoPreconditions.CheckNotNull(messageDescriptors, nameof(messageDescriptors));
return FromFiles(messageDescriptors.Select(md => md.File)); return FromFiles(messageDescriptors.Select(md => md.File));
} }

2
csharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs
View File

@ -72,7 +72,7 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>An Any message with the content and type URL of <paramref name="message"/>.</returns> /// <returns>An Any message with the content and type URL of <paramref name="message"/>.</returns>
public static Any Pack(IMessage message) public static Any Pack(IMessage message)
{ {
Preconditions.CheckNotNull(message, "message"); ProtoPreconditions.CheckNotNull(message, "message");
return new Any { TypeUrl = GetTypeUrl(message.Descriptor), Value = message.ToByteString() }; return new Any { TypeUrl = GetTypeUrl(message.Descriptor), Value = message.ToByteString() };
} }
} }

10
csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
View File

@ -118,7 +118,7 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>The negated value of this duration.</returns> /// <returns>The negated value of this duration.</returns>
public static Duration operator -(Duration value) public static Duration operator -(Duration value)
{ {
Preconditions.CheckNotNull(value, "value"); ProtoPreconditions.CheckNotNull(value, "value");
checked checked
{ {
return Normalize(-value.Seconds, -value.Nanos); return Normalize(-value.Seconds, -value.Nanos);
@ -133,8 +133,8 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns></returns> /// <returns></returns>
public static Duration operator +(Duration lhs, Duration rhs) public static Duration operator +(Duration lhs, Duration rhs)
{ {
Preconditions.CheckNotNull(lhs, "lhs"); ProtoPreconditions.CheckNotNull(lhs, "lhs");
Preconditions.CheckNotNull(rhs, "rhs"); ProtoPreconditions.CheckNotNull(rhs, "rhs");
checked checked
{ {
return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos); return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos);
@ -149,8 +149,8 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>The difference between the two specified durations.</returns> /// <returns>The difference between the two specified durations.</returns>
public static Duration operator -(Duration lhs, Duration rhs) public static Duration operator -(Duration lhs, Duration rhs)
{ {
Preconditions.CheckNotNull(lhs, "lhs"); ProtoPreconditions.CheckNotNull(lhs, "lhs");
Preconditions.CheckNotNull(rhs, "rhs"); ProtoPreconditions.CheckNotNull(rhs, "rhs");
checked checked
{ {
return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos); return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos);

12
csharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs
View File

@ -59,8 +59,8 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>The difference between the two specified timestamps.</returns> /// <returns>The difference between the two specified timestamps.</returns>
public static Duration operator -(Timestamp lhs, Timestamp rhs) public static Duration operator -(Timestamp lhs, Timestamp rhs)
{ {
Preconditions.CheckNotNull(lhs, "lhs"); ProtoPreconditions.CheckNotNull(lhs, "lhs");
Preconditions.CheckNotNull(rhs, "rhs"); ProtoPreconditions.CheckNotNull(rhs, "rhs");
checked checked
{ {
return Duration.Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos); return Duration.Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos);
@ -75,8 +75,8 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>The result of adding the duration to the timestamp.</returns> /// <returns>The result of adding the duration to the timestamp.</returns>
public static Timestamp operator +(Timestamp lhs, Duration rhs) public static Timestamp operator +(Timestamp lhs, Duration rhs)
{ {
Preconditions.CheckNotNull(lhs, "lhs"); ProtoPreconditions.CheckNotNull(lhs, "lhs");
Preconditions.CheckNotNull(rhs, "rhs"); ProtoPreconditions.CheckNotNull(rhs, "rhs");
checked checked
{ {
return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos); return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos);
@ -91,8 +91,8 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>The result of subtracting the duration from the timestamp.</returns> /// <returns>The result of subtracting the duration from the timestamp.</returns>
public static Timestamp operator -(Timestamp lhs, Duration rhs) public static Timestamp operator -(Timestamp lhs, Duration rhs)
{ {
Preconditions.CheckNotNull(lhs, "lhs"); ProtoPreconditions.CheckNotNull(lhs, "lhs");
Preconditions.CheckNotNull(rhs, "rhs"); ProtoPreconditions.CheckNotNull(rhs, "rhs");
checked checked
{ {
return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos); return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos);

6
csharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs
View File

@ -41,7 +41,7 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>A newly-created Value message with the given value.</returns> /// <returns>A newly-created Value message with the given value.</returns>
public static Value ForString(string value) public static Value ForString(string value)
{ {
Preconditions.CheckNotNull(value, "value"); ProtoPreconditions.CheckNotNull(value, "value");
return new Value { StringValue = value }; return new Value { StringValue = value };
} }
@ -81,7 +81,7 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>A newly-created Value message an initial list value.</returns> /// <returns>A newly-created Value message an initial list value.</returns>
public static Value ForList(params Value[] values) public static Value ForList(params Value[] values)
{ {
Preconditions.CheckNotNull(values, "values"); ProtoPreconditions.CheckNotNull(values, "values");
return new Value { ListValue = new ListValue { Values = { values } } }; return new Value { ListValue = new ListValue { Values = { values } } };
} }
@ -92,7 +92,7 @@ namespace Google.Protobuf.WellKnownTypes
/// <returns>A newly-created Value message an initial struct value.</returns> /// <returns>A newly-created Value message an initial struct value.</returns>
public static Value ForStruct(Struct value) public static Value ForStruct(Struct value)
{ {
Preconditions.CheckNotNull(value, "value"); ProtoPreconditions.CheckNotNull(value, "value");
return new Value { StructValue = value }; return new Value { StructValue = value };
} }
} }

4
src/google/protobuf/compiler/csharp/csharp_primitive_field.cc
View File

@ -83,7 +83,7 @@ void PrimitiveFieldGenerator::GenerateMembers(io::Printer* printer) {
} else { } else {
printer->Print( printer->Print(
variables_, variables_,
" $name$_ = pb::Preconditions.CheckNotNull(value, \"value\");\n"); " $name$_ = pb::ProtoPreconditions.CheckNotNull(value, \"value\");\n");
} }
printer->Print( printer->Print(
" }\n" " }\n"
@ -186,7 +186,7 @@ void PrimitiveOneofFieldGenerator::GenerateMembers(io::Printer* printer) {
} else { } else {
printer->Print( printer->Print(
variables_, variables_,
" $oneof_name$_ = pb::Preconditions.CheckNotNull(value, \"value\");\n"); " $oneof_name$_ = pb::ProtoPreconditions.CheckNotNull(value, \"value\");\n");
} }
printer->Print( printer->Print(
variables_, variables_,