@@ -470,7 +470,7 @@ public class ViewsPersistComponentsStepIT extends BaseStepTest { | |||
.setUuid(PROJECT_VIEW_1_UUID) | |||
.setName(PROJECT_VIEW_1_NAME) | |||
.setDescription("project view description is not persisted") | |||
.setProjectViewAttributes(new ProjectViewAttributes(project.uuid(), project.getKey(), analysisDate, null)); | |||
.setProjectViewAttributes(new ProjectViewAttributes(project.uuid(), project.getKey(), analysisDate, true, null)); | |||
} | |||
private void persistComponents(ComponentDto... componentDtos) { |
@@ -31,12 +31,14 @@ public class ProjectViewAttributes { | |||
private final String originalKey; | |||
@CheckForNull | |||
private final Long analysisDate; | |||
private final boolean hasNewCodePeriod; | |||
private final String branchName; | |||
public ProjectViewAttributes(String uuid, String originalKey, @Nullable Long analysisDate, @Nullable String branchName) { | |||
public ProjectViewAttributes(String uuid, String originalKey, @Nullable Long analysisDate, boolean hasNewCodePeriod, @Nullable String branchName) { | |||
this.uuid = requireNonNull(uuid, "uuid can't be null"); | |||
this.originalKey = requireNonNull(originalKey, "originalKey can't be null"); | |||
this.analysisDate = analysisDate; | |||
this.hasNewCodePeriod = hasNewCodePeriod; | |||
this.branchName = branchName; | |||
} | |||
@@ -57,12 +59,17 @@ public class ProjectViewAttributes { | |||
return originalKey; | |||
} | |||
public boolean hasNewCodePeriod() { | |||
return hasNewCodePeriod; | |||
} | |||
@Override | |||
public String toString() { | |||
return "ProjectViewAttributes{" + | |||
", uuid='" + uuid + '\'' + | |||
", branchName='" + branchName + '\'' + | |||
", analysisDate=" + analysisDate + | |||
'}'; | |||
", uuid='" + uuid + '\'' + | |||
", branchName='" + branchName + '\'' + | |||
", hasNewCodePeriod=" + branchName + | |||
", analysisDate=" + analysisDate + | |||
'}'; | |||
} | |||
} |
@@ -61,8 +61,9 @@ public abstract class SumFormula<T extends SumCounter<U, T>, U extends Number> i | |||
@Override | |||
public Optional<Measure> createMeasure(IntSumCounter counter, CreateMeasureContext context) { | |||
Optional<Integer> valueOptional = counter.getValue(); | |||
if (shouldCreateMeasure(context, valueOptional)) { | |||
return Optional.of(Measure.newMeasureBuilder().create(valueOptional.get())); | |||
Integer value = valueOptional.orElse(null); | |||
if (shouldCreateMeasure(context, value)) { | |||
return Optional.of(Measure.newMeasureBuilder().create(value)); | |||
} | |||
return Optional.empty(); | |||
} | |||
@@ -89,15 +90,17 @@ public abstract class SumFormula<T extends SumCounter<U, T>, U extends Number> i | |||
@Override | |||
public Optional<Measure> createMeasure(LongSumCounter counter, CreateMeasureContext context) { | |||
Optional<Long> valueOptional = counter.getValue(); | |||
if (shouldCreateMeasure(context, valueOptional)) { | |||
return Optional.of(Measure.newMeasureBuilder().create(valueOptional.get())); | |||
Long value = valueOptional.orElse(null); | |||
if (shouldCreateMeasure(context, value)) { | |||
return Optional.of(Measure.newMeasureBuilder().create(value)); | |||
} | |||
return Optional.empty(); | |||
} | |||
} | |||
private static <T extends Number> boolean shouldCreateMeasure(CreateMeasureContext context, Optional<T> value) { | |||
return value.isPresent() && CrawlerDepthLimit.LEAVES.isDeeperThan(context.getComponent().getType()); | |||
protected static <T extends Number> boolean shouldCreateMeasure(CreateMeasureContext context, @Nullable T value) { | |||
return value != null && CrawlerDepthLimit.LEAVES.isDeeperThan(context.getComponent().getType()); | |||
} | |||
@Override |