From 1c73879c6bd7bb325e7e95acfadbb8431adc39f3 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 29 Jan 2016 15:21:56 +0100 Subject: [PATCH] Fix quality flaws --- .../computation/formula/AverageFormula.java | 33 +++++++++---------- .../issue/TrackerRawInputFactory.java | 30 ++++++++--------- .../api/MeasureComputerDefinitionImpl.java | 8 ++--- .../step/ComputeMeasureVariationsStep.java | 26 +++++++-------- .../step/PersistComponentsStep.java | 8 ++--- .../step/PersistFileSourcesStep.java | 24 +++++++------- .../step/PersistProjectLinksStep.java | 14 ++++---- .../step/PersistSnapshotsStep.java | 18 +++++----- .../server/measure/MeasureFilterFactory.java | 7 ++-- .../server/permission/PermissionFinder.java | 2 +- .../server/qualityprofile/QProfileLookup.java | 4 +-- .../test/TestMeasureComputerDefinition.java | 8 ++--- 12 files changed, 91 insertions(+), 91 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java index 48632600d8d..f188506ce3d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java @@ -153,25 +153,24 @@ public class AverageFormula implements Formula { } return Optional.absent(); } - } - private static Optional getDoubleValue(Optional measureOptional) { - if (!measureOptional.isPresent()) { - return Optional.absent(); - } - Measure measure = measureOptional.get(); - switch (measure.getValueType()) { - case DOUBLE: - return Optional.of(measure.getDoubleValue()); - case LONG: - return Optional.of((double) measure.getLongValue()); - case INT: - return Optional.of((double) measure.getIntValue()); - case NO_VALUE: + private Optional getDoubleValue(Optional measureOptional) { + if (!measureOptional.isPresent()) { return Optional.absent(); - default: - throw new IllegalArgumentException(String.format("Measure of type '%s' are not supported", measure.getValueType().name())); + } + Measure measure = measureOptional.get(); + switch (measure.getValueType()) { + case DOUBLE: + return Optional.of(measure.getDoubleValue()); + case LONG: + return Optional.of((double) measure.getLongValue()); + case INT: + return Optional.of((double) measure.getIntValue()); + case NO_VALUE: + return Optional.absent(); + default: + throw new IllegalArgumentException(String.format("Measure of type '%s' are not supported", measure.getValueType().name())); + } } } - } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java index 1247466e20f..8c403dc705a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java @@ -170,22 +170,22 @@ public class TrackerRawInputFactory { } return target.build(); } - } - private static DbCommons.TextRange.Builder convertTextRange(BatchReport.TextRange sourceRange) { - DbCommons.TextRange.Builder targetRange = DbCommons.TextRange.newBuilder(); - if (sourceRange.hasStartLine()) { - targetRange.setStartLine(sourceRange.getStartLine()); - } - if (sourceRange.hasStartOffset()) { - targetRange.setStartOffset(sourceRange.getStartOffset()); - } - if (sourceRange.hasEndLine()) { - targetRange.setEndLine(sourceRange.getEndLine()); - } - if (sourceRange.hasEndOffset()) { - targetRange.setEndOffset(sourceRange.getEndOffset()); + private DbCommons.TextRange.Builder convertTextRange(BatchReport.TextRange sourceRange) { + DbCommons.TextRange.Builder targetRange = DbCommons.TextRange.newBuilder(); + if (sourceRange.hasStartLine()) { + targetRange.setStartLine(sourceRange.getStartLine()); + } + if (sourceRange.hasStartOffset()) { + targetRange.setStartOffset(sourceRange.getStartOffset()); + } + if (sourceRange.hasEndLine()) { + targetRange.setEndLine(sourceRange.getEndLine()); + } + if (sourceRange.hasEndOffset()) { + targetRange.setEndOffset(sourceRange.getEndOffset()); + } + return targetRange; } - return targetRange; } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java index 18f8719d4be..e2001f414c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java @@ -117,11 +117,11 @@ public class MeasureComputerDefinitionImpl implements MeasureComputer.MeasureCom checkNotNull(outputMetrics); return outputMetrics; } - } - private static void checkNotNull(String[] metrics) { - for (String metric : metrics) { - requireNonNull(metric, "Null metric is not allowed"); + private static void checkNotNull(String[] metrics) { + for (String metric : metrics) { + requireNonNull(metric, "Null metric is not allowed"); + } } } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java index 29dd8a0f43f..4930fe92fa9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java @@ -153,20 +153,20 @@ public class ComputeMeasureVariationsStep implements ComputationStep { } } } - } - private static double computeVariation(Measure measure, Double pastValue) { - switch (measure.getValueType()) { - case INT: - return measure.getIntValue() - pastValue; - case LONG: - return measure.getLongValue() - pastValue; - case DOUBLE: - return measure.getDoubleValue() - pastValue; - case BOOLEAN: - return (measure.getBooleanValue() ? 1d : 0d) - pastValue; - default: - throw new IllegalArgumentException("Unsupported Measure.ValueType " + measure.getValueType()); + private double computeVariation(Measure measure, Double pastValue) { + switch (measure.getValueType()) { + case INT: + return measure.getIntValue() - pastValue; + case LONG: + return measure.getLongValue() - pastValue; + case DOUBLE: + return measure.getDoubleValue() - pastValue; + case BOOLEAN: + return (measure.getBooleanValue() ? 1d : 0d) - pastValue; + default: + throw new IllegalArgumentException("Unsupported Measure.ValueType " + measure.getValueType()); + } } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java index 8ed39412676..972a1ce620e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java @@ -177,6 +177,10 @@ public class PersistComponentsStep implements ComputationStep { return existingComponent; } } + + private void addToCache(Component component, ComponentDto componentDto) { + dbIdsRepository.setComponentId(component, componentDto.getId()); + } } public ComponentDto createForProject(Component project) { @@ -320,10 +324,6 @@ public class PersistComponentsStep implements ComputationStep { componentDto.setModuleUuidPath(parentModule.moduleUuidPath()); } - private void addToCache(Component component, ComponentDto componentDto) { - dbIdsRepository.setComponentId(component, componentDto.getId()); - } - private static boolean updateExisting(ComponentDto existingComponent, ComponentDto newComponent) { boolean modified = false; if (!StringUtils.equals(existingComponent.name(), newComponent.name())) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java index 83476932c9c..47827c044b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java @@ -180,22 +180,22 @@ public class PersistFileSourcesStep implements ComputationStep { } } } - } - @CheckForNull - private static String computeRevision(FileSourceDto previousDto, @Nullable Changeset latestChange) { - if (latestChange == null) { - return previousDto.getRevision(); + @CheckForNull + private String computeRevision(FileSourceDto previousDto, @Nullable Changeset latestChange) { + if (latestChange == null) { + return previousDto.getRevision(); + } + return latestChange.getRevision(); } - return latestChange.getRevision(); - } - @CheckForNull - private static String computeRevision(@Nullable Changeset latestChange) { - if (latestChange == null) { - return null; + @CheckForNull + private String computeRevision(@Nullable Changeset latestChange) { + if (latestChange == null) { + return null; + } + return latestChange.getRevision(); } - return latestChange.getRevision(); } private static class LineReaders { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java index 4c69a5b1108..a25ccdc9f37 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java @@ -144,14 +144,14 @@ public class PersistProjectLinksStep implements ComputationStep { } } } - } - private static String convertType(Constants.ComponentLinkType reportType) { - String type = typesConverter.get(reportType); - if (type != null) { - return type; - } else { - throw new IllegalArgumentException(String.format("Unsupported type %s", reportType.name())); + private String convertType(Constants.ComponentLinkType reportType) { + String type = typesConverter.get(reportType); + if (type != null) { + return type; + } else { + throw new IllegalArgumentException(String.format("Unsupported type %s", reportType.name())); + } } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java index 228ca609dc9..afb0bf5baa1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java @@ -139,6 +139,15 @@ public class PersistSnapshotsStep implements ComputationStep { commonForAnyVisit(projectView, path, snapshot); } + private void updateSnapshotPeriods(SnapshotDto snapshotDto) { + for (Period period : periodsHolder.getPeriods()) { + int index = period.getIndex(); + snapshotDto.setPeriodMode(index, period.getMode()); + snapshotDto.setPeriodParam(index, period.getModeParameter()); + snapshotDto.setPeriodDate(index, period.getSnapshotDate()); + } + } + private void commonForAnyVisit(Component project, Path path, SnapshotDto snapshot) { persist(snapshot, dbSession); addToCache(project, snapshot); @@ -186,15 +195,6 @@ public class PersistSnapshotsStep implements ComputationStep { dbIdsRepository.setSnapshotId(component, snapshotDto.getId()); } - private void updateSnapshotPeriods(SnapshotDto snapshotDto) { - for (Period period : periodsHolder.getPeriods()) { - int index = period.getIndex(); - snapshotDto.setPeriodMode(index, period.getMode()); - snapshotDto.setPeriodParam(index, period.getModeParameter()); - snapshotDto.setPeriodDate(index, period.getSnapshotDate()); - } - } - private static String getFileQualifier(Component component) { return component.getFileAttributes().isUnitTest() ? Qualifiers.UNIT_TEST_FILE : Qualifiers.FILE; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java index 3877f9ab5f0..2364d1e3309 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java @@ -40,6 +40,7 @@ import org.sonar.api.utils.System2; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; +import static java.util.Collections.singletonList; @ServerSide public class MeasureFilterFactory { @@ -164,11 +165,11 @@ public class MeasureFilterFactory { return null; } - private List toList(@Nullable Object obj) { + private static List toList(@Nullable Object obj) { List result = null; if (obj != null) { if (obj instanceof String) { - result = Arrays.asList((String) obj); + result = singletonList((String) obj); } else { result = (List) obj; } @@ -177,7 +178,7 @@ public class MeasureFilterFactory { } @CheckForNull - private Date toDate(@Nullable String date) { + private static Date toDate(@Nullable String date) { if (date != null) { return DateUtils.parseDate(date); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java index d45b286f11e..bbe04729bec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java @@ -107,7 +107,7 @@ public class PermissionFinder { * As the anyone group does not exists in db, it's not returned when it has not the permission. * We have to manually add it at the begin of the list, if it matched the search text */ - private void addAnyoneGroup(List groups, PermissionQuery query) { + private static void addAnyoneGroup(List groups, PermissionQuery query) { boolean hasAnyoneGroup = Iterables.any(groups, IsAnyoneGroup.INSTANCE); if (!hasAnyoneGroup && !GlobalPermissions.SYSTEM_ADMIN.equals(query.permission()) diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java index cba8b46707c..13ed6c46c65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java @@ -25,9 +25,9 @@ import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.sonar.api.server.ServerSide; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.qualityprofile.QualityProfileDto; -import org.sonar.db.DbClient; import static com.google.common.collect.Lists.newArrayList; @@ -144,7 +144,7 @@ public class QProfileLookup { } } - private List toQProfiles(List dtos) { + private static List toQProfiles(List dtos) { return newArrayList(Iterables.transform(dtos, ToQProfile.INSTANCE)); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinition.java index 2a11c1df180..97c9146653b 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinition.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinition.java @@ -92,11 +92,11 @@ public class TestMeasureComputerDefinition implements MeasureComputer.MeasureCom checkNotNull(outputMetrics); return outputMetrics; } - } - private static void checkNotNull(String[] metrics) { - for (String metric : metrics) { - requireNonNull(metric, "Null metric is not allowed"); + private static void checkNotNull(String[] metrics) { + for (String metric : metrics) { + requireNonNull(metric, "Null metric is not allowed"); + } } } -- 2.39.5