Skip to content

Commit 72ada6c

Browse files
committed
Merge pull request #76 from dmitry-cherkas/master
replaced alwaysLog() with verbose-aware log()
2 parents 9d14779 + d8f741d commit 72ada6c

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -232,33 +232,27 @@ public class GitCommitIdMojo extends AbstractMojo {
232232
*/
233233
private Properties properties;
234234

235-
public final String logPrefix = "[GitCommitIdMojo] ";
236-
237235
boolean runningTests = false;
238236

239237
@NotNull
240238
LoggerBridge loggerBridge = new MavenLoggerBridge(getLog(), true);
241239

242-
@NotNull
243-
LoggerBridge verboseLoggerBridge = new MavenLoggerBridge(getLog(), true);
244-
245240
public void execute() throws MojoExecutionException {
246241
// Set the verbose setting now it should be correctly loaded from maven.
247242
loggerBridge.setVerbose(verbose);
248-
alwaysLog();
249243

250244
if (isPomProject(project) && skipPoms) {
251-
alwaysLog();
245+
log("isPomProject is true and skipPoms is true, return");
252246
return;
253247
}
254248

255249
dotGitDirectory = lookupGitDirectory();
256250
throwWhenRequiredDirectoryNotFound(dotGitDirectory, failOnNoGitDirectory, ".git directory could not be found! Please specify a valid [dotGitDirectory] in your pom.xml");
257251

258252
if (dotGitDirectory != null) {
259-
alwaysLog(dotGitDirectory.getAbsolutePath());
253+
log("dotGitDirectory", dotGitDirectory.getAbsolutePath());
260254
} else {
261-
alwaysLog();
255+
log("dotGitDirectory is null");
262256
return;
263257
}
264258

@@ -343,15 +337,12 @@ private Properties initProperties() throws MojoExecutionException {
343337
}
344338

345339
private void logProperties(@NotNull Properties properties) {
346-
alwaysLog();
347-
348340
for (Object key : properties.keySet()) {
349341
String keyString = key.toString();
350342
if (isOurProperty(keyString)) {
351-
alwaysLog();
343+
log("found property", keyString);
352344
}
353345
}
354-
alwaysLog();
355346
}
356347

357348
private boolean isOurProperty(@NotNull String keyString) {
@@ -528,10 +519,6 @@ void log(String... interpolations) {
528519
loggerBridge.log((Object[]) interpolations);
529520
}
530521

531-
void alwaysLog(String... interpolations) {
532-
verboseLoggerBridge.log((Object[]) interpolations);
533-
}
534-
535522
private boolean directoryExists(@Nullable File fileLocation) {
536523
return fileLocation != null && fileLocation.exists() && fileLocation.isDirectory();
537524
}

0 commit comments

Comments
 (0)