Bug 1081388: Add missing @OverRide annotations. r=rnewman

mobile/android/base/background/common/log/writers/AndroidLevelCachingLogWriter.java

@@ -90,36 +90,42 @@ public boolean shouldLogVerbose(String logTag) {
     return out;
   }
 
+  @Override
   public void error(String tag, String message, Throwable error) {
     if (shouldLogError(tag)) {
       inner.error(tag, message, error);
     }
   }
 
+  @Override
   public void warn(String tag, String message, Throwable error) {
     if (shouldLogWarn(tag)) {
       inner.warn(tag, message, error);
     }
   }
 
+  @Override
   public void info(String tag, String message, Throwable error) {
     if (shouldLogInfo(tag)) {
       inner.info(tag, message, error);
     }
   }
 
+  @Override
   public void debug(String tag, String message, Throwable error) {
     if (shouldLogDebug(tag)) {
       inner.debug(tag, message, error);
     }
   }
 
+  @Override
   public void trace(String tag, String message, Throwable error) {
     if (shouldLogVerbose(tag)) {
       inner.trace(tag, message, error);
     }
   }
 
+  @Override
   public void close() {
     inner.close();
   }

mobile/android/base/background/common/log/writers/AndroidLogWriter.java

@@ -15,26 +15,32 @@ public boolean shouldLogVerbose(String logTag) {
     return true;
   }
 
+  @Override
   public void error(String tag, String message, Throwable error) {
     Log.e(tag, message, error);
   }
 
+  @Override
   public void warn(String tag, String message, Throwable error) {
     Log.w(tag, message, error);
   }
 
+  @Override
   public void info(String tag, String message, Throwable error) {
     Log.i(tag, message, error);
   }
 
+  @Override
   public void debug(String tag, String message, Throwable error) {
     Log.d(tag, message, error);
   }
 
+  @Override
   public void trace(String tag, String message, Throwable error) {
     Log.v(tag, message, error);
   }
 
+  @Override
   public void close() {
   }
 }

mobile/android/base/background/common/log/writers/LevelFilteringLogWriter.java

@@ -20,6 +20,7 @@ public LevelFilteringLogWriter(int logLevel, LogWriter inner) {
     this.logLevel = logLevel;
   }
 
+  @Override
   public void close() {
     inner.close();
   }

mobile/android/base/background/common/log/writers/PrintLogWriter.java

@@ -64,6 +64,7 @@ public boolean shouldLogVerbose(String tag) {
     return true;
   }
 
