diff --git a/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProvider.java b/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProvider.java index d7807e451..06528f463 100644 --- a/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProvider.java +++ b/src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProvider.java @@ -94,7 +94,7 @@ public DecorationResult createCheckRun(AnalysisDetails analysisDetails, AlmSetti ProjectAlmSettingDto projectAlmSettingDto) throws IOException, GeneralSecurityException { String apiUrl = Optional.ofNullable(almSettingDto.getUrl()).orElseThrow(() -> new IllegalArgumentException("No URL has been set for Github connections")); String apiPrivateKey = Optional.ofNullable(almSettingDto.getPrivateKey()).orElseThrow(() -> new IllegalArgumentException("No private key has been set for Github connections")); - String projectPath = Optional.ofNullable(projectAlmSettingDto.getAlmSlug()).orElseThrow(() -> new IllegalArgumentException("No repository name has been set for Github connections")); + String projectPath = Optional.ofNullable(projectAlmSettingDto.getAlmRepo()).orElseThrow(() -> new IllegalArgumentException("No repository name has been set for Github connections")); String appId = Optional.ofNullable(almSettingDto.getAppId()).orElseThrow(() -> new IllegalArgumentException("No App ID has been set for Github connections")); RepositoryAuthenticationToken repositoryAuthenticationToken = diff --git a/src/test/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProviderTest.java b/src/test/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProviderTest.java index 36a804fcb..fa711ee9b 100644 --- a/src/test/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProviderTest.java +++ b/src/test/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/github/v4/GraphqlCheckRunProviderTest.java @@ -114,7 +114,7 @@ public void createCheckRunExceptionOnErrorResponse() throws IOException, General when(graphqlProvider.createGraphQLTemplate()).thenReturn(graphQLTemplate); ProjectAlmSettingDto projectAlmSettingDto = mock(ProjectAlmSettingDto.class); - when(projectAlmSettingDto.getAlmSlug()).thenReturn("dummy/repo"); + when(projectAlmSettingDto.getAlmRepo()).thenReturn("dummy/repo"); AlmSettingDto almSettingDto = mock(AlmSettingDto.class); when(almSettingDto.getUrl()).thenReturn("http://host.name"); when(almSettingDto.getAppId()).thenReturn("app id"); @@ -169,7 +169,7 @@ public void createCheckRunExceptionOnInvalidIssueSeverity() throws IOException, when(almSettingDto.getUrl()).thenReturn("url"); when(almSettingDto.getAppId()).thenReturn("app ID"); when(almSettingDto.getPrivateKey()).thenReturn("key"); - when(projectAlmSettingDto.getAlmSlug()).thenReturn("group/repo"); + when(projectAlmSettingDto.getAlmRepo()).thenReturn("group/repo"); GraphqlCheckRunProvider testCase = new GraphqlCheckRunProvider(graphqlProvider, clock, githubApplicationAuthenticationProvider, server); @@ -382,7 +382,7 @@ private void createCheckRunHappyPath(QualityGate.Status status, String basePath, when(graphqlProvider.createGraphQLTemplate()).thenReturn(graphQLTemplate); ProjectAlmSettingDto projectAlmSettingDto = mock(ProjectAlmSettingDto.class); - when(projectAlmSettingDto.getAlmSlug()).thenReturn("dummy/repo"); + when(projectAlmSettingDto.getAlmRepo()).thenReturn("dummy/repo"); AlmSettingDto almSettingDto = mock(AlmSettingDto.class); when(almSettingDto.getUrl()).thenReturn(basePath); when(almSettingDto.getAppId()).thenReturn("app id"); @@ -538,7 +538,7 @@ public void checkExcessIssuesCorrectlyReported() throws IOException, GeneralSecu Server server = mock(Server.class); ProjectAlmSettingDto projectAlmSettingDto = mock(ProjectAlmSettingDto.class); - when(projectAlmSettingDto.getAlmSlug()).thenReturn("dummy/repo"); + when(projectAlmSettingDto.getAlmRepo()).thenReturn("dummy/repo"); AlmSettingDto almSettingDto = mock(AlmSettingDto.class); when(almSettingDto.getUrl()).thenReturn("http://host.name"); when(almSettingDto.getAppId()).thenReturn("app id"); @@ -612,7 +612,7 @@ public void checkExceptionThrownOnMissingAppId() { when(almSettingDto.getUrl()).thenReturn("url"); when(almSettingDto.getPrivateKey()).thenReturn("private key"); ProjectAlmSettingDto projectAlmSettingDto = mock(ProjectAlmSettingDto.class); - when(projectAlmSettingDto.getAlmSlug()).thenReturn("alm/repo"); + when(projectAlmSettingDto.getAlmRepo()).thenReturn("alm/repo"); GraphqlCheckRunProvider underTest = new GraphqlCheckRunProvider(mock(Clock.class), mock(GithubApplicationAuthenticationProvider.class), mock(Server.class)); assertThatThrownBy(() -> underTest.createCheckRun(analysisDetails, almSettingDto, projectAlmSettingDto)) @@ -620,4 +620,4 @@ public void checkExceptionThrownOnMissingAppId() { .hasMessage("No App ID has been set for Github connections"); } -} \ No newline at end of file +}