From 89c029f4b512497336e4e537cc1736c7a3d705e4 Mon Sep 17 00:00:00 2001
From: Joe Littlejohn <joelittlejohn@gmail.com>
Date: Fri, 7 Jun 2013 19:16:05 +0100
Subject: [PATCH] Fix logFile and logFileEncoding that should not be marked as
final
---
.../embedmongo/StartEmbeddedMongoMojo.java | 6 ++++--
.../log/FileOutputStreamProcessor.java | 17 ++++++-----------
.../joelittlejohn/embedmongo/log/Loggers.java | 3 ---
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/github/joelittlejohn/embedmongo/StartEmbeddedMongoMojo.java b/src/main/java/com/github/joelittlejohn/embedmongo/StartEmbeddedMongoMojo.java
index ea9f3be..02ae7a3 100644
--- a/src/main/java/com/github/joelittlejohn/embedmongo/StartEmbeddedMongoMojo.java
+++ b/src/main/java/com/github/joelittlejohn/embedmongo/StartEmbeddedMongoMojo.java
@@ -147,15 +147,17 @@ public class StartEmbeddedMongoMojo extends AbstractMojo {
/**
* @parameter expression="${embedmongo.logFile}"
+ * default-value="embedmongo.log"
* @since 0.1.7
*/
- private final String logFile = Loggers.DEFAULT_LOG_FILE_NAME;
+ private String logFile;
/**
* @parameter expression="${embedmongo.logFileEncoding}"
+ * default-value="utf-8"
* @since 0.1.7
*/
- private final String logFileEncoding = Loggers.DEFAULT_LOG_FILE_ENCODING;
+ private String logFileEncoding;
/**
* The proxy user to be used when downloading MongoDB
diff --git a/src/main/java/com/github/joelittlejohn/embedmongo/log/FileOutputStreamProcessor.java b/src/main/java/com/github/joelittlejohn/embedmongo/log/FileOutputStreamProcessor.java
index a4e1c08..3dee665 100644
--- a/src/main/java/com/github/joelittlejohn/embedmongo/log/FileOutputStreamProcessor.java
+++ b/src/main/java/com/github/joelittlejohn/embedmongo/log/FileOutputStreamProcessor.java
@@ -24,20 +24,15 @@ import de.flapdoodle.embed.process.io.IStreamProcessor;
public class FileOutputStreamProcessor implements IStreamProcessor {
private static OutputStreamWriter stream;
-
+
private String logFile;
private String encoding;
-
- public FileOutputStreamProcessor(String logFile) {
- this(logFile, Loggers.DEFAULT_LOG_FILE_ENCODING);
- }
-
public FileOutputStreamProcessor(String logFile, String encoding) {
setLogFile(logFile);
setEncoding(encoding);
}
-
+
@Override
public synchronized void process(String block) {
try {
@@ -58,15 +53,15 @@ public class FileOutputStreamProcessor implements IStreamProcessor {
public void onProcessed() {
process("\n");
}
-
- public void setLogFile(String logFile) {
+
+ private void setLogFile(String logFile) {
if (logFile == null || logFile.trim().length() == 0) {
throw new IllegalArgumentException("no logFile given");
}
this.logFile = logFile;
}
-
- public void setEncoding(String encoding) {
+
+ private void setEncoding(String encoding) {
if (encoding == null || encoding.trim().length() == 0) {
throw new IllegalArgumentException("no encoding given");
}
diff --git a/src/main/java/com/github/joelittlejohn/embedmongo/log/Loggers.java b/src/main/java/com/github/joelittlejohn/embedmongo/log/Loggers.java
index 2e0909b..e67cf29 100644
--- a/src/main/java/com/github/joelittlejohn/embedmongo/log/Loggers.java
+++ b/src/main/java/com/github/joelittlejohn/embedmongo/log/Loggers.java
@@ -25,9 +25,6 @@ public class Loggers {
FILE, CONSOLE, NONE
}
- public static final String DEFAULT_LOG_FILE_NAME = "embedmongo.log";
- public static final String DEFAULT_LOG_FILE_ENCODING = "utf-8";
-
public static ProcessOutput file(String logFile, String encoding) {
FileOutputStreamProcessor file = new FileOutputStreamProcessor(logFile, encoding);
--
GitLab