Merge pull request pinterest#340 from tygrash/master

Exiting with intelligent message when metric collector class config is missing

src/main/java/com/pinterest/secor/common/SecorConfig.java

@@ -571,7 +571,7 @@ public String getThriftProtocolClass() {
     }
 
     public String getMetricsCollectorClass() {
-        return mProperties.getString("secor.monitoring.metrics.collector.class");
+        return getString("secor.monitoring.metrics.collector.class");
     }
 
     /**

src/main/java/com/pinterest/secor/parser/DailyOffsetMessageParser.java

@@ -16,14 +16,11 @@
  */
 package com.pinterest.secor.parser;
 
-import org.apache.commons.lang.StringUtils;
-
-import java.util.Date;
-
 import com.pinterest.secor.common.SecorConfig;
 import com.pinterest.secor.message.Message;
+import org.apache.commons.lang.StringUtils;
 
-
+import java.util.Date;
 
 /**
  * Offset message parser groups messages based on the offset ranges.

src/main/java/com/pinterest/secor/parser/Iso8601MessageParser.java

@@ -16,18 +16,16 @@
  */
 package com.pinterest.secor.parser;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.pinterest.secor.common.SecorConfig;
+import com.pinterest.secor.message.Message;
 import net.minidev.json.JSONObject;
 import net.minidev.json.JSONValue;
-import javax.xml.bind.DatatypeConverter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.pinterest.secor.common.SecorConfig;
-import com.pinterest.secor.message.Message;
+import javax.xml.bind.DatatypeConverter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * Iso8601MessageParser extracts timestamp field (specified by 'message.timestamp.name')
@@ -68,5 +66,4 @@ public String[] extractPartitions(Message message) throws Exception {
 
         return result;
     }
-
 }

src/main/java/com/pinterest/secor/parser/JsonMessageParser.java

@@ -46,5 +46,4 @@ public long extractTimestampMillis(final Message message) {
         }
         return 0;
     }
-
 }

src/main/java/com/pinterest/secor/parser/PartitionFinalizer.java

@@ -192,7 +192,6 @@ private void finalizePartitionsUpTo(String topic, String[] uptoPartitions) throw
             LOG.info("touching file {}", successFilePath);
             FileUtil.touch(successFilePath);
         }
-
     }
 
     public void finalizePartitions() throws Exception {

src/main/java/com/pinterest/secor/parser/PartitionedMessageParser.java

@@ -16,14 +16,11 @@
  */
 package com.pinterest.secor.parser;
 
-import org.apache.commons.lang.StringUtils;
-
-import java.util.Date;
-
 import com.pinterest.secor.common.SecorConfig;
 import com.pinterest.secor.message.Message;
+import org.apache.commons.lang.StringUtils;
 
-
+import java.util.Date;
 
 /**
  * Offset message parser groups messages based on the offset ranges.
@@ -48,5 +45,4 @@ public String[] extractPartitions(Message message) throws Exception {
     public long extractTimestampMillis(final Message message) {
         return new Date().getTime(); //Daily Timestamp generation
     }
-
 }

src/main/java/com/pinterest/secor/parser/RegexMessageParser.java

@@ -18,11 +18,11 @@
 
 import com.pinterest.secor.common.SecorConfig;
 import com.pinterest.secor.message.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * RegexMessageParser extracts timestamp field (specified by 'message.timestamp.input.pattern')
@@ -54,5 +54,4 @@ public long extractTimestampMillis(final Message message) {
         }
         throw new NumberFormatException("Cannot find timestamp field in: " + line);
     }
-
 }