From f32757ec24ce2a0680fca1bb142bf59dc019accc Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Fri, 14 Sep 2018 14:01:20 -0700 Subject: [PATCH] Remove deprecated static indexes Change-Id: I0d404edf01217205970213a304049e3739c08d79 --- .../onosproject/d/config/DeviceResourceIds.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/apps/config/src/main/java/org/onosproject/d/config/DeviceResourceIds.java b/apps/config/src/main/java/org/onosproject/d/config/DeviceResourceIds.java index 6e517a0b83..6a5940012a 100644 --- a/apps/config/src/main/java/org/onosproject/d/config/DeviceResourceIds.java +++ b/apps/config/src/main/java/org/onosproject/d/config/DeviceResourceIds.java @@ -64,13 +64,6 @@ public abstract class DeviceResourceIds { */ public static final String DEVICE_ID_KL_NAME = "device-id"; - /** - * Absolute ResourceId pointing at root node. - * @deprecated Use {@link ResourceIds#ROOT_ID} instead - */ - @Deprecated - public static final ResourceId ROOT_ID = ResourceIds.ROOT_ID; - /** * Absolute ResourceId pointing at 'devices' node. */ @@ -86,16 +79,15 @@ public abstract class DeviceResourceIds { /** * nodeKeys index for root node. */ - @Deprecated - static final int ROOT_INDEX = 0; + private static final int ROOT_INDEX = 0; /** * nodeKeys index relative from root for devices node. */ - static final int DEVICES_INDEX = 1; + private static final int DEVICES_INDEX = 1; /** * nodeKeys index relative from root for device node. */ - static final int DEVICE_INDEX = 2; + private static final int DEVICE_INDEX = 2; /** * Converts root relative ResourceId used by DynamicConfigEvent.