lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Changed VirtualPropertyResolver to accept TimestampCalculator in the constructor

Browse Source 
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
This commit is contained in:
Dominik Herbst
2016-10-04 16:21:17 +02:00
parent b1d9930d94
commit 41955b7671
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));
} else {
value = values.get(0);
value = virtualPropertyReplacer.replace(value);
}
final List<Predicate> singleList = new ArrayList<>();

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

@@ -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;

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

@@ -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;