diff options
18 files changed, 18 insertions, 18 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java index 74122a39206..df6dbdd5010 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ShowAction.java @@ -35,7 +35,7 @@ import org.sonar.server.user.UserSession; import org.sonarqube.ws.WsComponents.ShowWsResponse; import org.sonarqube.ws.client.component.ShowWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static java.lang.String.format; import static java.util.Collections.emptyList; import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java index 407eda1e2d1..6c318f50ce1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java @@ -51,7 +51,7 @@ import org.sonar.server.user.UserSession; import org.sonarqube.ws.WsComponents.TreeWsResponse; import org.sonarqube.ws.client.component.TreeWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Sets.newHashSet; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java index 4f235fd89fb..de4e6e39ca6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java @@ -24,7 +24,7 @@ import javax.annotation.Nonnull; import org.sonar.db.metric.MetricDto; import org.sonar.server.computation.measure.Measure; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; enum MetricDtoToMetric implements Function<MetricDto, Metric> { INSTANCE; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java index cbc26d30639..31134c8d61b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterJsonWriter.java @@ -25,7 +25,7 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.user.UserSession; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; class IssueFilterJsonWriter { diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java index ffe497b57b6..72bb2c58e7c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentAction.java @@ -54,7 +54,7 @@ import org.sonarqube.ws.WsMeasures; import org.sonarqube.ws.WsMeasures.ComponentWsResponse; import org.sonarqube.ws.client.measure.ComponentWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; import static java.util.Collections.emptyList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java index 7397e2cfe6d..d386def59a3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java @@ -59,7 +59,7 @@ import org.sonar.server.user.UserSession; import org.sonarqube.ws.WsMeasures; import org.sonarqube.ws.client.measure.ComponentTreeWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java index c7359fcd7c5..bf11e1f9813 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java @@ -39,7 +39,7 @@ import org.sonarqube.ws.WsPermissions.Group; import org.sonarqube.ws.WsPermissions.WsGroupsResponse; import org.sonarqube.ws.client.permission.GroupsWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentDto; import static org.sonar.server.permission.ws.PermissionQueryParser.fromSelectionModeToMembership; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateGlobalPermission; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java index a165fe5cf40..ffc42271422 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java @@ -28,7 +28,7 @@ import java.util.Set; import org.sonar.api.utils.Paging; import org.sonar.db.component.ComponentDto; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.copyOf; import static com.google.common.collect.ImmutableTable.copyOf; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java index e5cdacac106..1e8303d7b54 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java @@ -38,7 +38,7 @@ import org.sonarqube.ws.WsPermissions; import org.sonarqube.ws.WsPermissions.UsersWsResponse; import org.sonarqube.ws.client.permission.UsersWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Strings.nullToEmpty; import static org.sonar.api.utils.Paging.forPageIndex; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java index 7c9d60e832a..79795d4a2e0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java @@ -27,7 +27,7 @@ import java.util.Set; import org.sonar.db.permission.PermissionTemplateDto; import org.sonar.server.permission.ws.template.DefaultPermissionTemplateFinder.TemplateUuidQualifier; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.copyOf; import static com.google.common.collect.ImmutableTable.copyOf; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java index 9475c7bb550..979147722e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java @@ -36,7 +36,7 @@ import org.sonarqube.ws.WsPermissions.PermissionTemplate; import org.sonarqube.ws.WsPermissions.UpdateTemplateWsResponse; import org.sonarqube.ws.client.permission.UpdateTemplateWsRequest; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static java.lang.String.format; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; import static org.sonar.server.permission.ws.PermissionRequestValidator.MSG_TEMPLATE_WITH_SAME_NAME; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java index 876724aa804..6910c34e515 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import org.sonar.server.qualityprofile.QProfile; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.ImmutableList.copyOf; import static com.google.common.collect.ImmutableMap.copyOf; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java index 4aae003f5ef..7f9d97d310b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java @@ -40,7 +40,7 @@ import org.sonar.server.es.SearchResult; import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserIndex; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static org.sonar.server.es.SearchOptions.MAX_LIMIT; public class SearchAction implements UsersWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java index 17473174f89..d2b535b16b2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java @@ -30,7 +30,7 @@ import org.jruby.RubyFile; import org.sonar.api.server.ws.internal.ValidatingRequest; import org.sonarqube.ws.MediaTypes; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static org.apache.commons.lang.StringUtils.substringAfterLast; public class ServletRequest extends ValidatingRequest { diff --git a/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipQuery.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipQuery.java index 1432d460bae..596c32d9366 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipQuery.java @@ -25,7 +25,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/sonar-db/src/main/java/org/sonar/db/user/UserMembershipQuery.java b/sonar-db/src/main/java/org/sonar/db/user/UserMembershipQuery.java index cde9d72b651..1252f9b4675 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/UserMembershipQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserMembershipQuery.java @@ -25,7 +25,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java index 3400be34f18..941fa587022 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java @@ -34,7 +34,7 @@ import org.sonar.api.batch.InstantiationStrategy; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static org.apache.commons.lang.StringUtils.isNotBlank; diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java index a3e58803a71..af6a0efe228 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java @@ -27,7 +27,7 @@ import org.sonar.api.config.Settings; import java.util.List; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; @BatchSide public abstract class AbstractPatternInitializer { |