DS-1723,DS-1841:

* Fix Index IndexWhiteList/getIndexName() BWC

Signed-off-by: mchrza <[email protected]>

Author: mchrza

xyz-jobs/xyz-job-steps/src/main/java/com/here/xyz/jobs/steps/impl/DropIndexes.java

@@ -59,6 +59,12 @@ public void setIndexWhiteList(List<Index> indexWhiteList) {
   }
 
   public DropIndexes withIndexWhiteList(List<Index> indexWhiteList) {
+    for (Index index : indexWhiteList) {
+      //ensure BWC for spaces created with old index definitions
+      if(index instanceof OnDemandIndex onDemandIndex && onDemandIndex.definitionGotTransformed()) {
+        onDemandIndex.setPropertyPath(onDemandIndex.extractLogicalPropertyPath());
+      }
+    }
     setIndexWhiteList(indexWhiteList);
     return this;
   }

xyz-util/src/main/java/com/here/xyz/util/db/pg/IndexHelper.java

@@ -232,7 +232,9 @@ public boolean definitionGotTransformed() {
     @Override
     public String getIndexName(String tableName) {
       // Take the first 8 characters of md5 hash of the property path
-      String shortMd5 = DigestUtils.md5Hex(propertyPath).substring(0, 7);
+      String shortMd5 = DigestUtils.md5Hex(
+              definitionGotTransformed() ?  extractLogicalPropertyPath() : propertyPath
+      ).substring(0, 7);
 
       return idxPrefix + tableName + "_" + shortMd5 + "_m";
     }