aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Skeet <jonskeet@google.com>2015-07-30 13:50:02 +0100
committerJon Skeet <jonskeet@google.com>2015-07-30 13:50:02 +0100
commitd18cc0845606c32e01e044ae5411c7053b1c73ec (patch)
tree6e09e402e5422bc5959ec1032a9fb5b83f14d1e8
parent3980cf9df1ca9c66718f1fe9817011134f87bbcd (diff)
downloadprotobuf-d18cc0845606c32e01e044ae5411c7053b1c73ec.tar.gz
protobuf-d18cc0845606c32e01e044ae5411c7053b1c73ec.tar.bz2
protobuf-d18cc0845606c32e01e044ae5411c7053b1c73ec.zip
Generated code for previous commit.
-rw-r--r--csharp/src/AddressBook/Addressbook.cs6
-rw-r--r--csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs22
-rw-r--r--csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs52
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/Any.cs4
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/Api.cs10
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs2
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs2
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/Type.cs12
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs4
9 files changed, 57 insertions, 57 deletions
diff --git a/csharp/src/AddressBook/Addressbook.cs b/csharp/src/AddressBook/Addressbook.cs
index 92f983e7..25752e20 100644
--- a/csharp/src/AddressBook/Addressbook.cs
+++ b/csharp/src/AddressBook/Addressbook.cs
@@ -76,7 +76,7 @@ namespace Google.Protobuf.Examples.AddressBook {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -94,7 +94,7 @@ namespace Google.Protobuf.Examples.AddressBook {
public string Email {
get { return email_; }
set {
- email_ = value ?? "";
+ email_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -257,7 +257,7 @@ namespace Google.Protobuf.Examples.AddressBook {
public string Number {
get { return number_; }
set {
- number_ = value ?? "";
+ number_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
index 1f2e9229..e360ac15 100644
--- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
+++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
@@ -426,7 +426,7 @@ namespace Google.Protobuf.TestProtos {
public string SingleString {
get { return singleString_; }
set {
- singleString_ = value ?? "";
+ singleString_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -435,7 +435,7 @@ namespace Google.Protobuf.TestProtos {
public pb::ByteString SingleBytes {
get { return singleBytes_; }
set {
- singleBytes_ = value ?? pb::ByteString.Empty;
+ singleBytes_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -700,7 +700,7 @@ namespace Google.Protobuf.TestProtos {
public string OneofString {
get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString ? (string) oneofField_ : ""; }
set {
- oneofField_ = value ?? "";
+ oneofField_ = pb::Preconditions.CheckNotNull(value, "value");
oneofFieldCase_ = OneofFieldOneofCase.OneofString;
}
}
@@ -709,7 +709,7 @@ namespace Google.Protobuf.TestProtos {
public pb::ByteString OneofBytes {
get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
set {
- oneofField_ = value ?? pb::ByteString.Empty;
+ oneofField_ = pb::Preconditions.CheckNotNull(value, "value");
oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
}
}
@@ -2703,7 +2703,7 @@ namespace Google.Protobuf.TestProtos {
public string StringField {
get { return stringField_; }
set {
- stringField_ = value ?? "";
+ stringField_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2954,7 +2954,7 @@ namespace Google.Protobuf.TestProtos {
public string MyString {
get { return myString_; }
set {
- myString_ = value ?? "";
+ myString_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -3385,7 +3385,7 @@ namespace Google.Protobuf.TestProtos {
public string Data {
get { return data_; }
set {
- data_ = value ?? "";
+ data_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -3589,7 +3589,7 @@ namespace Google.Protobuf.TestProtos {
public pb::ByteString Data {
get { return data_; }
set {
- data_ = value ?? pb::ByteString.Empty;
+ data_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -3695,7 +3695,7 @@ namespace Google.Protobuf.TestProtos {
public pb::ByteString Data {
get { return data_; }
set {
- data_ = value ?? pb::ByteString.Empty;
+ data_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -4350,7 +4350,7 @@ namespace Google.Protobuf.TestProtos {
public string FooString {
get { return fooCase_ == FooOneofCase.FooString ? (string) foo_ : ""; }
set {
- foo_ = value ?? "";
+ foo_ = pb::Preconditions.CheckNotNull(value, "value");
fooCase_ = FooOneofCase.FooString;
}
}
@@ -5409,7 +5409,7 @@ namespace Google.Protobuf.TestProtos {
public string A {
get { return a_; }
set {
- a_ = value ?? "";
+ a_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs
index 213863e2..e40472cb 100644
--- a/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs
+++ b/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs
@@ -301,7 +301,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -310,7 +310,7 @@ namespace Google.Protobuf.Reflection {
internal string Package {
get { return package_; }
set {
- package_ = value ?? "";
+ package_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -393,7 +393,7 @@ namespace Google.Protobuf.Reflection {
internal string Syntax {
get { return syntax_; }
set {
- syntax_ = value ?? "";
+ syntax_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -649,7 +649,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1200,7 +1200,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1236,7 +1236,7 @@ namespace Google.Protobuf.Reflection {
internal string TypeName {
get { return typeName_; }
set {
- typeName_ = value ?? "";
+ typeName_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1245,7 +1245,7 @@ namespace Google.Protobuf.Reflection {
internal string Extendee {
get { return extendee_; }
set {
- extendee_ = value ?? "";
+ extendee_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1254,7 +1254,7 @@ namespace Google.Protobuf.Reflection {
internal string DefaultValue {
get { return defaultValue_; }
set {
- defaultValue_ = value ?? "";
+ defaultValue_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1545,7 +1545,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1653,7 +1653,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1809,7 +1809,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -1973,7 +1973,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2132,7 +2132,7 @@ namespace Google.Protobuf.Reflection {
internal string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2141,7 +2141,7 @@ namespace Google.Protobuf.Reflection {
internal string InputType {
get { return inputType_; }
set {
- inputType_ = value ?? "";
+ inputType_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2150,7 +2150,7 @@ namespace Google.Protobuf.Reflection {
internal string OutputType {
get { return outputType_; }
set {
- outputType_ = value ?? "";
+ outputType_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2383,7 +2383,7 @@ namespace Google.Protobuf.Reflection {
internal string JavaPackage {
get { return javaPackage_; }
set {
- javaPackage_ = value ?? "";
+ javaPackage_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2392,7 +2392,7 @@ namespace Google.Protobuf.Reflection {
internal string JavaOuterClassname {
get { return javaOuterClassname_; }
set {
- javaOuterClassname_ = value ?? "";
+ javaOuterClassname_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2437,7 +2437,7 @@ namespace Google.Protobuf.Reflection {
internal string GoPackage {
get { return goPackage_; }
set {
- goPackage_ = value ?? "";
+ goPackage_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2491,7 +2491,7 @@ namespace Google.Protobuf.Reflection {
internal string ObjcClassPrefix {
get { return objcClassPrefix_; }
set {
- objcClassPrefix_ = value ?? "";
+ objcClassPrefix_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -2500,7 +2500,7 @@ namespace Google.Protobuf.Reflection {
internal string CsharpNamespace {
get { return csharpNamespace_; }
set {
- csharpNamespace_ = value ?? "";
+ csharpNamespace_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -3853,7 +3853,7 @@ namespace Google.Protobuf.Reflection {
internal string IdentifierValue {
get { return identifierValue_; }
set {
- identifierValue_ = value ?? "";
+ identifierValue_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -3889,7 +3889,7 @@ namespace Google.Protobuf.Reflection {
internal pb::ByteString StringValue {
get { return stringValue_; }
set {
- stringValue_ = value ?? pb::ByteString.Empty;
+ stringValue_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -3898,7 +3898,7 @@ namespace Google.Protobuf.Reflection {
internal string AggregateValue {
get { return aggregateValue_; }
set {
- aggregateValue_ = value ?? "";
+ aggregateValue_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -4095,7 +4095,7 @@ namespace Google.Protobuf.Reflection {
internal string NamePart_ {
get { return namePart_; }
set {
- namePart_ = value ?? "";
+ namePart_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -4350,7 +4350,7 @@ namespace Google.Protobuf.Reflection {
internal string LeadingComments {
get { return leadingComments_; }
set {
- leadingComments_ = value ?? "";
+ leadingComments_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -4359,7 +4359,7 @@ namespace Google.Protobuf.Reflection {
internal string TrailingComments {
get { return trailingComments_; }
set {
- trailingComments_ = value ?? "";
+ trailingComments_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
index 86c8552f..93395871 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
@@ -71,7 +71,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string TypeUrl {
get { return typeUrl_; }
set {
- typeUrl_ = value ?? "";
+ typeUrl_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -80,7 +80,7 @@ namespace Google.Protobuf.WellKnownTypes {
public pb::ByteString Value {
get { return value_; }
set {
- value_ = value ?? pb::ByteString.Empty;
+ value_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
index a8d4942a..366bba21 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
@@ -84,7 +84,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -109,7 +109,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Version {
get { return version_; }
set {
- version_ = value ?? "";
+ version_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -285,7 +285,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -294,7 +294,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string RequestTypeUrl {
get { return requestTypeUrl_; }
set {
- requestTypeUrl_ = value ?? "";
+ requestTypeUrl_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -312,7 +312,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string ResponseTypeUrl {
get { return responseTypeUrl_; }
set {
- responseTypeUrl_ = value ?? "";
+ responseTypeUrl_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
index c86dbada..04fb6350 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
@@ -71,7 +71,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string FileName {
get { return fileName_; }
set {
- fileName_ = value ?? "";
+ fileName_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
index a4411dd0..15dd6dcd 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
@@ -224,7 +224,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string StringValue {
get { return kindCase_ == KindOneofCase.StringValue ? (string) kind_ : ""; }
set {
- kind_ = value ?? "";
+ kind_ = pb::Preconditions.CheckNotNull(value, "value");
kindCase_ = KindOneofCase.StringValue;
}
}
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
index 91ac0f6b..64142934 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
@@ -105,7 +105,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -327,7 +327,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -336,7 +336,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string TypeUrl {
get { return typeUrl_; }
set {
- typeUrl_ = value ?? "";
+ typeUrl_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -610,7 +610,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -783,7 +783,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -932,7 +932,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Name {
get { return name_; }
set {
- name_ = value ?? "";
+ name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
index a5f6b7e8..c9dd6ea6 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
@@ -822,7 +822,7 @@ namespace Google.Protobuf.WellKnownTypes {
public string Value {
get { return value_; }
set {
- value_ = value ?? "";
+ value_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
@@ -928,7 +928,7 @@ namespace Google.Protobuf.WellKnownTypes {
public pb::ByteString Value {
get { return value_; }
set {
- value_ = value ?? pb::ByteString.Empty;
+ value_ = pb::Preconditions.CheckNotNull(value, "value");
}
}