diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/EdgeChainApplication.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/EdgeChainApplication.java index 8bf94684b..ad08aa51d 100644 --- a/FlySpring/edgechain-app/src/main/java/com/edgechain/EdgeChainApplication.java +++ b/FlySpring/edgechain-app/src/main/java/com/edgechain/EdgeChainApplication.java @@ -1,10 +1,7 @@ package com.edgechain; -import com.edgechain.lib.flyfly.commands.jbang.JbangCommand; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,14 +9,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.servlet.handler.HandlerMappingIntrospector; -import picocli.CommandLine; import java.net.URL; import java.nio.file.Paths; @SpringBootApplication @EnableScheduling -public class EdgeChainApplication { +public class EdgeChainApplication { private static final Logger logger = LoggerFactory.getLogger(EdgeChainApplication.class); @@ -59,5 +55,4 @@ private static String getJarFileName(Class clazz) { } throw new RuntimeException("Invalid jar file"); } - } diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/CustomApplicationRunner.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/CustomApplicationRunner.java index 0bbf3ba3b..ed5da2bf6 100644 --- a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/CustomApplicationRunner.java +++ b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/CustomApplicationRunner.java @@ -29,10 +29,10 @@ public void run(String... args) throws Exception { public String getBootLoaderClass() { Map annotatedBeans = - context.getBeansWithAnnotation(SpringBootApplication.class); + context.getBeansWithAnnotation(SpringBootApplication.class); return annotatedBeans.isEmpty() - ? null - : annotatedBeans.values().toArray()[0].getClass().getName(); + ? null + : annotatedBeans.values().toArray()[0].getClass().getName(); } @Override diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/FlyflyCommand.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/FlyflyCommand.java index 7dbc2c1fd..a1d113b50 100644 --- a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/FlyflyCommand.java +++ b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/FlyflyCommand.java @@ -1,19 +1,16 @@ package com.edgechain.lib.flyfly; -import com.edgechain.lib.flyfly.commands.format.FormatCommand; import com.edgechain.lib.flyfly.commands.jbang.JbangCommand; -import com.edgechain.lib.flyfly.commands.run.RunCommand; import org.springframework.stereotype.Component; -import picocli.CommandLine; import picocli.CommandLine.Command; @Component @Command( name = "edgechain", subcommands = { -// RunCommand.class, -// FormatCommand.class, + // RunCommand.class, + // FormatCommand.class, JbangCommand.class, -// CommandLine.HelpCommand.class + // CommandLine.HelpCommand.class }) public class FlyflyCommand {} diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/jbang/JbangCommand.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/jbang/JbangCommand.java index 50afb8493..1321672f7 100644 --- a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/jbang/JbangCommand.java +++ b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/jbang/JbangCommand.java @@ -8,10 +8,7 @@ import picocli.CommandLine.Parameters; @Component -@Command( - name = "jbang", - description = - "Activate jbang through the jar placed in resources.") +@Command(name = "jbang", description = "Activate jbang through the jar placed in resources.") public class JbangCommand implements Runnable { @Parameters(description = "Java file to be executed with jbang;") @@ -53,14 +50,14 @@ private void runJbang(File jarFile, String javaFile, String classPathJar) { try { // Step One: Execute the initial command to get the classpath ProcessBuilder pb = - new ProcessBuilder( - "java", - "-cp", - jarFile.getAbsolutePath(), - "dev.jbang.Main", - "--cp", - classPathJar, - javaFile); + new ProcessBuilder( + "java", + "-cp", + jarFile.getAbsolutePath(), + "dev.jbang.Main", + "--cp", + classPathJar, + javaFile); pb.redirectErrorStream(true); Process process = pb.start(); diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/run/RunCommand.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/run/RunCommand.java index 5578c1bfb..583b582a5 100644 --- a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/run/RunCommand.java +++ b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/flyfly/commands/run/RunCommand.java @@ -14,7 +14,8 @@ @Command( name = "run", description = - "Run a JAR or Gradle Spring Boot Application. Ignore if your application is executed.", hidden = true) + "Run a JAR or Gradle Spring Boot Application. Ignore if your application is executed.", + hidden = true) public class RunCommand implements Runnable { private final Logger log = LoggerFactory.getLogger(this.getClass());