🐛 : correct Gitlab url pattern

gaia-app · Jan 17, 2020 · d977e8b · d977e8b
1 parent c999ddc
commit d977e8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/main/java/io/codeka/gaia/registries/config/RegistryConfig.java b/src/main/java/io/codeka/gaia/registries/config/RegistryConfig.java
@@ -1,15 +1,10 @@
 package io.codeka.gaia.registries.config;
 
 import io.codeka.gaia.registries.RegistryOAuth2Provider;
-import io.codeka.gaia.registries.RegistryRawContent;
 import io.codeka.gaia.registries.github.GitHubOAuth2Provider;
-import io.codeka.gaia.registries.github.GitHubRawContent;
 import io.codeka.gaia.registries.gitlab.GitLabOAuth2Provider;
-import io.codeka.gaia.registries.gitlab.GitLabRawContent;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 
@@ -19,11 +14,6 @@
 @Configuration
 public class RegistryConfig {
 
-    @Bean
-    List<RegistryRawContent> registryRawContents(@Autowired RestTemplate restTemplate) {
-        return List.of(new GitHubRawContent(restTemplate), new GitLabRawContent(restTemplate));
-    }
-
     @Bean
     List<RegistryOAuth2Provider> registryOAuth2Providers() {
         return List.of(new GitHubOAuth2Provider(), new GitLabOAuth2Provider());

diff --git a/src/main/java/io/codeka/gaia/registries/gitlab/GitLabRawContent.kt b/src/main/java/io/codeka/gaia/registries/gitlab/GitLabRawContent.kt
@@ -2,11 +2,13 @@ package io.codeka.gaia.registries.gitlab
 
 import io.codeka.gaia.registries.RegistryType
 import io.codeka.gaia.registries.RegistryRawContent
+import org.springframework.stereotype.Component
 import org.springframework.web.client.RestTemplate
 import java.util.regex.Pattern
 
+@Component
 class GitLabRawContent(restTemplate: RestTemplate) : RegistryRawContent(RegistryType.GITLAB, restTemplate) {
 
-    override val pattern: Pattern = Pattern.compile("^(http[s]?://[www.]?gitlab.*).git$")
+    override val pattern: Pattern = Pattern.compile("^https?://(w{3}\\.)?gitlab.*(.git)?$")
 
 }