Skip to content

Commit 1a582ce

Browse files
authored
Fix build (#782)
Fix the build failure caused by merging #754
1 parent 870aed1 commit 1a582ce

File tree

1 file changed

+10
-8
lines changed
  • wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops

1 file changed

+10
-8
lines changed

wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
2929
import org.eclipse.che.api.factory.server.scm.exception.ScmCommunicationException;
3030
import org.eclipse.che.api.factory.server.scm.exception.ScmConfigurationPersistenceException;
31+
import org.eclipse.che.api.factory.server.scm.exception.ScmUnauthorizedException;
32+
import org.eclipse.che.api.factory.server.scm.exception.UnknownScmProviderException;
33+
import org.eclipse.che.api.factory.server.scm.exception.UnsatisfiedScmPreconditionException;
3134
import org.eclipse.che.api.factory.server.urlfactory.DevfileFilenamesProvider;
32-
import org.eclipse.che.commons.env.EnvironmentContext;
3335

3436
/**
3537
* Parser of String Azure DevOps URLs and provide {@link AzureDevOpsUrl} objects.
@@ -94,13 +96,13 @@ private boolean isUserTokenPresent(String repositoryUrl) {
9496
if (serverUrlOptional.isPresent()) {
9597
String serverUrl = serverUrlOptional.get();
9698
try {
97-
Optional<PersonalAccessToken> token =
98-
tokenManager.get(EnvironmentContext.getCurrent().getSubject(), serverUrl);
99-
if (token.isPresent()) {
100-
PersonalAccessToken accessToken = token.get();
101-
return accessToken.getScmTokenName().equals(PROVIDER_NAME);
102-
}
103-
} catch (ScmConfigurationPersistenceException | ScmCommunicationException exception) {
99+
PersonalAccessToken accessToken = tokenManager.get(serverUrl);
100+
return accessToken.getScmTokenName().equals(PROVIDER_NAME);
101+
} catch (ScmConfigurationPersistenceException
102+
| ScmCommunicationException
103+
| ScmUnauthorizedException
104+
| UnknownScmProviderException
105+
| UnsatisfiedScmPreconditionException exception) {
104106
return false;
105107
}
106108
}

0 commit comments

Comments
 (0)