+  @Override
   public void close() {
     if (closed) {
       return;

mobile/android/base/background/common/log/writers/SimpleTagLogWriter.java

@@ -14,6 +14,7 @@ public SimpleTagLogWriter(String tag, LogWriter inner) {
     this.tag = tag;
   }
 
+  @Override
   protected String getMainTag() {
     return tag;
   }

mobile/android/base/background/common/log/writers/StringLogWriter.java

@@ -25,26 +25,32 @@ public boolean shouldLogVerbose(String tag) {
     return true;
   }
 
+  @Override
   public void error(String tag, String message, Throwable error) {
     inner.error(tag, message, error);
   }
 
+  @Override
   public void warn(String tag, String message, Throwable error) {
     inner.warn(tag, message, error);
   }
 
+  @Override
   public void info(String tag, String message, Throwable error) {
     inner.info(tag, message, error);
   }
 
+  @Override
   public void debug(String tag, String message, Throwable error) {
     inner.debug(tag, message, error);
   }
 
+  @Override
   public void trace(String tag, String message, Throwable error) {
     inner.trace(tag, message, error);
   }
 
+  @Override
   public void close() {
     inner.close();
   }

mobile/android/base/background/fxa/QuickPasswordStretcher.java

@@ -19,6 +19,7 @@ public QuickPasswordStretcher(String password) {
     this.password = password;
   }
 
+  @Override
   public synchronized byte[] getQuickStretchedPW(byte[] emailUTF8) throws UnsupportedEncodingException, GeneralSecurityException {
     if (emailUTF8 == null) {
       throw new IllegalArgumentException("emailUTF8 must not be null");

mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java

@@ -1371,10 +1371,12 @@ public Cursor getEventsSince(long time) {
                     "date, environment, measurement_name, measurement_version, field_name");
   }
 
+  @Override
   public int getEventCount() {
     return getRowCount("events");
   }
 
+  @Override
   public int getEnvironmentCount() {
     return getRowCount("environments");
   }
@@ -1394,6 +1396,7 @@ private int getRowCount(String table) {
    * @param curEnv The ID of the current environment.
    * @return The number of environments and addon entries deleted.
    */
+  @Override
   public int deleteDataBefore(final long time, final int curEnv) {
     final SQLiteDatabase db = this.helper.getWritableDatabase();
     db.beginTransaction();
@@ -1598,6 +1601,7 @@ public void deleteMeasurements() {
    * Prunes the given number of least-recently used environments. Note that orphaned environments
    * are not removed and the environment cache is cleared.
    */
+  @Override
   public void pruneEnvironments(final int numToPrune) {
     final SQLiteDatabase db = this.helper.getWritableDatabase();
     db.beginTransaction();
@@ -1625,6 +1629,7 @@ public void pruneEnvironments(final int numToPrune) {
    * events reaches the given maximum. Note that this technicality means this method cannot be
    * used to delete all events.
    */
+  @Override
   public void pruneEvents(final int maxNumToPrune) {
     final SQLiteDatabase db = this.helper.getWritableDatabase();
 

mobile/android/base/background/healthreport/prune/PrunePolicyDatabaseStorage.java

@@ -41,10 +41,12 @@ public PrunePolicyDatabaseStorage(final Context context, final String profilePat
     this.currentEnvironmentID = -1;
   }
 
+  @Override
   public void pruneEvents(final int count) {
     getStorage().pruneEvents(count);
   }
 
+  @Override
   public void pruneEnvironments(final int count) {
     getStorage().pruneEnvironments(count);
 
@@ -59,25 +61,30 @@ public void pruneEnvironments(final int count) {
    * current environment from the profile cache, it will not delete data so be sure to prune by
    * other methods (e.g. {@link pruneEvents}) as well.
    */
+  @Override
   public int deleteDataBefore(final long time) {
     return getStorage().deleteDataBefore(time, getCurrentEnvironmentID());
   }
 
+  @Override
   public void cleanup() {
     final HealthReportDatabaseStorage storage = getStorage();
     // The change to auto_vacuum will only take affect after a vacuum.
     storage.disableAutoVacuuming();
     storage.vacuum();
   }
 
+  @Override
   public int getEventCount() {
     return getStorage().getEventCount();
   }
 
+  @Override
   public int getEnvironmentCount() {
     return getStorage().getEnvironmentCount();
   }
 
+  @Override
   public void close() {
     if (client != null) {
       client.release();

mobile/android/base/sync/CredentialException.java

@@ -21,6 +21,7 @@ public CredentialException(final Throwable e) {
     super(e);
   }
 
+  @Override
   public void updateStats(GlobalSession globalSession, SyncResult syncResult) {
     syncResult.stats.numAuthExceptions += 1;
   }

mobile/android/base/sync/JSONRecordFetcher.java

@@ -46,10 +46,12 @@ public AuthHeaderProvider getAuthHeaderProvider() {
       return authHeaderProvider;
     }
 
+    @Override
     public String ifUnmodifiedSince() {
       return null;
     }
 
+    @Override
     public void handleRequestSuccess(SyncStorageResponse response) {
       if (response.wasSuccessful()) {
         try {

mobile/android/base/sync/MetaGlobal.java

@@ -325,10 +325,12 @@ public AuthHeaderProvider getAuthHeaderProvider() {
     return authHeaderProvider;
   }
 
+  @Override
   public String ifUnmodifiedSince() {
     return null;
   }
 
+  @Override
   public void handleRequestSuccess(SyncStorageResponse response) {
     if (this.isUploading) {
       this.handleUploadSuccess(response);
@@ -355,6 +357,7 @@ private void handleDownloadSuccess(SyncStorageResponse response) {
     this.callback.handleFailure(response);
   }
 
+  @Override
   public void handleRequestFailure(SyncStorageResponse response) {
     if (response.getStatusCode() == 404) {
       this.callback.handleMissing(this, response);
@@ -363,6 +366,7 @@ public void handleRequestFailure(SyncStorageResponse response) {
     this.callback.handleFailure(response);
   }
 
+  @Override
   public void handleRequestError(Exception e) {
     this.callback.handleError(e);
   }

mobile/android/base/sync/SyncConfiguration.java

@@ -37,6 +37,7 @@ public EditorBranch(SyncConfiguration config, String prefix) {
       this.editor = config.getEditor();
     }
 
+    @Override
     public void apply() {
       // Android <=r8 SharedPreferences.Editor does not contain apply() for overriding.
       this.editor.commit();
@@ -85,6 +86,7 @@ public Editor putString(String key, String value) {
 
     // Not marking as Override, because Android <= 10 doesn't have
     // putStringSet. Neither can we implement it.
+    @Override
     public Editor putStringSet(String key, Set<String> value) {
       throw new RuntimeException("putStringSet not available.");
     }
@@ -160,6 +162,7 @@ public String getString(String key, String defValue) {
 
     // Not marking as Override, because Android <= 10 doesn't have
     // getStringSet. Neither can we implement it.
+    @Override
     public Set<String> getStringSet(String key, Set<String> defValue) {
       throw new RuntimeException("getStringSet not available.");
     }

mobile/android/base/sync/middleware/Crypto5MiddlewareRepository.java

@@ -33,6 +33,8 @@ public Crypto5MiddlewareRepositorySessionCreationDelegate(Crypto5MiddlewareRepos
       this.repository = repository;
       this.outerDelegate = outerDelegate;
     }
+
+    @Override
     public void onSessionCreateFailed(Exception ex) {
       this.outerDelegate.onSessionCreateFailed(ex);
     }

mobile/android/base/sync/middleware/MiddlewareRepositorySession.java

@@ -75,6 +75,7 @@ public RepositorySessionBeginDelegate deferredBeginDelegate(ExecutorService exec
     }
   }
 
+  @Override
   public void begin(RepositorySessionBeginDelegate delegate) throws InvalidSessionTransitionException {
     inner.begin(new MiddlewareRepositorySessionBeginDelegate(this, delegate));
   }

mobile/android/base/sync/repositories/android/AndroidBrowserRepository.java

@@ -38,6 +38,7 @@ public CleanThread(RepositorySessionCleanDelegate delegate, Context context) {
       this.context = context;
     }
 
+    @Override
     public void run() {
       try {
         getDataAccessor(context).purgeDeleted();
@@ -67,6 +68,7 @@ public CreateSessionThread(RepositorySessionCreationDelegate delegate, Context c
       this.context = context;
     }
 
+    @Override
     public void run() {
       sessionCreator(delegate, context);
     }

mobile/android/base/sync/repositories/android/CachedSQLiteOpenHelper.java

@@ -41,6 +41,7 @@ synchronized protected SQLiteDatabase getCachedWritableDatabase() {
     return writableDatabase;
   }
 
+  @Override
   synchronized public void close() {
     if (readableDatabase != null) {
       readableDatabase.close();

mobile/android/base/sync/setup/activities/AccountActivity.java

@@ -188,6 +188,7 @@ public void onClick(View v) {
         cancelConnectHandler(v);
         // Set cancel click handler to leave account setup.
         cancelButton.setOnClickListener(new OnClickListener() {
+          @Override
           public void onClick(View v) {
             cancelClickHandler(v);
           }

mobile/android/base/sync/stage/AbstractNonRepositorySyncStage.java

@@ -19,6 +19,7 @@ protected void wipeLocal() {
     // Do nothing.
   }
 
+  @Override
   public Integer getStorageVersion() {
     return null; // Never include these engines in any meta/global records.
   }

mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java

@@ -27,6 +27,7 @@ public ServerLocalSynchronizerSession(Synchronizer synchronizer, SynchronizerSes
     super(synchronizer, delegate);
   }
 
+  @Override
   public void onFirstFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
     // Fetch failures always abort.
     int numRemoteFetchFailed = recordsChannel.getFetchFailureCount();
@@ -50,6 +51,7 @@ public void onFirstFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, l
     super.onFirstFlowCompleted(recordsChannel, fetchEnd, storeEnd);
   }
 
+  @Override
   public void onSecondFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
     // Fetch failures always abort.
     int numLocalFetchFailed = recordsChannel.getFetchFailureCount();

mobile/android/base/sync/synchronizer/SynchronizerSession.java

@@ -158,6 +158,7 @@ public synchronized void synchronize() {
 
     // This is the delegate for the *first* flow.
     RecordsChannelDelegate channelAToBDelegate = new RecordsChannelDelegate() {
+      @Override
       public void onFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
         session.onFirstFlowCompleted(recordsChannel, fetchEnd, storeEnd);
       }