feast-dev
diff --git a/‎common/src/main/java/feast/common/models/FeatureTable.java‎
Lines changed: 13 additions & 0 deletions b/‎common/src/main/java/feast/common/models/FeatureTable.java‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎serving/src/main/java/feast/serving/specs/CachedSpecService.java‎
Lines changed: 1 addition & 1 deletion b/‎serving/src/main/java/feast/serving/specs/CachedSpecService.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎storage/connectors/redis/src/main/java/feast/storage/connectors/redis/common/RedisHashDecoder.java‎
Lines changed: 4 additions & 4 deletions b/‎storage/connectors/redis/src/main/java/feast/storage/connectors/redis/common/RedisHashDecoder.java‎
Lines changed: 4 additions & 4 deletions
@@ -17,6 +17,7 @@
 package feast.common.models;
 
 import feast.proto.core.FeatureTableProto.FeatureTableSpec;
+import feast.proto.serving.ServingAPIProto.FeatureReferenceV2;
 
 public class FeatureTable {
 
@@ -30,4 +31,16 @@ public class FeatureTable {
   public static String getFeatureTableStringRef(String project, FeatureTableSpec featureTableSpec) {
     return String.format("%s/%s", project, featureTableSpec.getName());
   }
+
+  /**
+   * Accepts FeatureReferenceV2 object and returns its reference in String
+   * "project/featuretable_name".
+   *
+   * @param featureReference {@link FeatureReferenceV2}
+   * @return String format of FeatureTableReference
+   */
+  public static String getFeatureTableStringRef(
+      String project, FeatureReferenceV2 featureReference) {
+    return String.format("%s/%s", project, featureReference.getFeatureTable());
+  }
 }
@@ -397,7 +397,7 @@ private Map<String, FeatureTableSpec> getFeatureTableMap() {
 
   public FeatureTableSpec getFeatureTableSpec(
       String project, ServingAPIProto.FeatureReferenceV2 featureReference) {
-    String featureTableRefStr = project + "/" + featureReference.getFeatureTable();
+    String featureTableRefStr = getFeatureTableStringRef(project, featureReference);
     FeatureTableSpec featureTableSpec;
     try {
       featureTableSpec = featureTableCache.get(featureTableRefStr);
 
@@ -46,10 +46,10 @@ public static List<Optional<Feature>> retrieveFeature(
         new HashMap<>();
     Map<String, Timestamp> featureTableTimestampMap = new HashMap<>();
 
-    for (int i = 0; i < redisHashValues.size(); i++) {
-      if (redisHashValues.get(i).hasValue()) {
-        byte[] redisValueK = redisHashValues.get(i).getKey();
-        byte[] redisValueV = redisHashValues.get(i).getValue();
+    for (KeyValue<byte[], byte[]> entity : redisHashValues) {
+      if (entity.hasValue()) {
+        byte[] redisValueK = entity.getKey();
+        byte[] redisValueV = entity.getValue();
 
         // Decode data from Redis into Feature object fields
         if (new String(redisValueK).startsWith(timestampPrefix)) {