Roll cacheinvalidation to 20150720

third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java

Index: third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
index 0acdd52ed4842eb41b18d58b9b4f3e694b80054b..2f59c1f48bf911ad64d335e68a435e29e2817046 100644
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
@@ -355,20 +355,14 @@ public interface AndroidService {
       this.registrations = registrations;
       this.__hazzerBits = hazzerBits;
       String existingOneOfField = null;
-      if (hasStop()) {
-        existingOneOfField = "stop";
-      }
-      if (hasStart()) {
-        if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "start");
-        }
-        existingOneOfField = "start";
-      }
       if (hasSerial()) {
+        existingOneOfField = "serial";
+      }
+      if (this.ack != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "serial");
+          oneOfViolation(existingOneOfField, "ack");
         }
-        existingOneOfField = "serial";
+        existingOneOfField = "ack";
       }
       if (this.registrations != null) {
         if (existingOneOfField != null) {
@@ -376,11 +370,17 @@ public interface AndroidService {
         }
         existingOneOfField = "registrations";
       }
-      if (this.ack != null) {
+      if (hasStart()) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "ack");
+          oneOfViolation(existingOneOfField, "start");
         }
-        existingOneOfField = "ack";
+        existingOneOfField = "start";
+      }
+      if (hasStop()) {
+        if (existingOneOfField != null) {
+          oneOfViolation(existingOneOfField, "stop");
+        }
+        existingOneOfField = "stop";
       }
       if (existingOneOfField == null) { oneOfViolation(); }
     }
@@ -748,26 +748,26 @@ public interface AndroidService {
       this.createClient = createClient;
       this.__hazzerBits = hazzerBits;
       String existingOneOfField = null;
-      if (hasNetworkAddrChange()) {
-        existingOneOfField = "network_addr_change";
-      }
       if (this.networkStatus != null) {
+        existingOneOfField = "network_status";
+      }
+      if (this.serverMessage != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "network_status");
+          oneOfViolation(existingOneOfField, "server_message");
         }
-        existingOneOfField = "network_status";
+        existingOneOfField = "server_message";
       }
-      if (this.createClient != null) {
+      if (hasNetworkAddrChange()) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "create_client");
+          oneOfViolation(existingOneOfField, "network_addr_change");
         }
-        existingOneOfField = "create_client";
+        existingOneOfField = "network_addr_change";
       }
-      if (this.serverMessage != null) {
+      if (this.createClient != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "server_message");
+          oneOfViolation(existingOneOfField, "create_client");
         }
-        existingOneOfField = "server_message";
+        existingOneOfField = "create_client";
       }
       if (existingOneOfField == null) { oneOfViolation(); }
     }
@@ -958,7 +958,13 @@ public interface AndroidService {
         }
         this.__hazzerBits = hazzerBits;
         String existingOneOfField = null;
+        if (hasInvalidateAll()) {
+          existingOneOfField = "invalidate_all";
+        }
         if (this.invalidateUnknown != null) {
+          if (existingOneOfField != null) {
+            oneOfViolation(existingOneOfField, "invalidate_unknown");
+          }
           existingOneOfField = "invalidate_unknown";
         }
         if (this.invalidation != null) {
@@ -967,12 +973,6 @@ public interface AndroidService {
           }
           existingOneOfField = "invalidation";
         }
-        if (hasInvalidateAll()) {
-          if (existingOneOfField != null) {
-            oneOfViolation(existingOneOfField, "invalidate_all");
-          }
-          existingOneOfField = "invalidate_all";
-        }
         if (existingOneOfField == null) { oneOfViolation(); }
       }
 
@@ -1436,20 +1436,20 @@ public interface AndroidService {
       this.error = error;
       this.__hazzerBits = hazzerBits;
       String existingOneOfField = null;
-      if (this.reissueRegistrations != null) {
-        existingOneOfField = "reissue_registrations";
-      }
       if (hasSerial()) {
+        existingOneOfField = "serial";
+      }
+      if (this.error != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "serial");
+          oneOfViolation(existingOneOfField, "error");
         }
-        existingOneOfField = "serial";
+        existingOneOfField = "error";
       }
-      if (this.registrationFailure != null) {
+      if (this.invalidate != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "registration_failure");
+          oneOfViolation(existingOneOfField, "invalidate");
         }
-        existingOneOfField = "registration_failure";
+        existingOneOfField = "invalidate";
       }
       if (hasReady()) {
         if (existingOneOfField != null) {
@@ -1457,11 +1457,11 @@ public interface AndroidService {
         }
         existingOneOfField = "ready";
       }
-      if (this.invalidate != null) {
+      if (this.registrationFailure != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "invalidate");
+          oneOfViolation(existingOneOfField, "registration_failure");
         }
-        existingOneOfField = "invalidate";
+        existingOneOfField = "registration_failure";
       }
       if (this.registrationStatus != null) {
         if (existingOneOfField != null) {
@@ -1469,11 +1469,11 @@ public interface AndroidService {
         }
         existingOneOfField = "registration_status";
       }
-      if (this.error != null) {
+      if (this.reissueRegistrations != null) {
         if (existingOneOfField != null) {
-          oneOfViolation(existingOneOfField, "error");
+          oneOfViolation(existingOneOfField, "reissue_registrations");
         }
-        existingOneOfField = "error";
+        existingOneOfField = "reissue_registrations";
       }
       if (existingOneOfField == null) { oneOfViolation(); }
     }