Skip to content

The Unified and Autonomous Development Platform

Rewrite model to use filtered iterator

Thomas Terry6d95577cfddc
diff --git a/server-core/src/main/java/io/onedev/server/util/FilterIterator.java b/server-core/src/main/java/io/onedev/server/util/FilterIterator.java
new file mode 100644
index 0000000000..da3a0aa613
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/FilterIterator.java
@@ -0,0 +1,49 @@
+package io.onedev.server.util;
+
+import java.util.Iterator;
+import java.util.function.Predicate;
+
+public class FilterIterator<T> implements Iterable<T> {
+ private Predicate<T> predicate;
+ private Iterator<T> internalIterator;
+
+ public FilterIterator(Iterator<T> iterator, Predicate<T> p) {
+ this.internalIterator = iterator;
+ this.predicate = p;
+ }
+
+ @Override
+ public Iterator<T> iterator() {
+ return new Iterator<T>() {
+ Iterator<T> sourceIterator = internalIterator;
+ T current;
+ boolean hasCurrent;
+
+ @Override
+ public boolean hasNext() {
+ while (!hasCurrent) {
+ if (!sourceIterator.hasNext()) {
+ return false;
+ }
+ T next = sourceIterator.next();
+ if (predicate.test(next)) {
+ current = next;
+ hasCurrent = true;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public T next() {
+ if (!hasNext()) {
+ return null;
+ }
+ T next = current;
+ current = null;
+ hasCurrent = false;
+ return next;
+ }
+ };
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
index 8ed6499dae..4666e95dec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
@@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.function.Consumer;
+import java.util.function.Predicate;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
@@ -40,6 +41,7 @@ import org.unbescape.html.HtmlEscape;
import com.google.common.base.Preconditions;
+import io.onedev.server.util.FilterIterator;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
@@ -126,10 +128,16 @@ public class FolderViewPanel extends Panel {
};
private final IModel<BlobIdent> readmeModel = new LoadableDetachableModel<BlobIdent>() {
-
@Override
protected BlobIdent load() {
- for (BlobIdent blobIdent: makeReadmeBlobIterator(childrenModel.getObject().iterator())) {
+ Predicate<BlobIdent> isReadmeBlob = new Predicate<BlobIdent>() {
+ @Override
+ public boolean test(BlobIdent t) {
+ return t.isFile();
+ }
+ };
+ FilterIterator<BlobIdent> readmeBlobIterator = new FilterIterator<BlobIdent>(childrenModel.getObject().iterator(), isReadmeBlob);
+ for (BlobIdent blobIdent: readmeBlobIterator) {
switch(blobIdent.getName().toLowerCase()) {
case "readme.md":
case "readme.mkd":
@@ -139,48 +147,7 @@ public class FolderViewPanel extends Panel {
}
}
return null;
- }
-
- private Iterable<BlobIdent> makeReadmeBlobIterator(Iterator<BlobIdent> it) {
- return new Iterable<BlobIdent>() {
- @Override
- public Iterator<BlobIdent> iterator() {
- return new Iterator<BlobIdent>() {
- Iterator<BlobIdent> sourceIterator = it;
- BlobIdent current;
- boolean hasCurrent;
-
- @Override
- public boolean hasNext() {
- while (!hasCurrent) {
- if (!sourceIterator.hasNext()) {
- return false;
- }
- BlobIdent next = sourceIterator.next();
- if (next.isFile() && next.getName().toLowerCase().startsWith("readme.")) {
- current = next;
- hasCurrent = true;
- }
- }
- return true;
- }
-
- @Override
- public BlobIdent next() {
- if (!hasNext()) {
- return null;
- }
- BlobIdent next = current;
- current = null;
- hasCurrent = false;
- return next;
- }
- };
- }
- };
-
- }
-
+ }
};
private AbstractDefaultAjaxBehavior userCardBehavior;