From e80c0f3d1e5cd459f88b7e0c41a2d9a7519e260f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 27 Sep 2018 11:04:14 +0200 Subject: [PATCH] remove usage of Guava Optional from ComponentDao --- .../java/org/sonar/ce/queue/CeQueueImpl.java | 2 +- .../component/BranchPersisterImpl.java | 9 +++--- .../LoadReportAnalysisMetadataHolderStep.java | 2 +- .../step/ValidateProjectStep.java | 4 +-- .../filemove/FileMoveDetectionStepTest.java | 4 +-- .../step/ReportPersistComponentsStepTest.java | 3 +- .../sonar/ce/queue/InternalCeQueueImpl.java | 2 +- .../org/sonar/db/component/ComponentDao.java | 28 ++++++++++--------- .../sonar/db/component/ComponentDaoTest.java | 11 ++++---- .../sonar/server/webhook/WebHooksImpl.java | 4 +-- .../server/ce/queue/ReportSubmitter.java | 4 +-- .../org/sonar/server/ce/ws/CancelAction.java | 2 +- .../org/sonar/server/ce/ws/TaskAction.java | 10 +++---- .../server/component/ComponentFinder.java | 8 +++--- .../duplication/ws/DuplicationsParser.java | 6 ++-- .../duplication/ws/ShowResponseBuilder.java | 2 +- .../org/sonar/server/issue/IssueUpdater.java | 4 +-- .../sonar/server/issue/ws/AssignAction.java | 2 +- .../server/issue/ws/ChangelogAction.java | 4 +-- .../server/measure/ws/ComponentAction.java | 4 +-- .../sonar/server/project/ws/IndexAction.java | 4 +-- .../server/project/ws/UpdateKeyAction.java | 2 +- .../projectanalysis/ws/CreateEventAction.java | 2 +- .../sonar/server/property/ws/IndexAction.java | 4 +-- .../server/qualitygate/ws/DeselectAction.java | 2 +- .../server/qualitygate/ws/SelectAction.java | 2 +- .../qualityprofile/ws/SearchAction.java | 2 +- .../sonar/server/user/ServerUserSession.java | 4 +-- .../sonar/server/user/ws/CurrentAction.java | 4 +-- .../sonar/server/webhook/ws/CreateAction.java | 2 +- .../sonar/server/webhook/ws/DeleteAction.java | 2 +- .../sonar/server/webhook/ws/ListAction.java | 2 +- .../sonar/server/webhook/ws/UpdateAction.java | 2 +- .../component/ComponentServiceTest.java | 8 ++---- .../ComponentServiceUpdateKeyTest.java | 18 ++++++------ .../project/ws/UpdateKeyActionTest.java | 2 +- .../server/source/ws/ShowActionTest.java | 8 +++--- 37 files changed, 91 insertions(+), 94 deletions(-) diff --git a/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java index c11b41c2920..940c48eed66 100644 --- a/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java +++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java @@ -95,7 +95,7 @@ public class CeQueueImpl implements CeQueue { ComponentDto component = null; String componentUuid = taskDto.getComponentUuid(); if (componentUuid != null) { - component = dbClient.componentDao().selectByUuid(dbSession, componentUuid).orNull(); + component = dbClient.componentDao().selectByUuid(dbSession, componentUuid).orElse(null); } CeTask task = convertToTask(taskDto, submission.getCharacteristics(), component); return java.util.Optional.of(task); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java index 622922c9e56..8af513738c0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java @@ -20,16 +20,17 @@ package org.sonar.ce.task.projectanalysis.component; import java.util.Date; +import java.util.Optional; import javax.annotation.Nullable; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.BranchDto; import org.sonar.db.component.BranchType; import org.sonar.db.component.ComponentDto; import org.sonar.db.protobuf.DbProjectBranches; -import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.analysis.Branch; import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT; import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; @@ -51,7 +52,7 @@ public class BranchPersisterImpl implements BranchPersister { Branch branch = analysisMetadataHolder.getBranch(); String branchUuid = treeRootHolder.getRoot().getUuid(); - com.google.common.base.Optional branchComponentDtoOpt = dbClient.componentDao().selectByUuid(dbSession, branchUuid); + Optional branchComponentDtoOpt = dbClient.componentDao().selectByUuid(dbSession, branchUuid); ComponentDto branchComponentDto; if (branch.isMain()) { @@ -59,7 +60,7 @@ public class BranchPersisterImpl implements BranchPersister { branchComponentDto = branchComponentDtoOpt.get(); } else { // inserts new row in table projects if it's the first time branch is analyzed - branchComponentDto = branchComponentDtoOpt.or(() -> insertIntoProjectsTable(dbSession, branchUuid)); + branchComponentDto = branchComponentDtoOpt.orElseGet(() -> insertIntoProjectsTable(dbSession, branchUuid)); } // insert or update in table project_branches diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java index de73734d68a..9a0c3b1592e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java @@ -216,7 +216,7 @@ public class LoadReportAnalysisMetadataHolderStep implements ComputationStep { private ComponentDto toProject(String projectKey) { try (DbSession dbSession = dbClient.openSession(false)) { - com.google.common.base.Optional opt = dbClient.componentDao().selectByKey(dbSession, projectKey); + Optional opt = dbClient.componentDao().selectByKey(dbSession, projectKey); checkState(opt.isPresent(), "Project with key '%s' can't be found", projectKey); return opt.get(); } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStep.java index ce0b6ecc83b..62fa61f94ae 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStep.java @@ -20,11 +20,11 @@ package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Joiner; -import com.google.common.base.Optional; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Optional; import org.sonar.api.utils.MessageException; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; @@ -119,7 +119,7 @@ public class ValidateProjectStep implements ComputationStep { private void validateAnalysisDate(Optional baseProject) { if (baseProject.isPresent()) { - java.util.Optional snapshotDto = dbClient.snapshotDao().selectLastAnalysisByRootComponentUuid(session, baseProject.get().uuid()); + Optional snapshotDto = dbClient.snapshotDao().selectLastAnalysisByRootComponentUuid(session, baseProject.get().uuid()); long currentAnalysisDate = analysisMetadataHolder.getAnalysisDate(); Long lastAnalysisDate = snapshotDto.map(SnapshotDto::getCreatedAt).orElse(null); if (lastAnalysisDate != null && currentAnalysisDate <= lastAnalysisDate) { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest.java index b607a26399e..69b34878d28 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest.java @@ -571,7 +571,7 @@ public class FileMoveDetectionStepTest { @CheckForNull private FileSourceDto insertContentOfFileInDb(String key, @Nullable String[] content) { return dbTester.getDbClient().componentDao().selectByKey(dbTester.getSession(), key) - .transform(file -> { + .map(file -> { SourceLineHashesComputer linesHashesComputer = new SourceLineHashesComputer(); if (content != null) { stream(content).forEach(linesHashesComputer::addLine); @@ -584,7 +584,7 @@ public class FileMoveDetectionStepTest { dbTester.getDbClient().fileSourceDao().insert(dbTester.getSession(), fileSourceDto); dbTester.commit(); return fileSourceDto; - }).orNull(); + }).orElse(null); } private void setFilesInReport(Component... files) { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepTest.java index 2c284e10b9e..8d8ad129fea 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepTest.java @@ -19,9 +19,9 @@ */ package org.sonar.ce.task.projectanalysis.step; -import com.google.common.base.Optional; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -54,7 +54,6 @@ import org.sonar.server.project.Project; import static org.apache.commons.lang.StringUtils.isEmpty; import static org.apache.commons.lang.StringUtils.trimToNull; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java index 7e3edc896fa..61c801947bc 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java @@ -93,7 +93,7 @@ public class InternalCeQueueImpl extends CeQueueImpl implements InternalCeQueue ComponentDto component = null; String componentUuid = taskDto.getComponentUuid(); if (componentUuid != null) { - component = dbClient.componentDao().selectByUuid(dbSession, componentUuid).orNull(); + component = dbClient.componentDao().selectByUuid(dbSession, componentUuid).orElse(null); } Map characteristics = dbClient.ceTaskCharacteristicsDao().selectByTaskUuids(dbSession, singletonList(taskDto.getUuid())).stream() .collect(uniqueIndex(CeTaskCharacteristicDto::getKey, CeTaskCharacteristicDto::getValue)); diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java index 1e531a1e63a..413ddf5dfe0 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java @@ -19,15 +19,15 @@ */ package org.sonar.db.component; -import com.google.common.base.Optional; -import com.google.common.collect.Lists; import com.google.common.collect.Ordering; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Stream; import javax.annotation.CheckForNull; @@ -86,11 +86,11 @@ public class ComponentDao implements Dao { } public Optional selectById(DbSession session, long id) { - return Optional.fromNullable(mapper(session).selectById(id)); + return Optional.ofNullable(mapper(session).selectById(id)); } public Optional selectByUuid(DbSession session, String uuid) { - return Optional.fromNullable(mapper(session).selectByUuid(uuid)); + return Optional.ofNullable(mapper(session).selectByUuid(uuid)); } public ComponentDto selectOrFailByUuid(DbSession session, String uuid) { @@ -258,15 +258,15 @@ public class ComponentDao implements Dao { } public Optional selectByKey(DbSession session, String key) { - return Optional.fromNullable(mapper(session).selectByKey(key)); + return Optional.ofNullable(mapper(session).selectByKey(key)); } - public java.util.Optional selectByKeyAndBranch(DbSession session, String key, String branch) { - return java.util.Optional.ofNullable(mapper(session).selectByKeyAndBranchKey(key, generateBranchKey(key, branch), branch)); + public Optional selectByKeyAndBranch(DbSession session, String key, String branch) { + return Optional.ofNullable(mapper(session).selectByKeyAndBranchKey(key, generateBranchKey(key, branch), branch)); } - public java.util.Optional selectByKeyAndPullRequest(DbSession session, String key, String pullRequestId) { - return java.util.Optional.ofNullable(mapper(session).selectByKeyAndBranchKey(key, generatePullRequestKey(key, pullRequestId), pullRequestId)); + public Optional selectByKeyAndPullRequest(DbSession session, String key, String pullRequestId) { + return Optional.ofNullable(mapper(session).selectByKeyAndBranchKey(key, generatePullRequestKey(key, pullRequestId), pullRequestId)); } public List selectAllViewsAndSubViews(DbSession session) { @@ -366,13 +366,15 @@ public class ComponentDao implements Dao { } public void insert(DbSession session, Collection items) { - for (ComponentDto item : items) { - insert(session, item); - } + insert(session, items.stream()); + } + + private void insert(DbSession session, Stream items) { + items.forEach(item -> insert(session, item)); } public void insert(DbSession session, ComponentDto item, ComponentDto... others) { - insert(session, Lists.asList(item, others)); + insert(session, Stream.concat(Stream.of(item), Arrays.stream(others))); } public void update(DbSession session, ComponentUpdateDto component) { diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java index 650c82a0000..dcc384e544d 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java @@ -19,7 +19,6 @@ */ package org.sonar.db.component; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -29,6 +28,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Random; import java.util.Set; import java.util.function.Consumer; @@ -68,7 +68,6 @@ import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.Assertions.tuple; -import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.resources.Qualifiers.APP; import static org.sonar.api.resources.Qualifiers.PROJECT; import static org.sonar.api.utils.DateUtils.parseDate; @@ -136,7 +135,7 @@ public class ComponentDaoTest { assertThat(result.getCopyResourceUuid()).isNull(); assertThat(result.isPrivate()).isTrue(); - assertThat(underTest.selectByUuid(dbSession, "UNKNOWN")).isAbsent(); + assertThat(underTest.selectByUuid(dbSession, "UNKNOWN")).isEmpty(); } @Test @@ -211,7 +210,7 @@ public class ComponentDaoTest { assertThat(result.language()).isEqualTo("java"); assertThat(result.projectUuid()).isEqualTo(project.uuid()); - assertThat(underTest.selectByKey(dbSession, "unknown")).isAbsent(); + assertThat(underTest.selectByKey(dbSession, "unknown")).isEmpty(); } @Test @@ -393,7 +392,7 @@ public class ComponentDaoTest { ComponentDto project = db.components().insertPrivateProject(); assertThat(underTest.selectById(dbSession, project.getId())).isPresent(); - assertThat(underTest.selectById(dbSession, 0L)).isAbsent(); + assertThat(underTest.selectById(dbSession, 0L)).isEmpty(); } @Test @@ -1437,7 +1436,7 @@ public class ComponentDaoTest { underTest.delete(dbSession, project1.getId()); dbSession.commit(); - assertThat(underTest.selectByKey(dbSession, "PROJECT_1")).isAbsent(); + assertThat(underTest.selectByKey(dbSession, "PROJECT_1")).isEmpty(); assertThat(underTest.selectByKey(dbSession, "PROJECT_2")).isPresent(); } diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java index 26c432656f6..2548804f267 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java @@ -66,11 +66,11 @@ public class WebHooksImpl implements WebHooks { private Stream readWebHooksFrom(String projectUuid) { try (DbSession dbSession = dbClient.openSession(false)) { - Optional optionalComponentDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orNull()); + Optional optionalComponentDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orElse(null)); ComponentDto componentDto = checkStateWithOptional(optionalComponentDto, "the requested project '%s' was not found", projectUuid); if (componentDto.getMainBranchProjectUuid() != null && !componentDto.uuid().equals(componentDto.getMainBranchProjectUuid())) { - Optional mainBranchComponentDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, componentDto.getMainBranchProjectUuid()).orNull()); + Optional mainBranchComponentDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, componentDto.getMainBranchProjectUuid()).orElse(null)); componentDto = checkStateWithOptional(mainBranchComponentDto, "the requested project '%s' was not found", projectUuid); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java index 604db1297e7..69414944486 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java @@ -19,11 +19,11 @@ */ package org.sonar.server.ce.queue; -import com.google.common.base.Optional; import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; import javax.annotation.Nullable; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; @@ -82,7 +82,7 @@ public class ReportSubmitter { Optional component = dbClient.componentDao().selectByKey(dbSession, effectiveProjectKey); validateProject(dbSession, component, projectKey); ensureOrganizationIsConsistent(component, organizationDto); - ComponentDto project = component.or(() -> createProject(dbSession, organizationDto, projectKey, deprecatedBranch, projectName)); + ComponentDto project = component.orElseGet(() -> createProject(dbSession, organizationDto, projectKey, deprecatedBranch, projectName)); checkScanPermission(project); return submitReport(dbSession, reportInput, project, characteristics); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java index 596eb6f47ce..21b86b86f13 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/CancelAction.java @@ -92,7 +92,7 @@ public class CancelAction implements CeWsAction { if (componentUuid == null) { throw insufficientPrivilegesException(); } - com.google.common.base.Optional component = dbClient.componentDao().selectByUuid(dbSession, componentUuid); + Optional component = dbClient.componentDao().selectByUuid(dbSession, componentUuid); if (!component.isPresent()) { throw insufficientPrivilegesException(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java index 08267268aec..0d1305b6216 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/TaskAction.java @@ -95,12 +95,12 @@ public class TaskAction implements CeWsAction { Ce.TaskResponse.Builder wsTaskResponse = Ce.TaskResponse.newBuilder(); Optional queueDto = dbClient.ceQueueDao().selectByUuid(dbSession, taskUuid); if (queueDto.isPresent()) { - com.google.common.base.Optional component = loadComponent(dbSession, queueDto.get().getComponentUuid()); + Optional component = loadComponent(dbSession, queueDto.get().getComponentUuid()); checkPermission(component); wsTaskResponse.setTask(wsTaskFormatter.formatQueue(dbSession, queueDto.get())); } else { CeActivityDto ceActivityDto = WsUtils.checkFoundWithOptional(dbClient.ceActivityDao().selectByUuid(dbSession, taskUuid), "No activity found for task '%s'", taskUuid); - com.google.common.base.Optional component = loadComponent(dbSession, ceActivityDto.getComponentUuid()); + Optional component = loadComponent(dbSession, ceActivityDto.getComponentUuid()); checkPermission(component); Set additionalFields = AdditionalField.getFromRequest(wsRequest); maskErrorStacktrace(ceActivityDto, additionalFields); @@ -111,14 +111,14 @@ public class TaskAction implements CeWsAction { } } - private com.google.common.base.Optional loadComponent(DbSession dbSession, @Nullable String projectUuid) { + private Optional loadComponent(DbSession dbSession, @Nullable String projectUuid) { if (projectUuid == null) { - return com.google.common.base.Optional.absent(); + return Optional.empty(); } return dbClient.componentDao().selectByUuid(dbSession, projectUuid); } - private void checkPermission(com.google.common.base.Optional component) { + private void checkPermission(Optional component) { if (component.isPresent()) { String orgUuid = component.get().getOrganizationUuid(); if (!userSession.hasPermission(OrganizationPermission.ADMINISTER, orgUuid) && diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java index 333f6ad0ab0..54f408731a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java @@ -19,8 +19,8 @@ */ package org.sonar.server.component; -import com.google.common.base.Optional; import java.util.Collection; +import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; import org.sonar.api.resources.Qualifiers; @@ -129,7 +129,7 @@ public class ComponentFinder { public OrganizationDto getOrganization(DbSession dbSession, ComponentDto component) { String organizationUuid = component.getOrganizationUuid(); - java.util.Optional organizationDto = dbClient.organizationDao().selectByUuid(dbSession, organizationUuid); + Optional organizationDto = dbClient.organizationDao().selectByUuid(dbSession, organizationUuid); return checkFoundWithOptional(organizationDto, "Organization with uuid '%s' not found", organizationUuid); } @@ -137,7 +137,7 @@ public class ComponentFinder { * Components of the main branch won't be found */ public ComponentDto getByKeyAndBranch(DbSession dbSession, String key, String branch) { - java.util.Optional componentDto = dbClient.componentDao().selectByKeyAndBranch(dbSession, key, branch); + Optional componentDto = dbClient.componentDao().selectByKeyAndBranch(dbSession, key, branch); if (componentDto.isPresent() && componentDto.get().isEnabled()) { return componentDto.get(); } @@ -145,7 +145,7 @@ public class ComponentFinder { } public ComponentDto getByKeyAndPullRequest(DbSession dbSession, String key, String pullRequest) { - java.util.Optional componentDto = dbClient.componentDao().selectByKeyAndPullRequest(dbSession, key, pullRequest); + Optional componentDto = dbClient.componentDao().selectByKeyAndPullRequest(dbSession, key, pullRequest); if (componentDto.isPresent() && componentDto.get().isEnabled()) { return componentDto.get(); } 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 1b9fb9908fe..e56b873797e 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 @@ -20,13 +20,13 @@ package org.sonar.server.duplication.ws; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import java.io.Serializable; import java.io.StringReader; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.xml.stream.XMLInputFactory; @@ -90,9 +90,9 @@ public class DuplicationsParser { if (component == null) { Optional componentDtoOptional; if (branch != null) { - componentDtoOptional = Optional.fromNullable(componentDao.selectByKeyAndBranch(session, componentKey, branch).orElseGet(null)); + componentDtoOptional = Optional.ofNullable(componentDao.selectByKeyAndBranch(session, componentKey, branch).orElseGet(null)); } else if (pullRequest != null) { - componentDtoOptional = Optional.fromNullable(componentDao.selectByKeyAndPullRequest(session, componentKey, pullRequest).orElseGet(null)); + componentDtoOptional = Optional.ofNullable(componentDao.selectByKeyAndPullRequest(session, componentKey, pullRequest).orElseGet(null)); } else { componentDtoOptional = componentDao.selectByKey(session, componentKey); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java index f6050bc6527..7f792ca70d7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java @@ -20,9 +20,9 @@ package org.sonar.server.duplication.ws; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import java.util.List; import java.util.Map; +import java.util.Optional; import javax.annotation.Nullable; import org.sonar.db.DbClient; import org.sonar.db.DbSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java index 9f96db62e23..d7e0ca2e95b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java @@ -50,7 +50,7 @@ public class IssueUpdater { private final IssueChangePostProcessor issueChangePostProcessor; public IssueUpdater(DbClient dbClient, WebIssueStorage issueStorage, NotificationManager notificationService, - IssueChangePostProcessor issueChangePostProcessor) { + IssueChangePostProcessor issueChangePostProcessor) { this.dbClient = dbClient; this.issueStorage = issueStorage; this.notificationService = notificationService; @@ -112,7 +112,7 @@ public class IssueUpdater { private ComponentDto getComponent(DbSession dbSession, DefaultIssue issue, @Nullable String componentUuid) { String issueKey = issue.key(); checkState(componentUuid != null, "Issue '%s' has no component", issueKey); - ComponentDto component = dbClient.componentDao().selectByUuid(dbSession, componentUuid).orNull(); + ComponentDto component = dbClient.componentDao().selectByUuid(dbSession, componentUuid).orElse(null); checkState(component != null, "Component uuid '%s' for issue key '%s' cannot be found", componentUuid, issueKey); return component; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java index a44ea87e12a..4dca280fecd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AssignAction.java @@ -148,7 +148,7 @@ public class AssignAction implements IssuesWsAction { private void checkMembership(DbSession dbSession, IssueDto issueDto, UserDto user) { String projectUuid = requireNonNull(issueDto.getProjectUuid()); - ComponentDto project = Optional.ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orNull()) + ComponentDto project = Optional.ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orElse(null)) .orElseThrow(() -> new IllegalStateException(format("Unknown project %s", projectUuid))); OrganizationDto organizationDto = dbClient.organizationDao().selectByUuid(dbSession, project.getOrganizationUuid()) .orElseThrow(() -> new IllegalStateException(format("Unknown organizationMember %s", project.getOrganizationUuid()))); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java index 655bed2a98d..15098897b0c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java @@ -19,12 +19,12 @@ */ package org.sonar.server.issue.ws; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; @@ -177,7 +177,7 @@ public class ChangelogAction implements IssuesWsAction { private boolean isMember(DbSession dbSession, IssueDto issue) { Optional project = dbClient.componentDao().selectByUuid(dbSession, issue.getProjectUuid()); checkState(project.isPresent(), "Cannot find the project with uuid %s from issue.id %s", issue.getProjectUuid(), issue.getId()); - java.util.Optional organization = dbClient.organizationDao().selectByUuid(dbSession, project.get().getOrganizationUuid()); + Optional organization = dbClient.organizationDao().selectByUuid(dbSession, project.get().getOrganizationUuid()); checkState(organization.isPresent(), "Cannot find the organization with uuid %s from issue.id %s", project.get().getOrganizationUuid(), issue.getId()); return userSession.hasMembership(organization.get()); } 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 f6257345fad..7ca9a245334 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 @@ -20,7 +20,6 @@ package org.sonar.server.measure.ws; import com.google.common.base.Joiner; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -29,6 +28,7 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -176,7 +176,7 @@ public class ComponentAction implements MeasuresWsAction { private Optional getReferenceComponent(DbSession dbSession, ComponentDto component) { if (component.getCopyResourceUuid() == null) { - return Optional.absent(); + return Optional.empty(); } return dbClient.componentDao().selectByUuid(dbSession, component.getCopyResourceUuid()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java index e936fd5b6e0..e42019715cd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/IndexAction.java @@ -125,9 +125,9 @@ public class IndexAction implements ProjectsWsAction { private Optional getProjectByKeyOrId(DbSession dbSession, String component) { try { Long componentId = Long.parseLong(component); - return ofNullable(dbClient.componentDao().selectById(dbSession, componentId).orNull()); + return ofNullable(dbClient.componentDao().selectById(dbSession, componentId).orElse(null)); } catch (NumberFormatException e) { - return ofNullable(dbClient.componentDao().selectByKey(dbSession, component).orNull()); + return ofNullable(dbClient.componentDao().selectByKey(dbSession, component).orElse(null)); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java index 16bd63ab837..6e78a7f5dc5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/UpdateKeyAction.java @@ -19,7 +19,7 @@ */ package org.sonar.server.project.ws; -import com.google.common.base.Optional; +import java.util.Optional; import org.sonar.api.server.ws.Change; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java index 3f2046c8fff..d9affb813bd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java @@ -140,7 +140,7 @@ public class CreateEventAction implements ProjectAnalysesWsAction { } private ComponentDto getProjectOrApplication(DbSession dbSession, SnapshotDto analysis) { - ComponentDto project = dbClient.componentDao().selectByUuid(dbSession, analysis.getComponentUuid()).orNull(); + ComponentDto project = dbClient.componentDao().selectByUuid(dbSession, analysis.getComponentUuid()).orElse(null); checkState(project != null, "Project of analysis '%s' is not found", analysis.getUuid()); checkArgument(ALLOWED_QUALIFIERS.contains(project.qualifier()) && Scopes.PROJECT.equals(project.scope()), "An event must be created on a project or an application"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java index e741ed28bf6..7af3bd74d13 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java @@ -121,9 +121,9 @@ public class IndexAction implements WsAction { private Optional loadComponent(DbSession dbSession, String component) { try { Long componentId = Long.parseLong(component); - return Optional.ofNullable(dbClient.componentDao().selectById(dbSession, componentId).orNull()); + return Optional.ofNullable(dbClient.componentDao().selectById(dbSession, componentId).orElse(null)); } catch (NumberFormatException e) { - return Optional.ofNullable(dbClient.componentDao().selectByKey(dbSession, component).orNull()); + return Optional.ofNullable(dbClient.componentDao().selectByKey(dbSession, component).orElse(null)); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java index 3240159cff7..44247cf4140 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java @@ -106,7 +106,7 @@ public class DeselectAction implements QualityGatesWsAction { try { long dbId = Long.parseLong(projectId); - return Optional.ofNullable(dbClient.componentDao().selectById(dbSession, dbId).orNull()); + return Optional.ofNullable(dbClient.componentDao().selectById(dbSession, dbId).orElse(null)); } catch (NumberFormatException e) { return Optional.empty(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java index 94606de76d6..fae72d0ad45 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java @@ -118,7 +118,7 @@ public class SelectAction implements QualityGatesWsAction { try { long dbId = Long.parseLong(projectId); - return Optional.ofNullable(dbClient.componentDao().selectById(dbSession, dbId).orNull()); + return Optional.ofNullable(dbClient.componentDao().selectById(dbSession, dbId).orElse(null)); } catch (NumberFormatException e) { return Optional.empty(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java index 0a6ce961f5f..6714fb217e5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java @@ -185,7 +185,7 @@ public class SearchAction implements QProfileWsAction { if (project.isRoot()) { return project; } - ComponentDto component = dbClient.componentDao().selectByUuid(dbSession, project.projectUuid()).orNull(); + ComponentDto component = dbClient.componentDao().selectByUuid(dbSession, project.projectUuid()).orElse(null); checkState(component != null, "Project uuid of component uuid '%s' does not exist", project.uuid()); return component; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java index 9ab2cb3c954..693d4fe353c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java @@ -167,7 +167,7 @@ public class ServerUserSession extends AbstractUserSession { return of(projectUuid); } try (DbSession dbSession = dbClient.openSession(false)) { - com.google.common.base.Optional component = dbClient.componentDao().selectByUuid(dbSession, componentUuid); + Optional component = dbClient.componentDao().selectByUuid(dbSession, componentUuid); if (!component.isPresent()) { return Optional.empty(); } @@ -190,7 +190,7 @@ public class ServerUserSession extends AbstractUserSession { private Set loadProjectPermissions(String projectUuid) { try (DbSession dbSession = dbClient.openSession(false)) { - com.google.common.base.Optional component = dbClient.componentDao().selectByUuid(dbSession, projectUuid); + Optional component = dbClient.componentDao().selectByUuid(dbSession, projectUuid); if (!component.isPresent()) { return Collections.emptySet(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java index d6bc1c92651..796195825f8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java @@ -164,7 +164,7 @@ public class CurrentAction implements UsersWsAction { } private Optional projectHomepage(DbSession dbSession, UserDto user) { - Optional projectOptional = ofNullable(dbClient.componentDao().selectByUuid(dbSession, of(user.getHomepageParameter()).orElse(EMPTY)).orNull()); + Optional projectOptional = ofNullable(dbClient.componentDao().selectByUuid(dbSession, of(user.getHomepageParameter()).orElse(EMPTY)).orElse(null)); if (shouldCleanProjectHomepage(projectOptional)) { cleanUserHomepageInDb(dbSession, user); return empty(); @@ -182,7 +182,7 @@ public class CurrentAction implements UsersWsAction { } private Optional applicationAndPortfolioHomepage(DbSession dbSession, UserDto user) { - Optional componentOptional = ofNullable(dbClient.componentDao().selectByUuid(dbSession, of(user.getHomepageParameter()).orElse(EMPTY)).orNull()); + Optional componentOptional = ofNullable(dbClient.componentDao().selectByUuid(dbSession, of(user.getHomepageParameter()).orElse(EMPTY)).orElse(null)); if (shouldCleanApplicationOrPortfolioHomepage(componentOptional)) { cleanUserHomepageInDb(dbSession, user); return empty(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/CreateAction.java index dc584ac28cc..03028383907 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/CreateAction.java @@ -138,7 +138,7 @@ public class CreateAction implements WebhooksWsAction { ComponentDto projectDto = null; if (isNotBlank(projectKey)) { - Optional dtoOptional = ofNullable(dbClient.componentDao().selectByKey(dbSession, projectKey).orNull()); + Optional dtoOptional = ofNullable(dbClient.componentDao().selectByKey(dbSession, projectKey).orElse(null)); ComponentDto componentDto = checkFoundWithOptional(dtoOptional, "No project with key '%s'", projectKey); webhookSupport.checkThatProjectBelongsToOrganization(componentDto, organizationDto, "Project '%s' does not belong to organisation '%s'", projectKey, organizationKey); webhookSupport.checkPermission(componentDto); diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java index 988f43eb657..235c3e8a1b8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/DeleteAction.java @@ -91,7 +91,7 @@ public class DeleteAction implements WebhooksWsAction { String projectUuid = webhookDto.getProjectUuid(); if (projectUuid != null) { - Optional optionalDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orNull()); + Optional optionalDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orElse(null)); ComponentDto componentDto = checkStateWithOptional(optionalDto, "the requested project '%s' was not found", projectUuid); webhookSupport.checkPermission(componentDto); deleteWebhook(dbSession, webhookDto); diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/ListAction.java index cc8f70ab27c..42d2542f952 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/ListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/ListAction.java @@ -119,7 +119,7 @@ public class ListAction implements WebhooksWsAction { if (isNotBlank(projectKey)) { - Optional optional = ofNullable(dbClient.componentDao().selectByKey(dbSession, projectKey).orNull()); + Optional optional = ofNullable(dbClient.componentDao().selectByKey(dbSession, projectKey).orElse(null)); ComponentDto componentDto = checkFoundWithOptional(optional, "project %s does not exist", projectKey); webhookSupport.checkPermission(componentDto); webhookSupport.checkThatProjectBelongsToOrganization(componentDto, organizationDto, "Project '%s' does not belong to organisation '%s'", projectKey, organizationKey); diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java index 79e552d4561..c74a1f8f4f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/webhook/ws/UpdateAction.java @@ -113,7 +113,7 @@ public class UpdateAction implements WebhooksWsAction { String projectUuid = webhookDto.getProjectUuid(); if (projectUuid != null) { - Optional optionalDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orNull()); + Optional optionalDto = ofNullable(dbClient.componentDao().selectByUuid(dbSession, projectUuid).orElse(null)); ComponentDto componentDto = checkStateWithOptional(optionalDto, "the requested project '%s' was not found", projectUuid); webhookSupport.checkPermission(componentDto); updateWebhook(dbSession, webhookDto, name, url); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java index 420f1c049d4..01cf4144d73 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java @@ -33,7 +33,7 @@ import org.sonar.server.es.TestProjectIndexers; import org.sonar.server.project.ProjectLifeCycleListeners; import org.sonar.server.tester.UserSessionRule; -import static org.assertj.guava.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newModuleDto; @@ -73,12 +73,8 @@ public class ComponentServiceTest { } private void assertComponentKeyUpdated(String oldKey, String newKey) { - assertThat(dbClient.componentDao().selectByKey(dbSession, oldKey)).isAbsent(); + assertThat(dbClient.componentDao().selectByKey(dbSession, oldKey)).isEmpty(); assertThat(dbClient.componentDao().selectByKey(dbSession, newKey)).isPresent(); } - private void assertComponentKeyNotUpdated(String key) { - assertThat(dbClient.componentDao().selectByKey(dbSession, key)).isPresent(); - } - } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java index 08443427b21..a9f3a20494d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java @@ -41,7 +41,7 @@ import org.sonar.server.project.RekeyedProject; import org.sonar.server.tester.UserSessionRule; import static java.util.Collections.emptyList; -import static org.assertj.guava.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.sonar.db.component.ComponentTesting.newFileDto; @@ -78,17 +78,17 @@ public class ComponentServiceUpdateKeyTest { dbSession.commit(); // Check project key has been updated - assertThat(db.getDbClient().componentDao().selectByKey(dbSession, project.getDbKey())).isAbsent(); + assertThat(db.getDbClient().componentDao().selectByKey(dbSession, project.getDbKey())).isEmpty(); assertThat(db.getDbClient().componentDao().selectByKey(dbSession, "sample2:root")).isNotNull(); // Check file key has been updated - assertThat(db.getDbClient().componentDao().selectByKey(dbSession, file.getDbKey())).isAbsent(); + assertThat(db.getDbClient().componentDao().selectByKey(dbSession, file.getDbKey())).isEmpty(); assertThat(db.getDbClient().componentDao().selectByKey(dbSession, "sample2:root:src/File.xoo")).isNotNull(); assertThat(db.getDbClient().componentDao().selectByKey(dbSession, "sample2:root:src/InactiveFile.xoo")).isNotNull(); - assertThat(dbClient.componentDao().selectByKey(dbSession, inactiveFile.getDbKey())).isAbsent(); + assertThat(dbClient.componentDao().selectByKey(dbSession, inactiveFile.getDbKey())).isEmpty(); - org.assertj.core.api.Assertions.assertThat(projectIndexers.hasBeenCalled(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue(); + assertThat(projectIndexers.hasBeenCalled(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue(); } @Test @@ -108,7 +108,7 @@ public class ComponentServiceUpdateKeyTest { assertComponentKeyHasBeenUpdated(file.getDbKey(), "sample:root2:module:src/File.xoo"); // do not index the module but the project - org.assertj.core.api.Assertions.assertThat(projectIndexers.hasBeenCalled(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue(); + assertThat(projectIndexers.hasBeenCalled(project.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue(); } @Test @@ -122,7 +122,7 @@ public class ComponentServiceUpdateKeyTest { dbSession.commit(); assertComponentKeyHasBeenUpdated(provisionedProject.getDbKey(), "provisionedProject2"); - org.assertj.core.api.Assertions.assertThat(projectIndexers.hasBeenCalled(provisionedProject.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue(); + assertThat(projectIndexers.hasBeenCalled(provisionedProject.uuid(), ProjectIndexer.Cause.PROJECT_KEY_UPDATE)).isTrue(); } @Test @@ -219,7 +219,7 @@ public class ComponentServiceUpdateKeyTest { } private void assertComponentKeyUpdated(String oldKey, String newKey) { - assertThat(dbClient.componentDao().selectByKey(dbSession, oldKey)).isAbsent(); + assertThat(dbClient.componentDao().selectByKey(dbSession, oldKey)).isEmpty(); assertThat(dbClient.componentDao().selectByKey(dbSession, newKey)).isPresent(); } @@ -233,7 +233,7 @@ public class ComponentServiceUpdateKeyTest { } private void assertComponentKeyHasBeenUpdated(String oldKey, String newKey) { - assertThat(dbClient.componentDao().selectByKey(dbSession, oldKey)).isAbsent(); + assertThat(dbClient.componentDao().selectByKey(dbSession, oldKey)).isEmpty(); assertThat(dbClient.componentDao().selectByKey(dbSession, newKey)).isPresent(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java index f397bba193e..a99209ae8e7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java @@ -19,7 +19,7 @@ */ package org.sonar.server.project.ws; -import com.google.common.base.Optional; +import java.util.Optional; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java index fee0c08eed8..27037f1e4ea 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java @@ -82,7 +82,7 @@ public class ShowActionTest { public void show_source() throws Exception { String fileKey = "src/Foo.java"; userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); - when(componentDao.selectByKey(session, fileKey)).thenReturn(com.google.common.base.Optional.of(file)); + when(componentDao.selectByKey(session, fileKey)).thenReturn(Optional.of(file)); when(sourceService.getLinesAsHtml(eq(session), eq(file.uuid()), anyInt(), anyInt())).thenReturn(Optional.of(newArrayList( "/*", " * Header", @@ -99,7 +99,7 @@ public class ShowActionTest { public void show_source_with_from_and_to_params() throws Exception { String fileKey = "src/Foo.java"; userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); - when(componentDao.selectByKey(session, fileKey)).thenReturn(com.google.common.base.Optional.of(file)); + when(componentDao.selectByKey(session, fileKey)).thenReturn(Optional.of(file)); when(sourceService.getLinesAsHtml(session, file.uuid(), 3, 5)).thenReturn(Optional.of(newArrayList( " */", "", @@ -116,7 +116,7 @@ public class ShowActionTest { public void show_source_accept_from_less_than_one() throws Exception { String fileKey = "src/Foo.java"; userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); - when(componentDao.selectByKey(session, fileKey)).thenReturn(com.google.common.base.Optional.of(file)); + when(componentDao.selectByKey(session, fileKey)).thenReturn(Optional.of(file)); when(sourceService.getLinesAsHtml(session, file.uuid(), 1, 5)).thenReturn(Optional.of(newArrayList( " */", "", @@ -133,7 +133,7 @@ public class ShowActionTest { @Test(expected = ForbiddenException.class) public void require_code_viewer() throws Exception { String fileKey = "src/Foo.java"; - when(componentDao.selectByKey(session, fileKey)).thenReturn(com.google.common.base.Optional.of(file)); + when(componentDao.selectByKey(session, fileKey)).thenReturn(Optional.of(file)); tester.newGetRequest("api/sources", "show").setParam("key", fileKey).execute(); } } -- 2.39.5