From 885d0923655cabdab83d1268b2c8c271ec7c0cc0 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 11 Dec 2014 10:15:41 +0100 Subject: [PATCH] Fix quality flaws --- .../db/migrations/v51/FeedUsersLongDates.java | 49 +++++++++++-------- .../duplication/ws/DuplicationsParser.java | 5 +- .../server/measure/MeasureFilterFactory.java | 7 ++- .../sonar/server/rule/ws/CreateAction.java | 4 +- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java index 5311c4285e6..5324120c6e3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java @@ -40,33 +40,40 @@ public class FeedUsersLongDates extends BaseDataChange { @Override public void execute(Context context) throws SQLException { - final long now = system.now(); - MassUpdate massUpdate = context.prepareMassUpdate(); massUpdate.select("SELECT u.id, u.created_at, u.updated_at FROM users u WHERE created_at_ms IS NULL"); massUpdate.update("UPDATE users SET created_at_ms=?, updated_at_ms=? WHERE id=?"); massUpdate.rowPluralName("users"); - massUpdate.execute(new MassUpdate.Handler() { - @Override - public boolean handle(Select.Row row, SqlStatement update) throws SQLException { - Long id = row.getLong(1); - Date createdAt = row.getDate(2); - Date updatedAt = row.getDate(3); + massUpdate.execute(new RowHandler(system.now())); + } + + private static class RowHandler implements MassUpdate.Handler { + + private final long now; - if (createdAt == null) { - update.setLong(1, now); - } else { - update.setLong(1, Math.min(now, createdAt.getTime())); - } - if (updatedAt == null) { - update.setLong(2, now); - } else { - update.setLong(2, Math.min(now, updatedAt.getTime())); - } - update.setLong(3, id); - return true; + private RowHandler(long now) { + this.now = now; + } + + @Override + public boolean handle(Select.Row row, SqlStatement update) throws SQLException { + Long id = row.getLong(1); + Date createdAt = row.getDate(2); + Date updatedAt = row.getDate(3); + + if (createdAt == null) { + update.setLong(1, now); + } else { + update.setLong(1, Math.min(now, createdAt.getTime())); + } + if (updatedAt == null) { + update.setLong(2, now); + } else { + update.setLong(2, Math.min(now, updatedAt.getTime())); } - }); + update.setLong(3, id); + return true; + } } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java index 7b607a8e7d4..2da4ffc443c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java @@ -35,7 +35,6 @@ import javax.annotation.Nullable; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import java.io.Serializable; import java.io.StringReader; import java.util.Collections; import java.util.Comparator; @@ -104,7 +103,7 @@ public class DuplicationsParser implements ServerComponent { } @VisibleForTesting - static class DuplicationComparator implements Comparator, Serializable { + static class DuplicationComparator implements Comparator { private final ComponentDto component; @@ -146,7 +145,7 @@ public class DuplicationsParser implements ServerComponent { } } - private static class BlockComparator implements Comparator, Serializable { + private static class BlockComparator implements Comparator { @Override public int compare(@Nullable Block b1, @Nullable Block b2) { 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 d572a320bfa..f9f3df84086 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 @@ -170,8 +170,11 @@ public class MeasureFilterFactory implements ServerComponent { }); String val = "('" + Joiner.on("', '").skipNulls().join(alertLevelsUppercase) + "')"; Metric metric = metricFinder.findByKey(CoreMetrics.ALERT_STATUS_KEY); - MeasureFilterCondition.Operator operator = MeasureFilterCondition.Operator.fromCode("in"); - return new MeasureFilterCondition(metric, operator, val); + if (metric != null) { + MeasureFilterCondition.Operator operator = MeasureFilterCondition.Operator.fromCode("in"); + return new MeasureFilterCondition(metric, operator, val); + } + return null; } private List toList(@Nullable Object obj) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java index e21ad4f8796..0c823713fb5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java @@ -133,7 +133,7 @@ public class CreateAction implements RequestHandler { .setMarkdownDescription(request.mandatoryParam(PARAM_DESCRIPTION)) .setSeverity(request.mandatoryParam(PARAM_SEVERITY)) .setStatus(RuleStatus.valueOf(request.mandatoryParam(PARAM_STATUS))) - .setPreventReactivation(request.paramAsBoolean(PARAM_PREVENT_REACTIVATION)); + .setPreventReactivation(request.mandatoryParamAsBoolean(PARAM_PREVENT_REACTIVATION)); String params = request.param(PARAMS); if (!Strings.isNullOrEmpty(params)) { newRule.setParameters(KeyValueFormat.parse(params)); @@ -146,7 +146,7 @@ public class CreateAction implements RequestHandler { .setName(request.mandatoryParam(PARAM_NAME)) .setMarkdownDescription(request.mandatoryParam(PARAM_DESCRIPTION)) .setSeverity(request.param(PARAM_SEVERITY)) - .setPreventReactivation(request.paramAsBoolean(PARAM_PREVENT_REACTIVATION)); + .setPreventReactivation(request.mandatoryParamAsBoolean(PARAM_PREVENT_REACTIVATION)); writeResponse(response, service.create(newRule)); } } catch (ReactivationException e) { -- 2.39.5