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/01/24 17:23:36 UTC
[incubator-trafficcontrol] 27/36: Update Traffic Router to use
deepCachingType as an enum
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 c82985184e5b2995e96d18d09b949eea2dd1428e
Author: Rawlin Peters <ra...@comcast.com>
AuthorDate: Thu Nov 9 17:32:25 2017 -0700
Update Traffic Router to use deepCachingType as an enum
---
.../traffic_router/core/ds/DeliveryService.java | 21 +++++++++++++++------
.../traffic_router/core/router/TrafficRouter.java | 2 +-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
index facb1ba..e7d3727 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
@@ -93,10 +93,12 @@ public class DeliveryService {
private final boolean acceptHttp;
private final boolean acceptHttps;
private final boolean redirectToHttps;
- private final int deepCache;
+ private final DeepCachingType deepCache;
- public static final int DC_NEVER = 0;
- public static final int DC_ALWAYS = 1;
+ public enum DeepCachingType {
+ NEVER,
+ ALWAYS
+ }
public DeliveryService(final String id, final JsonNode dsJo) throws JsonUtilsException {
this.id = id;
@@ -148,8 +150,15 @@ public class DeliveryService {
acceptHttp = JsonUtils.optBoolean(protocol, "acceptHttp", true);
acceptHttps = JsonUtils.optBoolean(protocol, "acceptHttps");
redirectToHttps = JsonUtils.optBoolean(protocol, "redirectToHttps");
-
- this.deepCache = JsonUtils.optInt(dsJo, "deepCachingType", DC_NEVER);
+ final String dctString = JsonUtils.optString(dsJo, "deepCachingType", "NEVER");
+ DeepCachingType dct = DeepCachingType.NEVER;
+ try {
+ dct = DeepCachingType.valueOf(dctString);
+ } catch (IllegalArgumentException e) {
+ LOGGER.error("Unrecognized deepCachingType: '" + dct + "'. Defaulting to 'NEVER' instead");
+ } finally {
+ this.deepCache = dct;
+ }
}
public String getId() {
@@ -394,7 +403,7 @@ public class DeliveryService {
this.isDns = isDns;
}
- public int getDeepCache() {
+ public DeepCachingType getDeepCache() {
return deepCache;
}
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 be0579d..8037497 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
@@ -249,7 +249,7 @@ public class TrafficRouter {
CacheLocation cacheLocation;
ResultType result = ResultType.CZ;
- if (ds.getDeepCache() == DeliveryService.DC_ALWAYS) {
+ if (ds.getDeepCache() == DeliveryService.DeepCachingType.ALWAYS) {
// Deep caching is enabled. See if there are deep caches available
cacheLocation = getDeepCoverageZoneCacheLocation(request.getClientIP(), ds);
if (cacheLocation != null && cacheLocation.getCaches().size() != 0) {
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.