aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sonar-core/src/main/java/org/sonar/core/profiling/LoggingWatch.java8
-rw-r--r--sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java6
2 files changed, 9 insertions, 5 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/profiling/LoggingWatch.java b/sonar-core/src/main/java/org/sonar/core/profiling/LoggingWatch.java
index 286be7731a1..0a53166b1a6 100644
--- a/sonar-core/src/main/java/org/sonar/core/profiling/LoggingWatch.java
+++ b/sonar-core/src/main/java/org/sonar/core/profiling/LoggingWatch.java
@@ -29,14 +29,14 @@ class LoggingWatch extends StopWatch {
private System2 system;
private long startTimeInMillis;
- LoggingWatch(Logger logger) {
- this(logger, System2.INSTANCE);
+ LoggingWatch(Logger LOGGER) {
+ this(LOGGER, System2.INSTANCE);
}
@VisibleForTesting
- LoggingWatch(Logger logger, System2 system) {
+ LoggingWatch(Logger LOGGER, System2 system) {
this.system = system;
- this.logger = logger;
+ this.logger = LOGGER;
this.startTimeInMillis = system.now();
}
diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
index d390016ba89..c5378ca8332 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
@@ -20,6 +20,9 @@
package org.sonar.core.qualityprofile.db;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+
public class QualityProfileDto {
private Integer id;
@@ -56,11 +59,12 @@ public class QualityProfileDto {
return this;
}
+ @CheckForNull
public String getParent() {
return parent;
}
- public QualityProfileDto setParent(String parent) {
+ public QualityProfileDto setParent(@Nullable String parent) {
this.parent = parent;
return this;
}