Skip to content

Commit f7f2b93

Browse files
committed
refactor: Improve cli task info variable name
1 parent 1e02e11 commit f7f2b93

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

application/src/main/java/org/opentripplanner/standalone/OTPMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void main(String[] args) {
5252
try {
5353
Thread.currentThread().setName("main");
5454
CommandLineParameters params = parseAndValidateCmdLine(args);
55-
OtpStartupInfo.logInfo(params.logInfo());
55+
OtpStartupInfo.logInfo(params.logTaskInfo());
5656
startOTPServer(params);
5757
} catch (OtpAppException ae) {
5858
LOG.error(ae.getMessage(), ae);

application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ private static String info() {
3434
);
3535
}
3636

37-
public static void logInfo(String runInfo) {
37+
public static void logInfo(String cliTaskInfo) {
3838
// This is good when aggregating logs across multiple load balanced instances of OTP
3939
// Hint: a regexp filter like "^OTP (START|SHUTTING)" will list nodes going up/down
4040
LOG.info(
4141
"OTP STARTING UP - {} - {} - Java {}",
42-
runInfo,
42+
cliTaskInfo,
4343
projectInfo().getVersionString(),
4444
javaVersion()
4545
);
4646
ApplicationShutdownSupport.addShutdownHook(
4747
"server-shutdown-info",
48-
() -> LOG.info("OTP SHUTTING DOWN - {} - {}", runInfo, projectInfo().getVersionString())
48+
() -> LOG.info("OTP SHUTTING DOWN - {} - {}", cliTaskInfo, projectInfo().getVersionString())
4949
);
5050
LOG.info(NEW_LINE + "{}", info());
5151
}

application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public boolean doServe() {
201201
return load || (serve && doBuildTransit());
202202
}
203203

204-
public String logInfo() {
204+
public String logTaskInfo() {
205205
var mainCommands = new ArrayList<String>();
206206
if (doBuildStreet() & doBuildTransit()) {
207207
mainCommands.add("Build Street & Transit Graph");

application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void build() {
5252
assertTrue(subject.doBuildTransit());
5353
assertFalse(subject.doSaveGraph());
5454
assertFalse(subject.doServe());
55-
assertEquals("Build Street & Transit Graph", subject.logInfo());
55+
assertEquals("Build Street & Transit Graph", subject.logTaskInfo());
5656

5757
subject.save = true;
5858
subject.serve = false;
@@ -61,7 +61,7 @@ public void build() {
6161
assertTrue(subject.doSaveGraph());
6262
assertFalse(subject.doServe());
6363
subject.inferAndValidate();
64-
assertEquals("Build Street & Transit Graph", subject.logInfo());
64+
assertEquals("Build Street & Transit Graph", subject.logTaskInfo());
6565

6666
subject.save = false;
6767
subject.serve = true;
@@ -70,7 +70,7 @@ public void build() {
7070
assertFalse(subject.doSaveGraph());
7171
assertTrue(subject.doServe());
7272
subject.inferAndValidate();
73-
assertEquals("Build Street & Transit Graph, Run Server", subject.logInfo());
73+
assertEquals("Build Street & Transit Graph, Run Server", subject.logTaskInfo());
7474

7575
subject.save = true;
7676
subject.serve = true;
@@ -79,7 +79,7 @@ public void build() {
7979
assertTrue(subject.doSaveGraph());
8080
assertTrue(subject.doServe());
8181
subject.inferAndValidate();
82-
assertEquals("Build Street & Transit Graph, Run Server", subject.logInfo());
82+
assertEquals("Build Street & Transit Graph, Run Server", subject.logTaskInfo());
8383
}
8484

8585
@Test
@@ -89,15 +89,15 @@ public void buildStreet() {
8989
assertFalse(subject.doBuildTransit());
9090
assertTrue(subject.doSaveStreetGraph());
9191
assertFalse(subject.doSaveGraph());
92-
assertEquals("Build Street Graph", subject.logInfo());
92+
assertEquals("Build Street Graph", subject.logTaskInfo());
9393
}
9494

9595
@Test
9696
public void doLoadGraph() {
9797
subject.load = true;
9898
assertTrue(subject.doLoadGraph());
9999
assertTrue(subject.doServe());
100-
assertEquals("Run Server", subject.logInfo());
100+
assertEquals("Run Server", subject.logTaskInfo());
101101
}
102102

103103
@Test
@@ -107,7 +107,7 @@ public void doLoadStreetGraph() {
107107
assertFalse(subject.doBuildStreet());
108108
assertFalse(subject.doSaveStreetGraph());
109109
assertFalse(subject.doSaveGraph());
110-
assertEquals("Build Transit Graph", subject.logInfo());
110+
assertEquals("Build Transit Graph", subject.logTaskInfo());
111111

112112
subject.save = true;
113113
subject.serve = true;
@@ -128,7 +128,7 @@ public void validateLoad() {
128128

129129
// Implicit given, but should be ok to set
130130
subject.serve = true;
131-
assertEquals("Run Server", subject.logInfo());
131+
assertEquals("Run Server", subject.logTaskInfo());
132132

133133
// No exception thrown
134134
subject.inferAndValidate();

0 commit comments

Comments
 (0)