Add lombok dependency

Replace all explicitly-created loggers with @Slf4j annotations

Replace explicit getter methods and public fields with @Getter
annotations

Change-Id: Ibbe0a021e2b37daff0b601933eb07ceb88ccc52b
This commit is contained in:
Rudi Schlatte
2024-01-19 11:19:26 +01:00
parent 65f972f893
commit 346222010e
7 changed files with 89 additions and 87 deletions

View File

@@ -6,28 +6,23 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.Callable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
import picocli.CommandLine.ParentCommand;
@Slf4j
@Command(name = "local",
aliases = {"l"},
description = "Handle a single app creation message from the command line, printing its AMPL. If an ActiveMQ connection is specified, additionally send a message to the solver.",
mixinStandardHelpOptions = true
)
mixinStandardHelpOptions = true)
public class LocalExecution implements Callable<Integer> {
private static final Logger log = LoggerFactory.getLogger(LocalExecution.class);
/**
* Reference to Main, to access activemq_connector, sal_connector etc.
*/
/** Reference to Main set up by PicoCLI. This lets us ask for the SAL and
* ActiveMQ connectors. */
@ParentCommand
private Main main;
@@ -44,7 +39,7 @@ public class LocalExecution implements Callable<Integer> {
return 1;
}
NebulousApp app = NebulousApp.newFromAppMessage(msg,
main.activemq_connector == null ? null : main.activemq_connector.getAmplPublisher());
main.getActiveMQConnector() == null ? null : main.getActiveMQConnector().getAmplMessagePublisher());
System.out.println(app.generateAMPL());
return 0;