seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup

pull/567/head
Igor 2023-09-20 16:56:11 +03:00
parent df025f677a
commit 0a43a5c432
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsFactoryParametersResolver.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.factory.server.RawDevfileUrlFactoryParameterResolver;
import org.eclipse.che.api.factory.server.FactoryParametersResolver;
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
import org.eclipse.che.api.factory.server.urlfactory.ProjectConfigDtoMerger;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
@ -45,11 +45,13 @@ import org.eclipse.che.api.workspace.shared.dto.devfile.SourceDto;
* @author Anatolii Bazko
*/
@Singleton
public class AzureDevOpsFactoryParametersResolver extends RawDevfileUrlFactoryParameterResolver {
public class AzureDevOpsFactoryParametersResolver implements FactoryParametersResolver {
/** Parser which will allow to check validity of URLs and create objects. */
private final AzureDevOpsURLParser azureDevOpsURLParser;
private final URLFetcher urlFetcher;
private final URLFactoryBuilder urlFactoryBuilder;
private final PersonalAccessTokenManager personalAccessTokenManager;
private final ProjectConfigDtoMerger projectConfigDtoMerger;
@ -60,8 +62,9 @@ public class AzureDevOpsFactoryParametersResolver extends RawDevfileUrlFactoryPa
URLFetcher urlFetcher,
URLFactoryBuilder urlFactoryBuilder,
PersonalAccessTokenManager personalAccessTokenManager) {
super(urlFactoryBuilder, urlFetcher);
this.azureDevOpsURLParser = azureDevOpsURLParser;
this.urlFetcher = urlFetcher;
this.urlFactoryBuilder = urlFactoryBuilder;
this.personalAccessTokenManager = personalAccessTokenManager;
this.projectConfigDtoMerger = projectConfigDtoMerger;
}

9
wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerAuthorizingFactoryParametersResolver.java
View File

@ -22,7 +22,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.core.BadRequestException;
import org.eclipse.che.api.factory.server.RawDevfileUrlFactoryParameterResolver;
import org.eclipse.che.api.factory.server.FactoryParametersResolver;
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
@ -43,8 +43,10 @@ import org.eclipse.che.api.workspace.shared.dto.devfile.SourceDto;
*/
@Singleton
public class BitbucketServerAuthorizingFactoryParametersResolver
extends RawDevfileUrlFactoryParameterResolver {
implements FactoryParametersResolver {
private final URLFactoryBuilder urlFactoryBuilder;
private final URLFetcher urlFetcher;
/** Parser which will allow to check validity of URLs and create objects. */
private final BitbucketServerURLParser bitbucketURLParser;
@ -56,7 +58,8 @@ public class BitbucketServerAuthorizingFactoryParametersResolver
URLFetcher urlFetcher,
BitbucketServerURLParser bitbucketURLParser,
PersonalAccessTokenManager personalAccessTokenManager) {
super(urlFactoryBuilder, urlFetcher);
this.urlFactoryBuilder = urlFactoryBuilder;
this.urlFetcher = urlFetcher;
this.bitbucketURLParser = bitbucketURLParser;
this.personalAccessTokenManager = personalAccessTokenManager;
}

9
wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketFactoryParametersResolver.java
View File

@ -22,7 +22,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.core.BadRequestException;
import org.eclipse.che.api.factory.server.RawDevfileUrlFactoryParameterResolver;
import org.eclipse.che.api.factory.server.FactoryParametersResolver;
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
import org.eclipse.che.api.factory.server.urlfactory.ProjectConfigDtoMerger;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
@ -38,14 +38,16 @@ import org.eclipse.che.api.workspace.shared.dto.devfile.ProjectDto;
/** Provides Factory Parameters resolver for bitbucket repositories. */
@Singleton
public class BitbucketFactoryParametersResolver extends RawDevfileUrlFactoryParameterResolver {
public class BitbucketFactoryParametersResolver implements FactoryParametersResolver {
/** Parser which will allow to check validity of URLs and create objects. */
private final BitbucketURLParser bitbucketURLParser;
private final URLFetcher urlFetcher;
/** Builder allowing to build objects from bitbucket URL. */
private final BitbucketSourceStorageBuilder bitbucketSourceStorageBuilder;
private final URLFactoryBuilder urlFactoryBuilder;
/** ProjectDtoMerger */
private final ProjectConfigDtoMerger projectConfigDtoMerger;
@ -63,9 +65,10 @@ public class BitbucketFactoryParametersResolver extends RawDevfileUrlFactoryPara
ProjectConfigDtoMerger projectConfigDtoMerger,
PersonalAccessTokenManager personalAccessTokenManager,
BitbucketApiClient bitbucketApiClient) {
super(urlFactoryBuilder, urlFetcher);
this.bitbucketURLParser = bitbucketURLParser;
this.urlFetcher = urlFetcher;
this.bitbucketSourceStorageBuilder = bitbucketSourceStorageBuilder;
this.urlFactoryBuilder = urlFactoryBuilder;
this.projectConfigDtoMerger = projectConfigDtoMerger;
this.personalAccessTokenManager = personalAccessTokenManager;
this.bitbucketApiClient = bitbucketApiClient;

9
wsmaster/che-core-api-factory-git-ssh/src/main/java/org/eclipse/che/api/factory/server/git/ssh/GitSshFactoryParametersResolver.java
View File

@ -21,8 +21,8 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.factory.server.FactoryParametersResolver;
import org.eclipse.che.api.factory.server.FactoryResolverPriority;
import org.eclipse.che.api.factory.server.RawDevfileUrlFactoryParameterResolver;
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
@ -41,10 +41,12 @@ import org.eclipse.che.api.workspace.shared.dto.devfile.SourceDto;
* @author Anatolii Bazko
*/
@Singleton
public class GitSshFactoryParametersResolver extends RawDevfileUrlFactoryParameterResolver {
public class GitSshFactoryParametersResolver implements FactoryParametersResolver {
private final GitSshURLParser gitSshURLParser;
private final URLFetcher urlFetcher;
private final URLFactoryBuilder urlFactoryBuilder;
private final PersonalAccessTokenManager personalAccessTokenManager;
@Inject
@ -53,8 +55,9 @@ public class GitSshFactoryParametersResolver extends RawDevfileUrlFactoryParamet
URLFetcher urlFetcher,
URLFactoryBuilder urlFactoryBuilder,
PersonalAccessTokenManager personalAccessTokenManager) {
super(urlFactoryBuilder, urlFetcher);
this.gitSshURLParser = gitSshURLParser;
this.urlFetcher = urlFetcher;
this.urlFactoryBuilder = urlFactoryBuilder;
this.personalAccessTokenManager = personalAccessTokenManager;
}

9
wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabFactoryParametersResolver.java
View File

@ -22,7 +22,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.core.BadRequestException;
import org.eclipse.che.api.factory.server.RawDevfileUrlFactoryParameterResolver;
import org.eclipse.che.api.factory.server.FactoryParametersResolver;
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
@ -41,8 +41,10 @@ import org.eclipse.che.api.workspace.shared.dto.devfile.SourceDto;
* @author Max Shaposhnyk
*/
@Singleton
public class GitlabFactoryParametersResolver extends RawDevfileUrlFactoryParameterResolver {
public class GitlabFactoryParametersResolver implements FactoryParametersResolver {
private final URLFactoryBuilder urlFactoryBuilder;
private final URLFetcher urlFetcher;
private final GitlabUrlParser gitlabURLParser;
private final PersonalAccessTokenManager personalAccessTokenManager;
@ -52,7 +54,8 @@ public class GitlabFactoryParametersResolver extends RawDevfileUrlFactoryParamet
URLFetcher urlFetcher,
GitlabUrlParser gitlabURLParser,
PersonalAccessTokenManager personalAccessTokenManager) {
super(urlFactoryBuilder, urlFetcher);
this.urlFactoryBuilder = urlFactoryBuilder;
this.urlFetcher = urlFetcher;
this.gitlabURLParser = gitlabURLParser;
this.personalAccessTokenManager = personalAccessTokenManager;
}