You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2018/02/22 16:03:43 UTC

[incubator-trafficcontrol] 02/08: updated CRConfig param to use camelcase

This is an automated email from the ASF dual-hosted git repository.

elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit b3dedc192f6eb2f43d5bab17c687fbdb97649aea
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Fri Feb 9 09:59:41 2018 -0700

    updated CRConfig param to use camelcase
---
 traffic_ops/app/lib/UI/Topology.pm                                | 6 +++---
 .../traffic_control/traffic_router/core/router/TrafficRouter.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/traffic_ops/app/lib/UI/Topology.pm b/traffic_ops/app/lib/UI/Topology.pm
index c659abc..cd22716 100644
--- a/traffic_ops/app/lib/UI/Topology.pm
+++ b/traffic_ops/app/lib/UI/Topology.pm
@@ -157,9 +157,9 @@ sub gen_crconfig_json {
             ( my $country_code, my $coordinates ) = split( /\;/, $row->parameter->value );
             ( my $lat, my $long ) = split( /\,/, $coordinates );
             my $geolocation = {
-                'CountryCode' => "$country_code",
-                'Lat' => "$lat",
-                'Long' => "$long"
+                'countryCode' => "$country_code",
+                'lat' => "$lat",
+                'long' => "$long"
             };
             if ( !$data_obj->{'config'}->{'geolocationOverride'} ) {
                 $data_obj->{'config'}->{'geolocationOverride'} = [];
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
index 2d29fa2..28c5184 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
@@ -104,13 +104,13 @@ public class TrafficRouter {
 		this.zoneManager = new ZoneManager(this, statTracker, trafficOpsUtils, trafficRouterManager);
 
 		if (cr.getConfig() != null) {
-			// geolocationOverride: {CountryCode: , Lat: , Long: }
+			// geolocationOverride: {countryCode: , lat: , long: }
 			final JsonNode geolocations = cr.getConfig().get("geolocationOverride");
 			if (geolocations != null) {
 				for (final JsonNode geolocation : geolocations) {
-					final String countryCode = JsonUtils.optString(geolocation, "CountryCode");
-					final double lat = JsonUtils.optDouble(geolocation, "Lat");
-					final double longitude = JsonUtils.optDouble(geolocation, "Long");
+					final String countryCode = JsonUtils.optString(geolocation, "countryCode");
+					final double lat = JsonUtils.optDouble(geolocation, "lat");
+					final double longitude = JsonUtils.optDouble(geolocation, "long");
 					defaultGeolocations.put(countryCode, new Geolocation(lat, longitude));
 				}
 			}

-- 
To stop receiving notification emails like this one, please contact
elsloo@apache.org.