From effb0aabee62620aba65d2b5b8af84032b397af0 Mon Sep 17 00:00:00 2001
From: Michael Breu <Michael.Breu@arctis.at>
Date: Thu, 18 Aug 2022 13:58:22 +0200
Subject: [PATCH] prettier
---
.../uibk/gitsearch/service/SearchService.java | 14 +-
.../service/ShoppingBasketService.java | 93 ++++++------
.../exercise-body.component.html | 2 +-
.../service/ShoppingBasketServiceTest.java | 136 +++++++-----------
4 files changed, 99 insertions(+), 146 deletions(-)
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java b/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
index f2cb9990e..2b278ab50 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
@@ -1,5 +1,11 @@
package at.ac.uibk.gitsearch.service;
+import at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository;
+import at.ac.uibk.gitsearch.repository.search.MetaDataRepository;
+import at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum;
+import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
+import at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo;
+import at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -19,7 +25,6 @@ import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
-
import org.apache.commons.lang3.StringUtils;
import org.codeability.sharing.plugins.api.search.SearchInputDTO;
import org.codeability.sharing.plugins.api.search.SearchInputMetadataDTO;
@@ -34,13 +39,6 @@ import org.springframework.security.core.userdetails.User;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-import at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository;
-import at.ac.uibk.gitsearch.repository.search.MetaDataRepository;
-import at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum;
-import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
-import at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo;
-import at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry;
-
/**
* Service for exercise/course search results
* <p>
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/ShoppingBasketService.java b/src/main/java/at/ac/uibk/gitsearch/service/ShoppingBasketService.java
index b35b4f4a9..49ddae453 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/ShoppingBasketService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/ShoppingBasketService.java
@@ -1,5 +1,15 @@
package at.ac.uibk.gitsearch.service;
+import at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository;
+import at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import java.io.IOException;
import java.io.InputStream;
import java.io.PipedInputStream;
@@ -12,7 +22,6 @@ import java.util.UUID;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
-
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.codeability.sharing.plugins.api.ShoppingBasket;
@@ -29,18 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StreamUtils;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-
-import at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository;
-import at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo;
-
/**
* Service for exercise/course search results
* <p>
@@ -342,15 +339,13 @@ public class ShoppingBasketService {
while (zipInEntry != null) {
String fileName = zipInEntry.getName();
- boolean isDirectory = zipInEntry.isDirectory();
+ boolean isDirectory = zipInEntry.isDirectory();
if (fileName.startsWith(prefix)) {
String newName = fileName.substring(prefix.length());
String fileWithSubPath = getWithoutPathPrefix(newName, exerciseFolderPath);
if (fileWithSubPath != null) { // process this file
newName = fileWithSubPath;
- if (!StringUtils.isEmpty(newName)
- && !filterOut(newName, filterOut,
- isDirectory)) {
+ if (!StringUtils.isEmpty(newName) && !filterOut(newName, filterOut, isDirectory)) {
ZipEntry zipOutEntry = new ZipEntry(newName);
if (zipInEntry.isDirectory()) {
log.debug("ignoring directory {}", fileName);
@@ -403,41 +398,37 @@ public class ShoppingBasketService {
return null;
}
- /**
- * tests filters against fileName. Protected for test purposes. Do not use
- * outside this methd
- *
- * @param filePath
- * the filename (with folder path) to check
- * @param filterOut
- * the list of filters
- * @param isDirectory
- * check for directories
- * @return
- */
- protected static boolean filterOut(String filePath, String[] filterOut,
- boolean isDirectory) {
- if (filePath == null)
- return false;
+ /**
+ * tests filters against fileName. Protected for test purposes. Do not use
+ * outside this methd
+ *
+ * @param filePath
+ * the filename (with folder path) to check
+ * @param filterOut
+ * the list of filters
+ * @param isDirectory
+ * check for directories
+ * @return
+ */
+ protected static boolean filterOut(String filePath, String[] filterOut, boolean isDirectory) {
+ if (filePath == null) return false;
for (String filter : filterOut) {
- if (filter == null) {
- log.warn("filter should never be null!");
- continue;
- }
- IMatcher matcher;
- try {
- if (filter.endsWith(FastIgnoreRule.PATH_SEPARATOR + ""))
- matcher = IMatcher.createPathMatcher(
- filter.substring(0, filter.length() - 1), true);
- else
- matcher = IMatcher.createPathMatcher(filter, false);
- } catch (InvalidPatternException e) {
- log.warn("Cannot parse pattern {}", filter);
- continue;
- }
- if (matcher.matches(filePath, isDirectory, false)) {
- return true;
- }
+ if (filter == null) {
+ log.warn("filter should never be null!");
+ continue;
+ }
+ IMatcher matcher;
+ try {
+ if (filter.endsWith(FastIgnoreRule.PATH_SEPARATOR + "")) matcher =
+ IMatcher.createPathMatcher(filter.substring(0, filter.length() - 1), true); else matcher =
+ IMatcher.createPathMatcher(filter, false);
+ } catch (InvalidPatternException e) {
+ log.warn("Cannot parse pattern {}", filter);
+ continue;
+ }
+ if (matcher.matches(filePath, isDirectory, false)) {
+ return true;
+ }
}
return false;
}
diff --git a/src/main/webapp/app/exercise/exercise-details/exerciseComponents/exercise-body.component.html b/src/main/webapp/app/exercise/exercise-details/exerciseComponents/exercise-body.component.html
index 28703809e..8cf8946bb 100644
--- a/src/main/webapp/app/exercise/exercise-details/exerciseComponents/exercise-body.component.html
+++ b/src/main/webapp/app/exercise/exercise-details/exerciseComponents/exercise-body.component.html
@@ -187,7 +187,7 @@
<hr />
</div>
<div class="col-6">
- <span >
+ <span>
<a
class="btn btn-outline-secondary"
role="button"
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/ShoppingBasketServiceTest.java b/src/test/java/at/ac/uibk/gitsearch/service/ShoppingBasketServiceTest.java
index e3df41061..fc8590180 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/ShoppingBasketServiceTest.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/ShoppingBasketServiceTest.java
@@ -7,90 +7,54 @@ import org.junit.jupiter.api.Test;
public class ShoppingBasketServiceTest {
- @Test
- public void simpleFilterOutTests() {
- assertFalse(ShoppingBasketService.filterOut("someFile.txt",
- new String[]{}, false));
- assertFalse(ShoppingBasketService.filterOut("someFile.txt",
- new String[]{"some"}, false));
- assertTrue(ShoppingBasketService.filterOut("someFile.txt",
- new String[]{"some*"}, false));
- assertFalse(ShoppingBasketService.filterOut("someFile.txt",
- new String[]{"some*.pdf"}, false));
- assertTrue(ShoppingBasketService.filterOut("someFile.txt",
- new String[]{"some*.txt"}, false));
- }
- @Test
- public void filterOutTestsWithLeadingRoot() {
- assertFalse(ShoppingBasketService.filterOut("/someFile.txt",
- new String[]{}, false));
- assertFalse(ShoppingBasketService.filterOut("/someFile.txt",
- new String[]{"**/some"}, false));
- assertTrue(ShoppingBasketService.filterOut("/someFile.txt",
- new String[]{"**/some*"}, false));
- assertFalse(ShoppingBasketService.filterOut("/someFile.txt",
- new String[]{"**/some*.pdf"}, false));
- assertTrue(ShoppingBasketService.filterOut("/someFile.txt",
- new String[]{"**/some*.txt"}, false));
-
- assertTrue(ShoppingBasketService.filterOut("parent/someFile.txt",
- new String[]{"**/some*.txt"}, false));
- assertFalse(ShoppingBasketService.filterOut("parent/someFile.txt",
- new String[]{"**/someFile.txt/"}, false));
- }
-
- @Test
- public void filterOutTestsWithDirectories() {
- assertFalse(ShoppingBasketService.filterOut("someDir", new String[]{},
- true));
- assertFalse(ShoppingBasketService.filterOut("someDir",
- new String[]{"some/"}, true));
- assertTrue(ShoppingBasketService.filterOut("someDir",
- new String[]{"/some*"}, true));
- assertTrue(ShoppingBasketService.filterOut("someDir",
- new String[]{"some*"}, true));
- assertTrue(ShoppingBasketService.filterOut("someDir/",
- new String[]{"some*/"}, true));
- assertFalse(ShoppingBasketService.filterOut("someDir",
- new String[]{"*/some/"}, true));
- assertFalse(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"*/some/"}, true));
- assertTrue(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"someDir/"}, true));
- assertTrue(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"*/someDir"}, true));
- assertTrue(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"*/some*"}, true));
- assertTrue(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"**/someDir"}, true));
- assertTrue(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"**/some*"}, true));
-
- assertTrue(ShoppingBasketService.filterOut("parent/someDir",
- new String[]{"parent"}, true));
-
- }
-
- @Test
- public void filterOutTestsWithPathes() {
- assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{}, true));
- assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"parent/some"}, true));
- assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"*/*rent/some*"}, true));
- assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"parent/some*"}, true));
- assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"par*/some*"}, true));
- assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"*/parent/some*"}, true));
- assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"*/*/some*"}, true));
- assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir",
- new String[]{"**/some*"}, true));
-
-
- }
-
+ @Test
+ public void simpleFilterOutTests() {
+ assertFalse(ShoppingBasketService.filterOut("someFile.txt", new String[] {}, false));
+ assertFalse(ShoppingBasketService.filterOut("someFile.txt", new String[] { "some" }, false));
+ assertTrue(ShoppingBasketService.filterOut("someFile.txt", new String[] { "some*" }, false));
+ assertFalse(ShoppingBasketService.filterOut("someFile.txt", new String[] { "some*.pdf" }, false));
+ assertTrue(ShoppingBasketService.filterOut("someFile.txt", new String[] { "some*.txt" }, false));
+ }
+
+ @Test
+ public void filterOutTestsWithLeadingRoot() {
+ assertFalse(ShoppingBasketService.filterOut("/someFile.txt", new String[] {}, false));
+ assertFalse(ShoppingBasketService.filterOut("/someFile.txt", new String[] { "**/some" }, false));
+ assertTrue(ShoppingBasketService.filterOut("/someFile.txt", new String[] { "**/some*" }, false));
+ assertFalse(ShoppingBasketService.filterOut("/someFile.txt", new String[] { "**/some*.pdf" }, false));
+ assertTrue(ShoppingBasketService.filterOut("/someFile.txt", new String[] { "**/some*.txt" }, false));
+
+ assertTrue(ShoppingBasketService.filterOut("parent/someFile.txt", new String[] { "**/some*.txt" }, false));
+ assertFalse(ShoppingBasketService.filterOut("parent/someFile.txt", new String[] { "**/someFile.txt/" }, false));
+ }
+
+ @Test
+ public void filterOutTestsWithDirectories() {
+ assertFalse(ShoppingBasketService.filterOut("someDir", new String[] {}, true));
+ assertFalse(ShoppingBasketService.filterOut("someDir", new String[] { "some/" }, true));
+ assertTrue(ShoppingBasketService.filterOut("someDir", new String[] { "/some*" }, true));
+ assertTrue(ShoppingBasketService.filterOut("someDir", new String[] { "some*" }, true));
+ assertTrue(ShoppingBasketService.filterOut("someDir/", new String[] { "some*/" }, true));
+ assertFalse(ShoppingBasketService.filterOut("someDir", new String[] { "*/some/" }, true));
+ assertFalse(ShoppingBasketService.filterOut("parent/someDir", new String[] { "*/some/" }, true));
+ assertTrue(ShoppingBasketService.filterOut("parent/someDir", new String[] { "someDir/" }, true));
+ assertTrue(ShoppingBasketService.filterOut("parent/someDir", new String[] { "*/someDir" }, true));
+ assertTrue(ShoppingBasketService.filterOut("parent/someDir", new String[] { "*/some*" }, true));
+ assertTrue(ShoppingBasketService.filterOut("parent/someDir", new String[] { "**/someDir" }, true));
+ assertTrue(ShoppingBasketService.filterOut("parent/someDir", new String[] { "**/some*" }, true));
+
+ assertTrue(ShoppingBasketService.filterOut("parent/someDir", new String[] { "parent" }, true));
+ }
+
+ @Test
+ public void filterOutTestsWithPathes() {
+ assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] {}, true));
+ assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "parent/some" }, true));
+ assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "*/*rent/some*" }, true));
+ assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "parent/some*" }, true));
+ assertFalse(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "par*/some*" }, true));
+ assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "*/parent/some*" }, true));
+ assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "*/*/some*" }, true));
+ assertTrue(ShoppingBasketService.filterOut("/root/parent/someDir", new String[] { "**/some*" }, true));
+ }
}
--
GitLab