Ignoring Gitlab repo with tag jmad-ignore

jmad · Jul 13, 2018 · 8e39907 · 8e39907
1 parent 5680cba
commit 8e39907
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 47 deletions.
diff --git a/src/java/org/jmad/modelpack/connect/gitlab/GitlabGroupModelPackageConnector.java b/src/java/org/jmad/modelpack/connect/gitlab/GitlabGroupModelPackageConnector.java
@@ -34,6 +34,7 @@
 public class GitlabGroupModelPackageConnector implements ZipModelPackageConnector {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GitlabGroupModelPackageConnector.class);
+    private static final String JMAD_IGNORE_TAG = "jmad-ignore";
 
     private ExecutorService runner = Executors.newCachedThreadPool();
 
@@ -49,6 +50,7 @@ public Flux<ModelPackageVariant> availablePackages(JMadModelPackageRepository re
 
         // @formatter:off
         return flux(uri,GitlabProject[].class)
+                .filter(p -> !p.tag_list.contains(JMAD_IGNORE_TAG))
                 .flatMap(p -> variantsFor(repository, p).map(v -> p.toModelPackage(repository, v)));
         // @formatter:on
     }

diff --git a/src/java/org/jmad/modelpack/connect/gitlab/internals/GitlabProject.java b/src/java/org/jmad/modelpack/connect/gitlab/internals/GitlabProject.java
@@ -9,66 +9,44 @@
 import org.jmad.modelpack.domain.ModelPackageVariant;
 import org.jmad.modelpack.domain.Variant;
 
+import java.util.List;
+import java.util.Objects;
+
 public class GitlabProject {
 
     public String id;
     public String name;
     public String description;
+    public List<String> tag_list;
 
-    @Override
-    public String toString() {
-        return "GitlabProject [id=" + id + ", name=" + name + ", description=" + description + "]";
+    public ModelPackageVariant toModelPackage(JMadModelPackageRepository repo, Variant variant) {
+        ModelPackage pkg = new ModelPackage(name, repo, id, description);
+        return new ModelPackageVariant(pkg, variant);
     }
 
     @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((description == null) ? 0 : description.hashCode());
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        return result;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GitlabProject that = (GitlabProject) o;
+        return Objects.equals(id, that.id) &&
+                Objects.equals(name, that.name) &&
+                Objects.equals(description, that.description) &&
+                Objects.equals(tag_list, that.tag_list);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        GitlabProject other = (GitlabProject) obj;
-        if (description == null) {
-            if (other.description != null) {
-                return false;
-            }
-        } else if (!description.equals(other.description)) {
-            return false;
-        }
-        if (id == null) {
-            if (other.id != null) {
-                return false;
-            }
-        } else if (!id.equals(other.id)) {
-            return false;
-        }
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
-        return true;
+    public int hashCode() {
+        return Objects.hash(id, name, description, tag_list);
     }
 
-    public ModelPackageVariant toModelPackage(JMadModelPackageRepository repo, Variant variant) {
-        ModelPackage pkg = new ModelPackage(name, repo, id, description);
-        return new ModelPackageVariant(pkg, variant);
+    @Override
+    public String toString() {
+        return "GitlabProject{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", description='" + description + '\'' +
+                ", tag_list=" + tag_list +
+                '}';
     }
-
 }