@@ -65,15 +65,6 @@ public class MeasureFilter { | |||
return this; | |||
} | |||
public Long getBaseResourceId() { | |||
return baseResourceId; | |||
} | |||
public MeasureFilter setBaseResourceId(Long i) { | |||
this.baseResourceId = i; | |||
return this; | |||
} | |||
public MeasureFilter setOnBaseResourceChildren(boolean b) { | |||
this.onBaseResourceChildren = b; | |||
return this; |
@@ -76,14 +76,11 @@ public class MeasureFilterExecutor implements ServerComponent { | |||
private void prepareContext(MeasureFilterContext context, MeasureFilter filter, SqlSession session) { | |||
if (filter.getBaseResourceKey() != null) { | |||
context.setBaseSnapshot(resourceDao.getLastSnapshot(filter.getBaseResourceKey(), session)); | |||
} else if (filter.getBaseResourceId() != null) { | |||
context.setBaseSnapshot(resourceDao.getLastSnapshotByResourceId(filter.getBaseResourceId(), session)); | |||
} | |||
} | |||
static boolean isValid(MeasureFilter filter, MeasureFilterContext context) { | |||
boolean valid = Strings.isNullOrEmpty(filter.getBaseResourceKey()) || context.getBaseSnapshot()!=null; | |||
valid &= filter.getBaseResourceId()==null || context.getBaseSnapshot()!=null; | |||
valid &= !(filter.isOnBaseResourceChildren() && context.getBaseSnapshot() == null); | |||
valid &= !(filter.isOnFavourites() && context.getUserId() == null); | |||
valid &= validateMeasureConditions(filter); |
@@ -46,10 +46,6 @@ public class MeasureFilterFactory implements ServerComponent { | |||
MeasureFilter filter = new MeasureFilter(); | |||
filter.setBaseResourceKey((String) properties.get("base")); | |||
String baseId = "baseId"; | |||
if (properties.containsKey(baseId)) { | |||
filter.setBaseResourceId(Long.valueOf((String) properties.get(baseId))); | |||
} | |||
filter.setResourceScopes(toList(properties.get("scopes"))); | |||
filter.setResourceQualifiers(toList(properties.get("qualifiers"))); | |||
filter.setResourceLanguages(toList(properties.get("languages"))); |
@@ -61,6 +61,5 @@ public class MeasureFilterTest { | |||
public void filter_is_not_empty_if_at_least_condition_on_root_resource() { | |||
assertThat(new MeasureFilter().isEmpty()).isTrue(); | |||
assertThat(new MeasureFilter().setBaseResourceKey("foo").isEmpty()).isFalse(); | |||
assertThat(new MeasureFilter().setBaseResourceId(123L).isEmpty()).isFalse(); | |||
} | |||
} |