This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 6b0f4af9fe50b4c5d60a58d34b208f3c80661cac Author: Marat Gubaidullin <[email protected]> AuthorDate: Fri Sep 13 11:20:54 2024 -0400 Fix #1410 --- .../main/java/org/apache/camel/karavan/api/ImagesResource.java | 1 - .../java/org/apache/camel/karavan/api/ProjectGitResource.java | 5 ++++- .../main/java/org/apache/camel/karavan/service/GitService.java | 10 ---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java index 0440e7fc..f940bc8b 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java @@ -37,7 +37,6 @@ import java.util.HashMap; import java.util.List; import static org.apache.camel.karavan.KaravanEvents.CMD_PULL_IMAGES; -import static org.apache.camel.karavan.KaravanEvents.CMD_PUSH_PROJECT; @Path("/ui/image") public class ImagesResource extends AbstractApiResource { diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java index e4d67354..a73b3555 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java @@ -20,7 +20,10 @@ import io.vertx.core.json.JsonObject; import io.vertx.mutiny.core.eventbus.EventBus; import jakarta.inject.Inject; import jakarta.ws.rs.*; -import jakarta.ws.rs.core.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; import org.apache.camel.karavan.service.ProjectService; import org.jboss.logging.Logger; diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java index b191fab1..7575cc89 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java @@ -18,7 +18,6 @@ package org.apache.camel.karavan.service; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; -import io.quarkus.oidc.UserInfo; import io.smallrye.mutiny.tuples.Tuple2; import io.vertx.core.Vertx; import jakarta.enterprise.context.ApplicationScoped; @@ -30,32 +29,23 @@ import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.api.errors.TransportException; import org.eclipse.jgit.diff.DiffEntry; -import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.lib.*; import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevTree; -import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.*; import org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory; -import org.eclipse.jgit.treewalk.AbstractTreeIterator; -import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.OutputStream; import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; import java.util.regex.Pattern; -import java.util.stream.StreamSupport; @ApplicationScoped public class GitService {
