Changed VirtualPropertyResolver to accept TimestampCalculator in the constructor

Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>

hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/JpaRepositoryAutoConfiguration.java

@@ -9,6 +9,7 @@
 package org.eclipse.hawkbit.autoconfigure.repository;
 
 import org.eclipse.hawkbit.EnableJpaRepository;
+import org.eclipse.hawkbit.repository.jpa.TimestampCalculator;
 import org.eclipse.hawkbit.repository.rsql.VirtualPropertyReplacer;
 import org.eclipse.hawkbit.repository.jpa.rsql.VirtualPropertyResolver;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -33,7 +34,7 @@ public class JpaRepositoryAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
     public VirtualPropertyReplacer virtualPropertyReplacer() {
-        return new VirtualPropertyResolver();
+        return new VirtualPropertyResolver(new TimestampCalculator());
     }
 
 }

hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolver.java

@@ -43,10 +43,21 @@ import org.eclipse.hawkbit.repository.rsql.VirtualPropertyReplacer;
  */
 public class VirtualPropertyResolver extends StrLookup<String> implements VirtualPropertyReplacer {
 
-    private final TimestampCalculator timestampCalculator = new TimestampCalculator();
+    private final TimestampCalculator timestampCalculator;
 
     private StrSubstitutor substitutor;
 
+    /**
+     * Instantiates a new virtual property resolver with the given timestamp
+     * calculator
+     * 
+     * @param timestampCalculator
+     *            calculates timestamps
+     */
+    public VirtualPropertyResolver(TimestampCalculator timestampCalculator) {
+        this.timestampCalculator = timestampCalculator;
+    }
+
     @Override
     public String lookup(String rhs) {
         String resolved = null;

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java

@@ -441,12 +441,10 @@ public final class RSQLUtility {
             // methods.
             final Object transformedValue = transformedValues.get(0);
 
-            final String value;
+            String value = values.get(0);
             // if lookup is available, replace macros ...
             if (virtualPropertyReplacer != null) {
-                value = virtualPropertyReplacer.replace(values.get(0));
+                value = virtualPropertyReplacer.replace(value);
-            } else {
-                value = values.get(0);
             }
 
             final List<Predicate> singleList = new ArrayList<>();

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java

@@ -50,7 +50,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
 public class RSQLUtilityTest {
 
     @Spy
-    VirtualPropertyResolver macroResolver = new VirtualPropertyResolver();
+    VirtualPropertyResolver macroResolver = new VirtualPropertyResolver(new TimestampCalculator());
 
     @Mock
     TenantConfigurationManagement confMgmt;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java

@@ -36,7 +36,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
 public class VirtualPropertyResolverTest {
 
     @Spy
-    VirtualPropertyResolver resolverUnderTest = new VirtualPropertyResolver();
+    VirtualPropertyResolver resolverUnderTest = new VirtualPropertyResolver(new TimestampCalculator());
 
     @Mock
     TenantConfigurationManagement confMgmt;

hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/TestConfiguration.java

@@ -14,6 +14,7 @@ import java.util.concurrent.Executors;
 import org.eclipse.hawkbit.cache.CacheConstants;
 import org.eclipse.hawkbit.cache.TenancyCacheManager;
 import org.eclipse.hawkbit.cache.TenantAwareCacheManager;
+import org.eclipse.hawkbit.repository.jpa.TimestampCalculator;
 import org.eclipse.hawkbit.repository.jpa.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.jpa.rsql.VirtualPropertyResolver;
 import org.eclipse.hawkbit.repository.rsql.VirtualPropertyReplacer;
@@ -128,7 +129,7 @@ public class TestConfiguration implements AsyncConfigurer {
      */
     @Bean
     public VirtualPropertyReplacer virtualPropertyReplacer() {
-        return new VirtualPropertyResolver();
+        return new VirtualPropertyResolver(new TimestampCalculator());
     }
 
 }