MLKit breaking changes

Change-Id: Id62245a0bb7d56a1c8909eee1a3c298516756b42

Author: samtstern

mlkit/app/src/main/java/com/google/firebase/example/mlkit/CustomModelActivity.java

@@ -10,10 +10,10 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.ml.common.FirebaseMLException;
-import com.google.firebase.ml.common.modeldownload.FirebaseCloudModelSource;
-import com.google.firebase.ml.common.modeldownload.FirebaseLocalModelSource;
+import com.google.firebase.ml.common.modeldownload.FirebaseLocalModel;
 import com.google.firebase.ml.common.modeldownload.FirebaseModelDownloadConditions;
 import com.google.firebase.ml.common.modeldownload.FirebaseModelManager;
+import com.google.firebase.ml.common.modeldownload.FirebaseRemoteModel;
 import com.google.firebase.ml.custom.FirebaseModelDataType;
 import com.google.firebase.ml.custom.FirebaseModelInputOutputOptions;
 import com.google.firebase.ml.custom.FirebaseModelInputs;
@@ -39,31 +39,31 @@ private void configureHostedModelSource() {
         }
         FirebaseModelDownloadConditions conditions = conditionsBuilder.build();
 
-        // Build a FirebaseCloudModelSource object by specifying the name you assigned the model
+        // Build a remote model source object by specifying the name you assigned the model
         // when you uploaded it in the Firebase console.
-        FirebaseCloudModelSource cloudSource = new FirebaseCloudModelSource.Builder("my_cloud_model")
+        FirebaseRemoteModel cloudSource = new FirebaseRemoteModel.Builder("my_cloud_model")
                 .enableModelUpdates(true)
                 .setInitialDownloadConditions(conditions)
                 .setUpdatesDownloadConditions(conditions)
                 .build();
-        FirebaseModelManager.getInstance().registerCloudModelSource(cloudSource);
+        FirebaseModelManager.getInstance().registerRemoteModel(cloudSource);
         // [END mlkit_cloud_model_source]
     }
 
     private void configureLocalModelSource() {
         // [START mlkit_local_model_source]
-        FirebaseLocalModelSource localSource =
-                new FirebaseLocalModelSource.Builder("my_local_model")  // Assign a name to this model
+        FirebaseLocalModel localSource =
+                new FirebaseLocalModel.Builder("my_local_model")  // Assign a name to this model
                         .setAssetFilePath("my_model.tflite")
                         .build();
-        FirebaseModelManager.getInstance().registerLocalModelSource(localSource);
+        FirebaseModelManager.getInstance().registerLocalModel(localSource);
         // [END mlkit_local_model_source]
     }
 
     private FirebaseModelInterpreter createInterpreter() throws FirebaseMLException {
         // [START mlkit_create_interpreter]
         FirebaseModelOptions options = new FirebaseModelOptions.Builder()
-                .setCloudModelName("my_cloud_model")
+                .setRemoteModelName("my_cloud_model")
                 .setLocalModelName("my_local_model")
                 .build();
         FirebaseModelInterpreter firebaseInterpreter =

mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/CustomModelActivity.kt

@@ -9,10 +9,10 @@ import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import com.google.android.gms.tasks.OnFailureListener
 import com.google.firebase.ml.common.FirebaseMLException
-import com.google.firebase.ml.common.modeldownload.FirebaseCloudModelSource
-import com.google.firebase.ml.common.modeldownload.FirebaseLocalModelSource
+import com.google.firebase.ml.common.modeldownload.FirebaseLocalModel
 import com.google.firebase.ml.common.modeldownload.FirebaseModelDownloadConditions
 import com.google.firebase.ml.common.modeldownload.FirebaseModelManager
+import com.google.firebase.ml.common.modeldownload.FirebaseRemoteModel
 import com.google.firebase.ml.custom.FirebaseModelDataType
 import com.google.firebase.ml.custom.FirebaseModelInputOutputOptions
 import com.google.firebase.ml.custom.FirebaseModelInputs
@@ -42,31 +42,31 @@ class CustomModelActivity : AppCompatActivity() {
         }
         val conditions = conditionsBuilder.build()
 
-        // Build a FirebaseCloudModelSource object by specifying the name you assigned the model
+        // Build a remote model object by specifying the name you assigned the model
         // when you uploaded it in the Firebase console.
-        val cloudSource = FirebaseCloudModelSource.Builder("my_cloud_model")
+        val cloudSource = FirebaseRemoteModel.Builder("my_cloud_model")
                 .enableModelUpdates(true)
                 .setInitialDownloadConditions(conditions)
                 .setUpdatesDownloadConditions(conditions)
                 .build()
-        FirebaseModelManager.getInstance().registerCloudModelSource(cloudSource)
+        FirebaseModelManager.getInstance().registerRemoteModel(cloudSource)
         // [END mlkit_cloud_model_source]
     }
 
     private fun configureLocalModelSource() {
         // [START mlkit_local_model_source]
-        val localSource = FirebaseLocalModelSource.Builder("my_local_model") // Assign a name to this model
+        val localSource = FirebaseLocalModel.Builder("my_local_model") // Assign a name to this model
                 .setAssetFilePath("my_model.tflite")
                 .build()
-        FirebaseModelManager.getInstance().registerLocalModelSource(localSource)
+        FirebaseModelManager.getInstance().registerLocalModel(localSource)
         // [END mlkit_local_model_source]
     }
 
     @Throws(FirebaseMLException::class)
     private fun createInterpreter(): FirebaseModelInterpreter? {
         // [START mlkit_create_interpreter]
         val options = FirebaseModelOptions.Builder()
-                .setCloudModelName("my_cloud_model")
+                .setRemoteModelName("my_cloud_model")
                 .setLocalModelName("my_local_model")
                 .build()
         val interpreter = FirebaseModelInterpreter.getInstance(options)