lines = separateLines(message);
- if(lines != null) {
- Pattern p1 = Pattern.compile(PRODUCT_PTRN);
- Pattern p2 = Pattern.compile(DATA_INFO);
- Pattern p3 = Pattern.compile(DATETIME_INFO);
- Pattern p4 = Pattern.compile(MODEL_INFO);
- Pattern p5 = Pattern.compile(INIT_CONDITION_PTRN);
- Pattern p6 = Pattern.compile(STORM_TYPE_INFO);
- Pattern p7 = Pattern.compile(INIT_TIME_INFO);
- Pattern p8 = Pattern.compile(FORECAST_POSITION_INFO);
- Pattern p9 = Pattern.compile(STORM_DISSIPATED);
- Pattern p10 = Pattern.compile(NWS_INFO);
- Pattern p11 = Pattern.compile(TCE_REFTIME_INFO);
- Pattern p12 = Pattern.compile(LATITUDE_INFO);
- Pattern p13 = Pattern.compile(LONGITUDE_INFO);
- Pattern p14 = Pattern.compile(FORECASTER_PTRN);
- Pattern p15 = Pattern.compile(TCE_REFHOUR);
-
+ if (lines != null) {
+ Pattern p1 = PRODUCT_PTRN;
+ Pattern p2 = DATA_INFO;
+ Pattern p3 = DATETIME_INFO;
+ Pattern p4 = MODEL_INFO;
+ Pattern p5 = INIT_CONDITION_PTRN;
+ Pattern p6 = STORM_TYPE_INFO;
+ Pattern p7 = INIT_TIME_INFO;
+ Pattern p8 = FORECAST_POSITION_INFO;
+ Pattern p9 = STORM_DISSIPATED;
+ Pattern p10 = NWS_INFO;
+ Pattern p11 = TCE_REFTIME_INFO;
+ Pattern p12 = LATITUDE_INFO;
+ Pattern p13 = LONGITUDE_INFO;
+ Pattern p14 = FORECASTER_PTRN;
+ Pattern p15 = TCE_REFHOUR;
+
InternalType t1 = InternalType.PRODUCT;
InternalType t2 = InternalType.DATA_INFO;
InternalType t3 = InternalType.DATETIME_INFO;
@@ -226,15 +259,17 @@ public class InternalReport {
InternalType t13 = InternalType.LONGITUDE;
InternalType t14 = InternalType.END;
InternalType t15 = InternalType.TCE_REFHOUR;
-
- Pattern patterns[] = {p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15};
- InternalType types[] = {t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15};
-
- for(String s : lines) {
- for(int i = 0; i < patterns.length; i++){
+
+ Pattern patterns[] = { p1, p2, p3, p4, p5, p6, p7, p8, p9, p10,
+ p11, p12, p13, p14, p15 };
+ InternalType types[] = { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10,
+ t11, t12, t13, t14, t15 };
+
+ for (String s : lines) {
+ for (int i = 0; i < patterns.length; i++) {
Matcher m = patterns[i].matcher(s);
- if(m.matches()){
- InternalReport rptLine = new InternalReport(types[i],s);
+ if (m.matches()) {
+ InternalReport rptLine = new InternalReport(types[i], s);
reports.add(rptLine);
break;
}
@@ -244,9 +279,9 @@ public class InternalReport {
}
return reports;
}
-
+
/**
- *
+ *
* @param message
* @return
*/
@@ -266,18 +301,18 @@ public class InternalReport {
}
}
} catch (Exception e) {
- logger.error("Error reading from reader",e);
+ LOGGER.error("Error reading from reader", e);
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException ioe) {
- logger.error("Error closing reader", ioe);
+ LOGGER.error("Error closing reader", ioe);
}
}
}
}
return reportLines;
}
-
+
}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java
index 664e5e8614..112a13b736 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java
@@ -1,19 +1,19 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
+ *
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
- *
+ *
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
- *
+ *
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
@@ -35,23 +35,29 @@ import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
/**
* TODO Add Description
- *
+ *
*
- *
+ *
* SOFTWARE HISTORY
- *
+ *
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 12, 2009 jsanchez Initial creation
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
- *
+ * Jun 24, 2014 3235 nabowle InternalReport patterns are now
+ * precompiled.
+ *
*
- *
+ *
* @author jsanchez
* @version 1.0
*/
public class TCEData extends TCGDataAdapter {
+ private static final Pattern STATION_ID_PATTERN = Pattern.compile("(\\w{2,2}\\d{6,6})");
+
+ private static final Pattern REF_HOUR_PATTERN = Pattern.compile("(\\d{4,4})");
+
private float latitude = -9999;
private float longitude = -9999;
@@ -132,8 +138,7 @@ public class TCEData extends TCGDataAdapter {
}
private void parseStationIdInfo(String stationIdInfo) {
- Pattern p = Pattern.compile("(\\w{2,2}\\d{6,6})");
- Matcher m = p.matcher(stationIdInfo);
+ Matcher m = STATION_ID_PATTERN.matcher(stationIdInfo);
if (m.find()) {
stationId = m.group();
}
@@ -147,8 +152,7 @@ public class TCEData extends TCGDataAdapter {
}
private void parseRefhour(String refhourInfo) {
- Pattern p = Pattern.compile("(\\d{4,4})");
- Matcher m = p.matcher(refhourInfo);
+ Matcher m = REF_HOUR_PATTERN.matcher(refhourInfo);
if (m.find()) {
hour = Integer.parseInt(m.group().substring(0, 2));
minute = Integer.parseInt(m.group().substring(2));
@@ -156,8 +160,7 @@ public class TCEData extends TCGDataAdapter {
}
private void parseLatitude(String latitudeInfo) {
- Pattern p = Pattern.compile(InternalReport.LAT_PTRN);
- Matcher m = p.matcher(latitudeInfo);
+ Matcher m = InternalReport.LAT_PTRN.matcher(latitudeInfo);
if (m.find()) {
latitude = Float.parseFloat(m.group().substring(8).trim());
if (latitudeInfo.contains("SOUTH")) {
@@ -168,8 +171,7 @@ public class TCEData extends TCGDataAdapter {
}
private void parseLongitude(String longitudeInfo) {
- Pattern p = Pattern.compile(InternalReport.LON_PTRN);
- Matcher m = p.matcher(longitudeInfo);
+ Matcher m = InternalReport.LON_PTRN.matcher(longitudeInfo);
if (m.find()) {
longitude = Float.parseFloat(m.group().substring(10).trim());
if (longitudeInfo.contains("WEST")) {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java
index c8d5318a40..a6eeaf3662 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java
@@ -1,19 +1,19 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
+ *
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
- *
+ *
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
- *
+ *
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.raytheon.edex.esb.Headers;
import com.raytheon.uf.common.dataplugin.tcg.TCGStormType;
@@ -40,7 +40,7 @@ import com.raytheon.uf.common.wmo.WMOHeader;
import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
/**
- * TODO Add Description
+ * Base class for Tropical Cyclone Guidance (TCG) products.
*
*
*
@@ -52,6 +52,7 @@ import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
* Jun 28, 2012 #826 dgilling Ensure getDataTime properly
* handles time zones.
* May 14, 2014 2536 bclement moved WMO Header to common, removed constructDataURI() call
+ * Jun 24, 2014 3235 nabowle Switch to slf4j.
*
*
*
@@ -60,7 +61,8 @@ import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
*/
public abstract class TCGDataAdapter {
- protected static Log logger = LogFactory.getLog(TCGDataAdapter.class);
+ protected static Logger logger = LoggerFactory
+ .getLogger(TCGDataAdapter.class);
protected PointDataDescription pointDataDescription;
@@ -136,7 +138,7 @@ public abstract class TCGDataAdapter {
/**
* Does this parser contain any more reports.
- *
+ *
* @return Does this parser contain any more reports.
*/
public boolean hasNext() {
@@ -154,7 +156,7 @@ public abstract class TCGDataAdapter {
/**
* Get the next available report. Returns a null reference if no more
* reports are available.
- *
+ *
* @return The next available report.
*/
public TropicalCycloneGuidance next() {
@@ -200,7 +202,7 @@ public abstract class TCGDataAdapter {
}
/**
- *
+ *
* @param obsData
* @return
*/