xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1

Browse source 
Former-commit-id: 5b80aadbac [formerly 5b80aadbac [formerly e393e1f0455d466edde925608b6f0f1e35351141]]
Former-commit-id: 80cc58cf25
Former-commit-id: db8517a576
This commit is contained in:
Nate Jensen 2014-09-03 09:21:28 -05:00 • committed by Gerrit Code Review
commit d717f13039
3 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,5 +1,4 @@
com.raytheon.uf.edex.decodertools.core.filterimpl.RectFilterElement
com.raytheon.uf.edex.decodertools.core.filterimpl.RadiusFilterElement
com.raytheon.uf.edex.decodertools.core.filterimpl.StationIdFilterElement
com.raytheon.uf.edex.decodertools.core.filterimpl.WMOHeaderFilterElement
com.raytheon.uf.edex.decodertools.core.filterimpl.PluginDataObjectFilter
com.raytheon.uf.edex.decodertools.core.filterimpl.WMOHeaderFilterElement

14
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/AbstractObsFilter.java
View file

@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -36,21 +35,22 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* TODO Add Description
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 25, 2009 jkorman Initial creation
*
* Aug 28, 2014 3548 mapeters Removed implementation of ISerializableObject
*
* </pre>
*
*
* @author jkorman
* @version 1.0
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public abstract class AbstractObsFilter implements ISerializableObject {
public abstract class AbstractObsFilter {
public static final String INCLUDE_TYPE = "INCLUDE";

31
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/PluginDataObjectFilter.java
View file

@ -24,10 +24,7 @@ import static com.raytheon.uf.common.localization.LocalizationContext.Localizati
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@ -43,7 +40,7 @@ import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
/**
@ -58,6 +55,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Jun 11, 2014 2061 bsteffen Remove IDecoderGettable
* Jul 23, 2014 3410 bclement location changed to floats
* Aug 28, 2014 3548 mapeters Replaced use of SerializationUtil
* with SingleTypeJAXBManager
*
* </pre>
*
@ -96,25 +95,13 @@ public class PluginDataObjectFilter extends AbstractObsFilter {
if (filterDir.exists()) {
File srcFile = new File(filterDir, filterConfigFile);
byte[] data = new byte[(int) srcFile.length()];
SingleTypeJAXBManager<PluginDataObjectFilter> jaxb = new SingleTypeJAXBManager<PluginDataObjectFilter>(
PluginDataObjectFilter.class);
PluginDataObjectFilter filter = jaxb
.unmarshalFromXmlFile(srcFile);
InputStream stream = getInputStream(srcFile);
try {
stream.read(data);
stream.close();
AbstractObsFilter filter = SerializationUtil
.unmarshalFromXml(AbstractObsFilter.class,
new String(data));
setFilterElements(filter.getFilterElements());
setFilterName(filter.getFilterName());
} catch (IOException e) {
logger.error("Unable to read filter config", e);
} catch (JAXBException e) {
logger.error("Unable to unmarshall filter config",
e);
}
setFilterElements(filter.getFilterElements());
setFilterName(filter.getFilterName());
} else {
logger.error(String.format(ERROR_2_FMT,
filterDir.getPath()));