Editing samples: update to use service geodatabase (#683)

Rachael-E · Rachael Ellen · jenmerritt · web-flow · commit 8937c3676928 · 2022-04-13T12:33:22.000+01:00
* update add features sample

* update delete features sample

* update the update attributes and geometries sample

* update metadata

* Update editing/delete-features/src/main/java/com/esri/samples/delete_features/DeleteFeaturesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

* Update editing/delete-features/src/main/java/com/esri/samples/delete_features/DeleteFeaturesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

* Update editing/update-attributes/src/main/java/com/esri/samples/update_attributes/UpdateAttributesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

* Update editing/update-attributes/src/main/java/com/esri/samples/update_attributes/UpdateAttributesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

* Update editing/update-attributes/src/main/java/com/esri/samples/update_attributes/UpdateAttributesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

* Update editing/update-geometries/src/main/java/com/esri/samples/update_geometries/UpdateGeometriesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

* Update editing/update-geometries/src/main/java/com/esri/samples/update_geometries/UpdateGeometriesSample.java

Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;

Co-authored-by: Rachael Ellen &lt;rach9955@esri.com&gt;
Co-authored-by: Jen Merritt &lt;jmerritt@esri.com&gt;
diff --git a/editing/add-features/README.md b/editing/add-features/README.md
@@ -14,18 +14,20 @@ Click on a location on the map to add a feature at that location.
 
 ## How it works
 
-1. Create a `ServiceFeatureTable` from a URL.
-2. Create a `FeatureLayer` derived from the `ServiceFeatureTable` instance.
-3. Create a `Feature` with attributes and a location using the `ServiceFeatureTable`.
-4. Add the `Feature` to the `ServiceFeatureTable`.
-5. *Apply edits* to the `ServiceFeatureTable` which will upload the new feature to the online service.
+1. Create and load a `ServiceGeodatabase` with a feature service URL.
+2. Get the `ServiceFeatureTable` from the service geodatabase.
+3. Create a `FeatureLayer` from the service feature table.
+4. Create a `Feature` with attributes and a location using the `ServiceFeatureTable`.
+5. Add the `Feature` to the `ServiceFeatureTable`.
+6. Apply edits to the `ServiceGeodatabase` by calling `applyEditsAsync`, which will upload the new feature to the online service.
 
 ## Relevant API
 
 * Feature
 * FeatureEditResult
 * FeatureLayer
 * ServiceFeatureTable
+* ServiceGeodatabase
 
 ## Tags
 
diff --git a/editing/add-features/README.metadata.json b/editing/add-features/README.metadata.json
@@ -12,7 +12,8 @@
         "Feature",
         "FeatureEditResult",
         "FeatureLayer",
-        "ServiceFeatureTable"
+        "ServiceFeatureTable",
+        "ServiceGeodatabase"
     ],
     "redirect_from": [
         "/java/latest/sample-code/add-features.htm"
@@ -21,7 +22,8 @@
         "Feature",
         "FeatureEditResult",
         "FeatureLayer",
-        "ServiceFeatureTable"
+        "ServiceFeatureTable",
+        "ServiceGeodatabase"
     ],
     "snippets": [
         "src/main/java/com/esri/samples/add_features/AddFeaturesSample.java"
diff --git a/editing/add-features/src/main/java/com/esri/samples/add_features/AddFeaturesSample.java b/editing/add-features/src/main/java/com/esri/samples/add_features/AddFeaturesSample.java
@@ -34,8 +34,9 @@
 import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.concurrent.ListenableFuture;
 import com.esri.arcgisruntime.data.Feature;
-import com.esri.arcgisruntime.data.FeatureEditResult;
+import com.esri.arcgisruntime.data.FeatureTableEditResult;
 import com.esri.arcgisruntime.data.ServiceFeatureTable;
+import com.esri.arcgisruntime.data.ServiceGeodatabase;
 import com.esri.arcgisruntime.geometry.GeometryEngine;
 import com.esri.arcgisruntime.geometry.Point;
 import com.esri.arcgisruntime.layers.FeatureLayer;
@@ -51,7 +52,7 @@ public class AddFeaturesSample extends Application {
   private ServiceFeatureTable featureTable;
 
   private static final String SERVICE_LAYER_URL =
-      "https://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/FeatureServer/0";
+      "https://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/FeatureServer";
 
   @Override
   public void start(Stage stage) {
@@ -82,15 +83,21 @@ public void start(Stage stage) {
       // set a viewpoint on the map view
       mapView.setViewpoint(new Viewpoint(40, -95, 36978595));
 
-      // create service feature table from URL
-      featureTable = new ServiceFeatureTable(SERVICE_LAYER_URL);
+      // create a service geodatabase from the service layer url and load it
+      var serviceGeodatabase = new ServiceGeodatabase(SERVICE_LAYER_URL);
+      serviceGeodatabase.addDoneLoadingListener(() -> {
 
-      // create a feature layer from table
-      FeatureLayer featureLayer = new FeatureLayer(featureTable);
-
-      // add the layer to the ArcGISMap
-      map.getOperationalLayers().add(featureLayer);
+        // create service feature table from the service geodatabase's table first layer
+        featureTable = serviceGeodatabase.getTable(0);
 
+        // create a feature layer from table
+        var featureLayer = new FeatureLayer(featureTable);
+        
+        // add the layer to the ArcGISMap
+        map.getOperationalLayers().add(featureLayer);
+      });
+      serviceGeodatabase.loadAsync();
+      
       mapView.setOnMouseClicked(event -> {
         // check that the primary mouse button was clicked
         if (event.isStillSincePress() && event.getButton() == MouseButton.PRIMARY) {
@@ -152,16 +159,17 @@ private void addFeature(Point mapPoint, ServiceFeatureTable featureTable) {
   private void applyEdits(ServiceFeatureTable featureTable) {
 
     // apply the changes to the server
-    ListenableFuture<List<FeatureEditResult>> editResult = featureTable.applyEditsAsync();
+    ListenableFuture<List<FeatureTableEditResult>> editResult = featureTable.getServiceGeodatabase().applyEditsAsync();
     editResult.addDoneListener(() -> {
       try {
-        List<FeatureEditResult> edits = editResult.get();
+        List<FeatureTableEditResult> edits = editResult.get();
         // check if the server edit was successful
         if (edits != null && edits.size() > 0) {
-          if (!edits.get(0).hasCompletedWithErrors()) {
+          var featureEditResult = edits.get(0).getEditResult().get(0);
+          if (!featureEditResult.hasCompletedWithErrors()) {
             displayMessage(null, "Feature successfully added");
           } else {
-            throw edits.get(0).getError();
+            throw featureEditResult.getError();
           }
         }
       } catch (InterruptedException | ExecutionException e) {
diff --git a/editing/delete-features/README.md b/editing/delete-features/README.md
@@ -14,18 +14,20 @@ Click on a feature on the Map, then click the 'delete' button to delete.
 
 ## How it works
 
-1. Create a `ServiceFeatureTable` object from a URL.
-2. Create a `FeatureLayer` object from the `ServiceFeatureTable`.
-3. Select features from the `FeatureLayer` via `selectFeatures()`.
-4. Remove the selected features from the `ServiceFeatureTable` using `deleteFeaturesAsync()`.
-5. Update the table on the server using `applyEditsAsync()`.
+1. Create and load a `ServiceGeodatabase` with a feature service URL.
+2. Get the `ServiceFeatureTable` from the service geodatabase.
+3. Create a `FeatureLayer` from the service feature table.
+4. Identify the selected feature by using `identifyLayerAsync`.
+5. Remove the selected features from the `ServiceFeatureTable` using `deleteFeaturesAsync`.
+6. Update the data on the server using `applyEditsAsync` on the `ServiceGeodatabase`, which will remove the feature from the online service.
 
 ## Relevant API
 
 * Feature
 * FeatureLayer
 * ServiceFeatureTable
+* ServiceGeodatabase
 
 ## Tags
 
-deletion, feature, online, Service, table
+deletion, feature, online, service, table
diff --git a/editing/delete-features/README.metadata.json b/editing/delete-features/README.metadata.json
@@ -6,22 +6,24 @@
         "DeleteFeatures.gif"
     ],
     "keywords": [
-        "Service",
         "deletion",
         "feature",
         "online",
+        "service",
         "table",
         "Feature",
         "FeatureLayer",
-        "ServiceFeatureTable"
+        "ServiceFeatureTable",
+        "ServiceGeodatabase"
     ],
     "redirect_from": [
         "/java/latest/sample-code/delete-features.htm"
     ],
     "relevant_apis": [
         "Feature",
         "FeatureLayer",
-        "ServiceFeatureTable"
+        "ServiceFeatureTable",
+        "ServiceGeodatabase"
     ],
     "snippets": [
         "src/main/java/com/esri/samples/delete_features/DeleteFeaturesSample.java"
diff --git a/editing/delete-features/src/main/java/com/esri/samples/delete_features/DeleteFeaturesSample.java b/editing/delete-features/src/main/java/com/esri/samples/delete_features/DeleteFeaturesSample.java
@@ -36,9 +36,10 @@
 import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.concurrent.ListenableFuture;
 import com.esri.arcgisruntime.data.Feature;
-import com.esri.arcgisruntime.data.FeatureEditResult;
+import com.esri.arcgisruntime.data.FeatureTableEditResult;
 import com.esri.arcgisruntime.data.FeatureQueryResult;
 import com.esri.arcgisruntime.data.ServiceFeatureTable;
+import com.esri.arcgisruntime.data.ServiceGeodatabase;
 import com.esri.arcgisruntime.layers.FeatureLayer;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.BasemapStyle;
@@ -55,7 +56,7 @@ public class DeleteFeaturesSample extends Application {
   private ListenableFuture<FeatureQueryResult> selectionResult;
 
   private static final String FEATURE_LAYER_URL =
-      "https://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/FeatureServer/0";
+      "https://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/FeatureServer";
 
   @Override
   public void start(Stage stage) {
@@ -106,32 +107,48 @@ public void start(Stage stage) {
       // set a viewpoint on the map view
       mapView.setViewpoint(new Viewpoint(40, -95, 36978595));
 
-      // create service feature table from URL
-      featureTable = new ServiceFeatureTable(FEATURE_LAYER_URL);
+      // create a service geodatabase from the service layer url and load it
+      var serviceGeodatabase = new ServiceGeodatabase(FEATURE_LAYER_URL);
+      serviceGeodatabase.addDoneLoadingListener(() -> {
 
-      // create a feature layer from table
-      featureLayer = new FeatureLayer(featureTable);
+        // create a service feature table from the first layer on the service geodatabase's table
+        featureTable = serviceGeodatabase.getTable(0);
 
-      // add the layer to the ArcGISMap
-      map.getOperationalLayers().add(featureLayer);
+        // create a feature layer from the feature table
+        featureLayer = new FeatureLayer(featureTable);
+
+        // add the layer to the ArcGISMap
+        map.getOperationalLayers().add(featureLayer);
+      });
+      serviceGeodatabase.loadAsync();
 
       mapView.setOnMouseClicked(event -> {
         // check for primary or secondary mouse click
         if (event.isStillSincePress() && event.getButton() == MouseButton.PRIMARY) {
           // create a point from where the user clicked
           Point2D point = new Point2D(event.getX(), event.getY());
+
+          // clear any previous selection
+          featureLayer.clearSelection();
+          deleteButton.setDisable(true);
+          
           // identify the clicked feature
           ListenableFuture<IdentifyLayerResult> results = mapView.identifyLayerAsync(featureLayer, point, 1, false);
           results.addDoneListener(() -> {
             try {
               IdentifyLayerResult layer = results.get();
-              // search the layers for identified features
-              List<Feature> features = layer.getElements().stream().filter(g -> g instanceof Feature).map(
-                  g -> (Feature) g).collect(Collectors.toList());
-              // add the clicked feature to the selection
-              if (features.size() > 0) {
-                featureLayer.selectFeatures(features);
-                deleteButton.setDisable(false);
+              if (!layer.getElements().isEmpty()) {
+                // search the layers for identified features
+                List<Feature> features = layer.getElements()
+                  .stream()
+                  .filter(g -> g instanceof Feature)
+                  .map(g -> (Feature) g)
+                  .collect(Collectors.toList());
+                // add the clicked feature to the selection
+                if (features.size() > 0) {
+                  featureLayer.selectFeatures(features);
+                  deleteButton.setDisable(false);
+                }
               }
             } catch (InterruptedException | ExecutionException e) {
               displayMessage("Exception getting identify result", e.getCause().getMessage());
@@ -169,16 +186,18 @@ private void deleteFeatures(FeatureQueryResult features, ServiceFeatureTable fea
   private void applyEdits(ServiceFeatureTable featureTable) {
 
     // apply the changes to the server
-    ListenableFuture<List<FeatureEditResult>> editResult = featureTable.applyEditsAsync();
+    ListenableFuture<List<FeatureTableEditResult>> editResult = featureTable.getServiceGeodatabase().applyEditsAsync();
     editResult.addDoneListener(() -> {
       try {
-        List<FeatureEditResult> edits = editResult.get();
+        List<FeatureTableEditResult> edits = editResult.get();
         // check if the server edit was successful
         if (edits != null && edits.size() > 0) {
-          if (!edits.get(0).hasCompletedWithErrors()) {
+          var featureEditResult = edits.get(0).getEditResult().get(0);
+          if (!featureEditResult.hasCompletedWithErrors()) {
             displayMessage(null, "Feature successfully deleted");
+            deleteButton.setDisable(true);
           } else {
-            throw edits.get(0).getError();
+            throw featureEditResult.getError();
           }
         }
       } catch (InterruptedException | ExecutionException e) {
diff --git a/editing/update-attributes/README.md b/editing/update-attributes/README.md
@@ -14,18 +14,20 @@ To change the feature's damage property, click on the feature to select it, and
 
 ## How it works
 
-1. Create a `ServiceFeatureTable` object from a URL.
-2. Create a `FeatureLayer` object from the `ServiceFeatureTable`.
-3. Select features from the `FeatureLayer`.
-4. To update the feature's attribute, first load it, then use `.getAttributes().put(keyValuePair)` to modify the desired attribute.
-5. Update the feature table with `.updateFeatureAsync(feature)`.
-6. After a change, apply the changes on the service feature table using `.applyEditsAsync()`.
+1. Create and load a `ServiceGeodatabase` with a feature service URL.
+2. Get the `ServiceFeatureTable` from the service geodatabase.
+3. Create a `FeatureLayer` from the service feature table.
+4. Select features from the `FeatureLayer`.
+5. To update the feature's attribute, first load it, then use `.getAttributes().put(keyValuePair)` to modify the desired attribute.
+6. Update the feature table with `.updateFeatureAsync(feature)`.
+7. Apply edits to the `ServiceGeodatabase` by calling `applyEditsAsync`, which will update the feature on the online service.
 
 ## Relevant API
 
 * ArcGISFeature
 * FeatureLayer
 * ServiceFeatureTable
+* ServiceGeodatabase
 
 ## Tags
 
diff --git a/editing/update-attributes/README.metadata.json b/editing/update-attributes/README.metadata.json
@@ -16,15 +16,17 @@
         "value",
         "ArcGISFeature",
         "FeatureLayer",
-        "ServiceFeatureTable"
+        "ServiceFeatureTable",
+        "ServiceGeodatabase"
     ],
     "redirect_from": [
         "/java/latest/sample-code/update-attributes.htm"
     ],
     "relevant_apis": [
         "ArcGISFeature",
         "FeatureLayer",
-        "ServiceFeatureTable"
+        "ServiceFeatureTable",
+        "ServiceGeodatabase"
     ],
     "snippets": [
         "src/main/java/com/esri/samples/update_attributes/UpdateAttributesSample.java"
diff --git a/editing/update-attributes/src/main/java/com/esri/samples/update_attributes/UpdateAttributesSample.java b/editing/update-attributes/src/main/java/com/esri/samples/update_attributes/UpdateAttributesSample.java
diff --git a/editing/update-geometries/README.md b/editing/update-geometries/README.md
diff --git a/editing/update-geometries/README.metadata.json b/editing/update-geometries/README.metadata.json
diff --git a/editing/update-geometries/src/main/java/com/esri/samples/update_geometries/UpdateGeometriesSample.java b/editing/update-geometries/src/main/java/com/esri/samples/update_geometries/UpdateGeometriesSample.java
