Fixing package name in AndroidListenerManifest.xml and ordering factory methods by corresponding proto field in AndroidService.java
git-svn-id: http://google-cache-invalidation-api.googlecode.com/svn/trunk@341 1cc9d426-c294-39be-ba72-c0199ca0f247
diff --git a/src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerManifest.xml b/src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerManifest.xml
index 06084f6..3783df2 100644
--- a/src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerManifest.xml
+++ b/src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerManifest.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2011 Google Inc. All Rights Reserved. -->
<!-- Manifest for AndroidListener. Must be merged with
- j/c/g/ipc/invalidation/external/client2/android2/AndroidManifest.xml. -->
+ j/c/g/ipc/invalidation/external/client/android2/AndroidManifest.xml. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.ipc.invalidation.external.client2.contrib">
+ package="com.google.ipc.invalidation.external.client.contrib">
<application>
<!-- Receiver for scheduler alarms. -->
<receiver android:exported="false"
- android:name="com.google.ipc.invalidation.external.client2.contrib.AndroidListener$AlarmReceiver"/>
+ android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"/>
</application>
</manifest>
diff --git a/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java b/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
index b85ee9c..0acdd52 100644
--- a/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
+++ b/src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java
@@ -291,6 +291,11 @@
return msg;
}
}
+ public static ClientDowncall createWithSerial(long serial,
+ com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version) {
+ return new ClientDowncall(serial, version, null, null, null, null);
+ }
+
public static ClientDowncall createWithStart(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
com.google.ipc.invalidation.ticl.proto.AndroidService.ClientDowncall.StartDowncall start) {
return new ClientDowncall(null, version, start, null, null, null);
@@ -301,19 +306,14 @@
return new ClientDowncall(null, version, null, stop, null, null);
}
- public static ClientDowncall createWithRegistrations(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
- com.google.ipc.invalidation.ticl.proto.AndroidService.ClientDowncall.RegistrationDowncall registrations) {
- return new ClientDowncall(null, version, null, null, null, registrations);
- }
-
public static ClientDowncall createWithAck(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
com.google.ipc.invalidation.ticl.proto.AndroidService.ClientDowncall.AckDowncall ack) {
return new ClientDowncall(null, version, null, null, ack, null);
}
- public static ClientDowncall createWithSerial(long serial,
- com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version) {
- return new ClientDowncall(serial, version, null, null, null, null);
+ public static ClientDowncall createWithRegistrations(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
+ com.google.ipc.invalidation.ticl.proto.AndroidService.ClientDowncall.RegistrationDowncall registrations) {
+ return new ClientDowncall(null, version, null, null, null, registrations);
}
private final long __hazzerBits;
@@ -355,14 +355,20 @@
this.registrations = registrations;
this.__hazzerBits = hazzerBits;
String existingOneOfField = null;
+ if (hasStop()) {
+ existingOneOfField = "stop";
+ }
if (hasStart()) {
+ if (existingOneOfField != null) {
+ oneOfViolation(existingOneOfField, "start");
+ }
existingOneOfField = "start";
}
- if (hasStop()) {
+ if (hasSerial()) {
if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "stop");
+ oneOfViolation(existingOneOfField, "serial");
}
- existingOneOfField = "stop";
+ existingOneOfField = "serial";
}
if (this.registrations != null) {
if (existingOneOfField != null) {
@@ -376,12 +382,6 @@
}
existingOneOfField = "ack";
}
- if (hasSerial()) {
- if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "serial");
- }
- existingOneOfField = "serial";
- }
if (existingOneOfField == null) { oneOfViolation(); }
}
@@ -707,16 +707,16 @@
return new InternalDowncall(version, serverMessage, null, null, null);
}
- public static InternalDowncall createWithNetworkAddrChange(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
- boolean networkAddrChange) {
- return new InternalDowncall(version, null, null, networkAddrChange, null);
- }
-
public static InternalDowncall createWithNetworkStatus(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
com.google.ipc.invalidation.ticl.proto.AndroidService.InternalDowncall.NetworkStatus networkStatus) {
return new InternalDowncall(version, null, networkStatus, null, null);
}
+ public static InternalDowncall createWithNetworkAddrChange(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
+ boolean networkAddrChange) {
+ return new InternalDowncall(version, null, null, networkAddrChange, null);
+ }
+
public static InternalDowncall createWithCreateClient(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
com.google.ipc.invalidation.ticl.proto.AndroidService.InternalDowncall.CreateClient createClient) {
return new InternalDowncall(version, null, null, null, createClient);
@@ -748,13 +748,7 @@
this.createClient = createClient;
this.__hazzerBits = hazzerBits;
String existingOneOfField = null;
- if (this.serverMessage != null) {
- existingOneOfField = "server_message";
- }
if (hasNetworkAddrChange()) {
- if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "network_addr_change");
- }
existingOneOfField = "network_addr_change";
}
if (this.networkStatus != null) {
@@ -769,6 +763,12 @@
}
existingOneOfField = "create_client";
}
+ if (this.serverMessage != null) {
+ if (existingOneOfField != null) {
+ oneOfViolation(existingOneOfField, "server_message");
+ }
+ existingOneOfField = "server_message";
+ }
if (existingOneOfField == null) { oneOfViolation(); }
}
@@ -925,16 +925,16 @@
return new InvalidateUpcall(ackHandle, invalidation, null, null);
}
- public static InvalidateUpcall createWithInvalidateAll(Bytes ackHandle,
- boolean invalidateAll) {
- return new InvalidateUpcall(ackHandle, null, null, invalidateAll);
- }
-
public static InvalidateUpcall createWithInvalidateUnknown(Bytes ackHandle,
com.google.ipc.invalidation.ticl.proto.ClientProtocol.ObjectIdP invalidateUnknown) {
return new InvalidateUpcall(ackHandle, null, invalidateUnknown, null);
}
+ public static InvalidateUpcall createWithInvalidateAll(Bytes ackHandle,
+ boolean invalidateAll) {
+ return new InvalidateUpcall(ackHandle, null, null, invalidateAll);
+ }
+
private final long __hazzerBits;
private final Bytes ackHandle;
private final com.google.ipc.invalidation.ticl.proto.ClientProtocol.InvalidationP invalidation;
@@ -958,7 +958,13 @@
}
this.__hazzerBits = hazzerBits;
String existingOneOfField = null;
+ if (this.invalidateUnknown != null) {
+ existingOneOfField = "invalidate_unknown";
+ }
if (this.invalidation != null) {
+ if (existingOneOfField != null) {
+ oneOfViolation(existingOneOfField, "invalidation");
+ }
existingOneOfField = "invalidation";
}
if (hasInvalidateAll()) {
@@ -967,12 +973,6 @@
}
existingOneOfField = "invalidate_all";
}
- if (this.invalidateUnknown != null) {
- if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "invalidate_unknown");
- }
- existingOneOfField = "invalidate_unknown";
- }
if (existingOneOfField == null) { oneOfViolation(); }
}
@@ -1361,9 +1361,9 @@
return msg;
}
}
- public static ListenerUpcall createWithRegistrationStatus(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
- com.google.ipc.invalidation.ticl.proto.AndroidService.ListenerUpcall.RegistrationStatusUpcall registrationStatus) {
- return new ListenerUpcall(null, version, null, null, registrationStatus, null, null, null);
+ public static ListenerUpcall createWithSerial(long serial,
+ com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version) {
+ return new ListenerUpcall(serial, version, null, null, null, null, null, null);
}
public static ListenerUpcall createWithReady(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
@@ -1376,6 +1376,16 @@
return new ListenerUpcall(null, version, null, invalidate, null, null, null, null);
}
+ public static ListenerUpcall createWithRegistrationStatus(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
+ com.google.ipc.invalidation.ticl.proto.AndroidService.ListenerUpcall.RegistrationStatusUpcall registrationStatus) {
+ return new ListenerUpcall(null, version, null, null, registrationStatus, null, null, null);
+ }
+
+ public static ListenerUpcall createWithRegistrationFailure(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
+ com.google.ipc.invalidation.ticl.proto.AndroidService.ListenerUpcall.RegistrationFailureUpcall registrationFailure) {
+ return new ListenerUpcall(null, version, null, null, null, registrationFailure, null, null);
+ }
+
public static ListenerUpcall createWithReissueRegistrations(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
com.google.ipc.invalidation.ticl.proto.AndroidService.ListenerUpcall.ReissueRegistrationsUpcall reissueRegistrations) {
return new ListenerUpcall(null, version, null, null, null, null, reissueRegistrations, null);
@@ -1386,16 +1396,6 @@
return new ListenerUpcall(null, version, null, null, null, null, null, error);
}
- public static ListenerUpcall createWithRegistrationFailure(com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version,
- com.google.ipc.invalidation.ticl.proto.AndroidService.ListenerUpcall.RegistrationFailureUpcall registrationFailure) {
- return new ListenerUpcall(null, version, null, null, null, registrationFailure, null, null);
- }
-
- public static ListenerUpcall createWithSerial(long serial,
- com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version) {
- return new ListenerUpcall(serial, version, null, null, null, null, null, null);
- }
-
private final long __hazzerBits;
private final long serial;
private final com.google.ipc.invalidation.ticl.proto.ClientProtocol.Version version;
@@ -1436,8 +1436,20 @@
this.error = error;
this.__hazzerBits = hazzerBits;
String existingOneOfField = null;
- if (this.registrationStatus != null) {
- existingOneOfField = "registration_status";
+ if (this.reissueRegistrations != null) {
+ existingOneOfField = "reissue_registrations";
+ }
+ if (hasSerial()) {
+ if (existingOneOfField != null) {
+ oneOfViolation(existingOneOfField, "serial");
+ }
+ existingOneOfField = "serial";
+ }
+ if (this.registrationFailure != null) {
+ if (existingOneOfField != null) {
+ oneOfViolation(existingOneOfField, "registration_failure");
+ }
+ existingOneOfField = "registration_failure";
}
if (hasReady()) {
if (existingOneOfField != null) {
@@ -1451,11 +1463,11 @@
}
existingOneOfField = "invalidate";
}
- if (this.reissueRegistrations != null) {
+ if (this.registrationStatus != null) {
if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "reissue_registrations");
+ oneOfViolation(existingOneOfField, "registration_status");
}
- existingOneOfField = "reissue_registrations";
+ existingOneOfField = "registration_status";
}
if (this.error != null) {
if (existingOneOfField != null) {
@@ -1463,18 +1475,6 @@
}
existingOneOfField = "error";
}
- if (this.registrationFailure != null) {
- if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "registration_failure");
- }
- existingOneOfField = "registration_failure";
- }
- if (hasSerial()) {
- if (existingOneOfField != null) {
- oneOfViolation(existingOneOfField, "serial");
- }
- existingOneOfField = "serial";
- }
if (existingOneOfField == null) { oneOfViolation(); }
}
