SS7 upgrade: required amendments to samples (#615)

* Edit with branch versioning - update Controller and README

* Configure subnetwork trace: update service URL and add authentication

* Display utility assocations - update service URL and authentication

* Perform valve isolation trace - update service URL and authentication

* Trace a utility network - update service URL and authentication

* Display subtype feature layer - update service URL and authentication

* Trace a utility network - amend feature tables

* bring url onto one line

* update markdown

Co-authored-by: Rachael Ellen <[email protected]>

Author: jenmerritt

editing/edit-with-branch-versioning/README.md

@@ -40,7 +40,7 @@ Click the "Switch version" button in the top left corner to switch back and fort
 
 ## About the data
 
-The feature layer used in this sample is [Damage to commercial buildings](https://sampleserver7.arcgisonline.com/arcgis/rest/services/DamageAssessment/FeatureServer/0) located in Naperville, Illinois.
+The feature layer used in this sample is [Damage to commercial buildings](https://sampleserver7.arcgisonline.com/server/rest/services/DamageAssessment/FeatureServer/0) located in Naperville, Illinois.
 
 ## Additional information
 

editing/edit-with-branch-versioning/src/main/java/com/esri/samples/edit_with_branch_versioning/EditWithBranchVersioningController.java

@@ -99,10 +99,10 @@ public void initialize() {
 
       // create a service geodatabase
       serviceGeodatabase = new ServiceGeodatabase("https://sampleserver7.arcgisonline" +
-        ".com/arcgis/rest/services/DamageAssessment/FeatureServer");
+        ".com/server/rest/services/DamageAssessment/FeatureServer");
 
       // set the user credentials required to authenticate with the service geodatabase
-      UserCredential userCredential = new UserCredential("editor01", "editor01.password");
+      UserCredential userCredential = new UserCredential("editor01", "S7#i2LWmYH75");
       serviceGeodatabase.setCredential(userCredential);
 
       // load the service geodatabase

feature_layers/display-subtype-feature-layer/README.md

@@ -20,7 +20,7 @@ The sample loads with the sublayer visible on the map. Toggle its visibility wit
 4. Set the visibility status using this sublayer's `IsVisible` property.
 5. Change the sublayer's symbology with `.setRenderer(Renderer)`.
 6. Update the sublayer's minimum scale value with `.setMinScale()`.
- 
+
 ## Relevant API
 
 * LabelDefinition
@@ -30,7 +30,7 @@ The sample loads with the sublayer visible on the map. Toggle its visibility wit
 
 ## About the data
 
-The [feature service layer](https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer/100) in this sample represents an electric network in Naperville, Illinois, which contains a utility network with asset classification for different devices.
+The [feature service layer](https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer/) in this sample represents an electric network in Naperville, Illinois, which contains a utility network with asset classification for different devices.
 
 ## Tags
 

feature_layers/display-subtype-feature-layer/src/main/java/com/esri/samples/display_subtype_feature_layer/DisplaySubtypeFeatureLayerController.java

@@ -30,17 +30,19 @@
 import com.esri.arcgisruntime.geometry.SpatialReferences;
 import com.esri.arcgisruntime.layers.SubtypeFeatureLayer;
 import com.esri.arcgisruntime.layers.SubtypeSublayer;
+import com.esri.arcgisruntime.loadable.LoadStatus;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.BasemapStyle;
 import com.esri.arcgisruntime.mapping.Viewpoint;
 import com.esri.arcgisruntime.mapping.view.MapView;
+import com.esri.arcgisruntime.security.UserCredential;
 import com.esri.arcgisruntime.symbology.Renderer;
 import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol;
 import com.esri.arcgisruntime.symbology.SimpleRenderer;
 import com.esri.arcgisruntime.symbology.Symbol;
 
 public class DisplaySubtypeFeatureLayerController {
-  
+
   @FXML private MapView mapView;
   @FXML private Label currentMapScaleLabel;
   @FXML private Label minScaleLabel;
@@ -61,21 +63,26 @@ public void initialize() {
       // create a map with the streets night basemap style and add it to the map view
       ArcGISMap map = new ArcGISMap(BasemapStyle.ARCGIS_STREETS_NIGHT);
       mapView.setMap(map);
-      // display the current map scale 
+      // display the current map scale
       mapView.addMapScaleChangedListener(mapScaleChangedEvent ->
         currentMapScaleLabel.setText("Current map scale: 1:" + Math.round(mapView.getMapScale())));
-      
+
       // set a viewpoint on the map view, to Naperville, Illinois
       Viewpoint initialViewpoint = new Viewpoint(new Envelope(-9812691.11079696, 5128687.20710657,
         -9812377.9447607, 5128865.36767282, SpatialReferences.getWebMercator()));
       mapView.setViewpoint(initialViewpoint);
 
       // create a subtype feature layer from the service feature table, and add it to the map
-      ServiceFeatureTable serviceFeatureTable = new ServiceFeatureTable("https://sampleserver7.arcgisonline" +
-        ".com/arcgis/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer/100");
+      ServiceFeatureTable serviceFeatureTable = new ServiceFeatureTable(
+        "https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer/0");
+
+      // set user credentials to authenticate with the service
+      UserCredential userCredential = new UserCredential("viewer01", "I68VGU^nMurF");
+      serviceFeatureTable.setCredential(userCredential);
+
       SubtypeFeatureLayer subtypeFeatureLayer = new SubtypeFeatureLayer(serviceFeatureTable);
       map.getOperationalLayers().add(subtypeFeatureLayer);
-      
+
       // access the json required for sublayer label definitions
       final String json = IOUtils.toString(getClass().getResourceAsStream("/display_subtype_feature_layer/label_definition.json"), StandardCharsets.UTF_8);
 
@@ -84,7 +91,7 @@ public void initialize() {
       subtypeFeatureLayer.addDoneLoadingListener(() -> {
         // show the UI for interaction with the sublayer once it has loaded
         vBox.setVisible(true);
-        
+
         // get the Street Light sublayer and define its labels
         sublayer = subtypeFeatureLayer.getSublayerWithSubtypeName("Street Light");
         sublayer.setLabelsEnabled(true);
@@ -117,11 +124,11 @@ private void handleMinScaleButtonClicked() {
    */
   @FXML
   private void handleSublayerVisibility() {
-      sublayer.setVisible(sublayerVisibilityCheckbox.isSelected());
+    sublayer.setVisible(sublayerVisibilityCheckbox.isSelected());
   }
-  
+
   /**
-   * Sets the renderer of the sublayer to its original format (a white and black circular icon). 
+   * Sets the renderer of the sublayer to its original format (a white and black circular icon).
    */
   @FXML
   private void handleOriginalRendererButtonClicked() {
@@ -135,7 +142,7 @@ private void handleOriginalRendererButtonClicked() {
   private void handleAlternativeRendererButtonClicked() {
     sublayer.setRenderer(alternativeRenderer);
   }
-  
+
   /**
    * Disposes application resources.
    */

utility_network/configure-subnetwork-trace/README.md

@@ -31,7 +31,6 @@ Example barrier conditions for the default dataset:
 9. Display the count of elements returned within the `UtilityElementTraceResult`.
 10. When the 'Reset' button is clicked, set the trace configurations expression back to its original value.
 
-
 ## Relevant API
 
 * CodedValueDomain
@@ -63,8 +62,8 @@ Example barrier conditions for the default dataset:
 
 ## About the data
 
-The [feature service](https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer) in this sample represents an electric network in Naperville, Illinois, which contains a utility network used to run the subnetwork-based trace.
+The [feature service](https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer) in this sample represents an electric network in Naperville, Illinois, which contains a utility network used to run the subnetwork-based trace.
 
 ## Tags
 
-category comparison, condition barriers, network analysis, network attribute comparison, trace configuration, traversability, utility network, validate consistency, subnetwork trace
+category comparison, condition barriers, network analysis, network attribute comparison, subnetwork trace, trace configuration, traversability, utility network, validate consistency

utility_network/configure-subnetwork-trace/src/main/java/com/esri/samples/configure_subnetwork_trace/ConfigureSubnetworkTraceController.java

@@ -32,6 +32,7 @@
 import com.esri.arcgisruntime.data.CodedValue;
 import com.esri.arcgisruntime.data.CodedValueDomain;
 import com.esri.arcgisruntime.loadable.LoadStatus;
+import com.esri.arcgisruntime.security.UserCredential;
 import com.esri.arcgisruntime.utilitynetworks.UtilityAssetGroup;
 import com.esri.arcgisruntime.utilitynetworks.UtilityAssetType;
 import com.esri.arcgisruntime.utilitynetworks.UtilityAttributeComparisonOperator;
@@ -87,8 +88,14 @@ public void initialize() {
 
       // load the utility network
       utilityNetwork = new UtilityNetwork(
-          "https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleElectric" +
+          "https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric" +
               "/FeatureServer");
+
+      // set user credentials to authenticate with the service
+      // NOTE: a licensed user is required to perform utility network operations
+      UserCredential userCredential = new UserCredential("viewer01", "I68VGU^nMurF");
+      utilityNetwork.setCredential(userCredential);
+
       utilityNetwork.loadAsync();
       utilityNetwork.addDoneLoadingListener(() -> {
         if (utilityNetwork.getLoadStatus() == LoadStatus.LOADED) {

utility_network/display-utility-associations/README.md

@@ -34,7 +34,7 @@ Pan and zoom around the map. Observe graphics that show utility associations bet
 
 ## About the data
 
-The [Naperville electrical](https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer) network feature service, hosted on ArcGIS Online, contains a utility network used to display the utility associations in this sample.
+The [Naperville electrical](https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer) network feature service, hosted on ArcGIS Online, contains a utility network used to display the utility associations in this sample.
 
 ## Tags
 

utility_network/display-utility-associations/src/main/java/com/esri/samples/display_utility_associations/DisplayUtilityAssociationsSample.java

@@ -43,6 +43,10 @@
 import com.esri.arcgisruntime.mapping.view.Graphic;
 import com.esri.arcgisruntime.mapping.view.GraphicsOverlay;
 import com.esri.arcgisruntime.mapping.view.MapView;
+import com.esri.arcgisruntime.security.AuthenticationManager;
+import com.esri.arcgisruntime.security.SelfSignedCertificateListener;
+import com.esri.arcgisruntime.security.SelfSignedResponse;
+import com.esri.arcgisruntime.security.UserCredential;
 import com.esri.arcgisruntime.symbology.SimpleLineSymbol;
 import com.esri.arcgisruntime.symbology.UniqueValueRenderer;
 import com.esri.arcgisruntime.utilitynetworks.UtilityAssociation;
@@ -87,10 +91,15 @@ public void start(Stage stage) {
       // create a map view, set the map, and add the graphics overlay
       mapView = new MapView();
       mapView.setMap(map);
-      
+
       // create the utility network
-      utilityNetwork = new UtilityNetwork("https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer");
-      
+      utilityNetwork = new UtilityNetwork("https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer");
+
+      // set user credentials to authenticate with the service
+      // NOTE: a licensed user is required to perform utility network operations
+      UserCredential userCredential = new UserCredential("viewer01", "I68VGU^nMurF");
+      utilityNetwork.setCredential(userCredential);
+
       // load the utility network and get all of the edges and junctions in the network
       utilityNetwork.loadAsync();
       utilityNetwork.addDoneLoadingListener(() -> {

utility_network/perform-valve-isolation-trace/README.md

@@ -23,10 +23,10 @@ Create and set the configuration's filter barriers by selecting a category. Chec
 7. Add a `GraphicsOverlay` with the graphic that represents the starting location.
 8. Populate the combo box for choosing the filter barrier category from `UtilityNetworkDefinition.getCategories()`.
 9. When "Trace" is clicked,
-    - Create a new `UtilityCategoryComparison` with the selected category and `UtilityCategoryComparisonOperator.EXISTS`. 
-    - Assign this condition to `utilityTraceFilter.setBarriers()` from the default configuration from step 7. Update this configuration's `utilityTraceConfiguration.isIncludeIsolatedFeatures()` property.
-    - Create a `UtilityTraceParameters` with `UtilityTraceType.ISOLATION` and default starting location from step 4. 
-    - Set its utility trace configuration with this configuration and then, run a `utilityNetwork.traceAsync()`.
+    * Create a new `UtilityCategoryComparison` with the selected category and `UtilityCategoryComparisonOperator.EXISTS`.
+    * Assign this condition to `utilityTraceFilter.setBarriers()` from the default configuration from step 7. Update this configuration's `utilityTraceConfiguration.isIncludeIsolatedFeatures()` property.
+    * Create a `UtilityTraceParameters` with `UtilityTraceType.ISOLATION` and default starting location from step 4.
+    * Set its utility trace configuration with this configuration and then, run a `utilityNetwork.traceAsync()`.
 10. Get the list of `UtilityElement`s from the first trace result.
 11. For every feature layer in the map, select all the features for which the layer's `FeatureTable.getTableName()` matches the `NetworkSource.getName()` of one of the utility elements.
 
@@ -40,16 +40,16 @@ Create and set the configuration's filter barriers by selecting a category. Chec
 * UtilityElementTraceResult
 * UtilityNetwork
 * UtilityNetworkDefinition
-* UtilityTraceFilter
 * UtilityTier
+* UtilityTraceFilter
 * UtilityTraceParameters
 * UtilityTraceResult
 * UtilityTraceType
 
 ## About the data
 
-The [Naperville gas](https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleGas/FeatureServer) network feature service, hosted on ArcGIS Online, contains a utility network used to run the isolation trace shown in this sample.
-    
+The [Naperville gas](https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleGas/FeatureServer) network feature service, hosted on ArcGIS Online, contains a utility network used to run the isolation trace shown in this sample.
+
 ## Tags
 
 category comparison, condition barriers, isolated features, network analysis, subnetwork trace, trace configuration, trace filter, utility network

utility_network/perform-valve-isolation-trace/src/main/java/com/esri/samples/perform_valve_isolation_trace/PerformValveIsolationTraceController.java

@@ -46,6 +46,7 @@
 import com.esri.arcgisruntime.mapping.view.Graphic;
 import com.esri.arcgisruntime.mapping.view.GraphicsOverlay;
 import com.esri.arcgisruntime.mapping.view.MapView;
+import com.esri.arcgisruntime.security.UserCredential;
 import com.esri.arcgisruntime.symbology.ColorUtil;
 import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol;
 import com.esri.arcgisruntime.symbology.SimpleRenderer;
@@ -93,7 +94,7 @@ public void initialize() {
 
       // load the utility network data from the feature service and create feature layers
       String featureServiceURL =
-              "https://sampleserver7.arcgisonline.com/arcgis/rest/services/UtilityNetwork/NapervilleGas/FeatureServer";
+              "https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleGas/FeatureServer";
 
       ServiceFeatureTable distributionLineFeatureTable = new ServiceFeatureTable(featureServiceURL + "/3");
       FeatureLayer distributionLineLayer = new FeatureLayer(distributionLineFeatureTable);
@@ -115,6 +116,12 @@ public void initialize() {
 
       // create and load the utility network
       utilityNetwork = new UtilityNetwork(featureServiceURL);
+
+      // set user credentials to authenticate with the service
+      // NOTE: a licensed user is required to perform utility network operations
+      UserCredential userCredential = new UserCredential("viewer01", "I68VGU^nMurF");
+      utilityNetwork.setCredential(userCredential);
+
       utilityNetwork.loadAsync();
       utilityNetwork.addDoneLoadingListener(() -> {
         if (utilityNetwork.getLoadStatus() == LoadStatus.LOADED) {