From b15fcd85b7c59869b82b9134943df0966e58b2f4 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 12 Jan 2016 16:42:48 -0600 Subject: [PATCH] Omaha #5244 replaced deprecated method calls on LocalizationFile Change-Id: Ifdd1382a35a8475137be54404cca0a5c48383990 Former-commit-id: fe12ffde9dcf6210b213ded4903d004263be50b4 --- .../config/CWATLocationConfigManager.java | 37 +++-- .../SCANRunSiteConfigurationManager.java | 127 ++++++++---------- 2 files changed, 71 insertions(+), 93 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java index da6342aaa9..636cc11bd4 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java +++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java @@ -26,13 +26,12 @@ import java.util.ArrayList; import org.opengis.referencing.crs.ProjectedCRS; -import com.raytheon.uf.common.localization.FileUpdatedMessage; -import com.raytheon.uf.common.localization.ILocalizationFileObserver; +import com.raytheon.uf.common.localization.ILocalizationFile; +import com.raytheon.uf.common.localization.ILocalizationPathObserver; import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationContext; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; -import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.SaveableOutputStream; import com.raytheon.uf.common.localization.exception.LocalizationException; @@ -59,6 +58,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Oct 02, 2013 2361 njensen Use JAXBManager for XML * Oct 08, 2015 4912 rferrel Update configXml when configuration file changes * and removed deprecated code. + * Jan 12, 2016 5244 njensen Replaced calls to deprecated LocalizationFile methods * * * @@ -66,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate; * @version 1.0 */ public class CWATLocationConfigManager { + private static final IUFStatusHandler statusHandler = UFStatus .getHandler(CWATLocationConfigManager.class); @@ -108,10 +109,9 @@ public class CWATLocationConfigManager { /** * Observer to force updating the configXml. */ - private ILocalizationFileObserver configXmlObserver = new ILocalizationFileObserver() { - + private ILocalizationPathObserver configXmlObserver = new ILocalizationPathObserver() { @Override - public void fileUpdated(FileUpdatedMessage message) { + public void fileChanged(ILocalizationFile file) { readConfigXml(); } }; @@ -122,14 +122,11 @@ public class CWATLocationConfigManager { private CWATLocationConfigManager() { configXml = new CWATLocationsXML(); IPathManager pm = PathManagerFactory.getPathManager(); - LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC, - LocalizationLevel.SITE); /* * No need to remove the observer since the instance of this class * remains until the JRE is shutdown. */ - pm.getLocalizationFile(lc, CWAT_DIR).addFileUpdatedObserver( - configXmlObserver); + pm.addLocalizationPathObserver(CWAT_DIR, configXmlObserver); } /** @@ -145,7 +142,7 @@ public class CWATLocationConfigManager { return instance; } - private LocalizationFile getConfigFile() { + private ILocalizationFile getConfigFile() { IPathManager pm = PathManagerFactory.getPathManager(); LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC, LocalizationLevel.SITE); @@ -169,21 +166,21 @@ public class CWATLocationConfigManager { * Read the XML configuration data for the current XML file name. */ public void readConfigXml() { - LocalizationFile lFile = getConfigFile(); + ILocalizationFile lFile = getConfigFile(); try { if (lFile.exists()) { statusHandler.info("Reading CWAT configuration file: " - + lFile.getName()); + + lFile.getPath()); try (InputStream stream = lFile.openInputStream()) { // This closes the stream - CWATLocationsXML configXmltmp = (CWATLocationsXML) jaxb + CWATLocationsXML configXmltmp = jaxb .unmarshalFromInputStream(stream); configXml = configXmltmp; } } else { statusHandler.handle(Priority.WARN, "No CWAT locations file found. Generating the file: " - + lFile.getName()); + + lFile.getPath()); // create a new one ArrayList locations = ScanUtils.getCWASites( getSiteCoor(), getCRS()); @@ -195,7 +192,7 @@ public class CWATLocationConfigManager { } catch (Exception e) { statusHandler.handle(Priority.WARN, - "Unable to load location file: " + lFile.getName(), e); + "Unable to load location file: " + lFile.getPath(), e); } } @@ -204,15 +201,15 @@ public class CWATLocationConfigManager { */ public void saveConfigXml() { // Save the xml object to disk - LocalizationFile lFile = getConfigFile(); + ILocalizationFile lFile = getConfigFile(); statusHandler - .info("Saving CWAT configuration file: " + lFile.getName()); + .info("Saving CWAT configuration file: " + lFile.getPath()); try (SaveableOutputStream stream = lFile.openOutputStream()) { jaxb.marshalToStream(configXml, stream); stream.save(); - } catch (LocalizationException | SerializationException | IOException e1) { + } catch (LocalizationException | SerializationException | IOException e) { statusHandler.handle(Priority.PROBLEM, - "Unable to save localized file: " + lFile.getName(), e1); + "Unable to save localized file: " + lFile.getPath(), e); } } diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java index 952e734ad6..4f96dd6648 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java +++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java @@ -1,19 +1,21 @@ package com.raytheon.uf.common.monitor.config; -import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil; -import com.raytheon.uf.common.localization.FileUpdatedMessage; -import com.raytheon.uf.common.localization.ILocalizationFileObserver; +import com.raytheon.uf.common.localization.ILocalizationFile; +import com.raytheon.uf.common.localization.ILocalizationPathObserver; import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationContext; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; -import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; +import com.raytheon.uf.common.localization.SaveableOutputStream; +import com.raytheon.uf.common.localization.exception.LocalizationException; import com.raytheon.uf.common.monitor.events.MonitorConfigEvent; import com.raytheon.uf.common.monitor.events.MonitorConfigListener; import com.raytheon.uf.common.monitor.xml.SCANModelParameterXML; @@ -27,9 +29,9 @@ import com.raytheon.uf.common.status.UFStatus.Priority; /** * ScanRunSiteConfigurationManager - * + * * Holds the SCAN configuration - * + * * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
@@ -40,30 +42,33 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Oct 02, 2013 2361       njensen     Use JAXBManager for XML
  * Jan 20, 2015 3949       nabowle     Add lightning source.
  * Mar 27, 2015 4260       dhladky     Updated default model.
+ * Jan 12, 2016 5244       njensen     Replaced calls to deprecated LocalizationFile methods
  *
  *
- * + * * @author dhladky * @version 1.0 */ public class SCANRunSiteConfigurationManager implements - ILocalizationFileObserver { + ILocalizationPathObserver { /** Path to FFMP Source config. */ - private static final String CONFIG_FILE_NAME = "scan" + File.separatorChar - + "SCANRunSiteConfig.xml"; - + private static final String CONFIG_FILE_NAME = "scan" + + IPathManager.SEPARATOR + "SCANRunSiteConfig.xml"; + /** default model to set in XML **/ private static final String DEFAULT_MODEL = "HRRR"; private static final IUFStatusHandler statusHandler = UFStatus .getHandler(SCANRunSiteConfigurationManager.class); - // This needs to initialize before the instance since the constructor will - // makes use of JAXB. JVM spec 12.4.2 step 9 indicates this will - // initialize ahead of the instance since it is earlier in - // in the text source. + /* + * This jaxb variable needs to be declared before the instance variable + * since the constructor makes use of JAXB. JVM spec 12.4.2 step 9 indicates + * jaxb will initialize ahead of instance since it is earlier in the text + * source. + */ private static final SingleTypeJAXBManager jaxb = SingleTypeJAXBManager .createWithoutException(SCANSiteRunConfigXML.class); @@ -75,8 +80,6 @@ public class SCANRunSiteConfigurationManager implements */ protected SCANSiteRunConfigXML configXml; - private LocalizationFile lf = null; - private List listeners = new CopyOnWriteArrayList(); protected boolean isPopulated; @@ -84,6 +87,8 @@ public class SCANRunSiteConfigurationManager implements /* Private Constructor */ private SCANRunSiteConfigurationManager() { isPopulated = false; + IPathManager pm = PathManagerFactory.getPathManager(); + pm.addLocalizationPathObserver(CONFIG_FILE_NAME, this); try { readConfigXml(); @@ -95,7 +100,7 @@ public class SCANRunSiteConfigurationManager implements /** * Get an instance of this singleton. - * + * * @return Instance of this class */ public static SCANRunSiteConfigurationManager getInstance() { @@ -106,20 +111,14 @@ public class SCANRunSiteConfigurationManager implements * Read the XML configuration data for the current XML file name. */ public synchronized void readConfigXml() throws SerializationException { - IPathManager pm = PathManagerFactory.getPathManager(); LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC, LocalizationLevel.SITE); - - lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME); - lf.addFileUpdatedObserver(this); - File file = lf.getFile(); - // System.out.println("Reading -- " + file.getAbsolutePath()); - if (!file.exists()) { - statusHandler.handle( - Priority.WARN, - "SCANRunSiteConfigurationManager: " - + file.getAbsolutePath() + " does not exist."); + ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME); + if (!lf.exists()) { + statusHandler.handle(Priority.WARN, + "SCANRunSiteConfigurationManager: " + lf.getPath() + + " does not exist. Creating default..."); try { createValidConfig(); } catch (Exception e) { @@ -129,12 +128,13 @@ public class SCANRunSiteConfigurationManager implements } } - SCANSiteRunConfigXML configXmltmp = null; - - configXmltmp = jaxb.unmarshalFromXmlFile(file.getAbsolutePath()); - - configXml = configXmltmp; - isPopulated = true; + try (InputStream is = lf.openInputStream()) { + configXml = jaxb.unmarshalFromInputStream(is); + isPopulated = true; + } catch (IOException | LocalizationException e) { + throw new SerializationException("Error reading config file " + + lf.getPath(), e); + } } public void addListener(MonitorConfigListener fl) { @@ -153,50 +153,32 @@ public class SCANRunSiteConfigurationManager implements IPathManager pm = PathManagerFactory.getPathManager(); LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC, LocalizationLevel.SITE); - - LocalizationFile newXmlFile = pm.getLocalizationFile(lc, + ILocalizationFile newXmlFile = pm.getLocalizationFile(lc, CONFIG_FILE_NAME); - if (newXmlFile.getFile().getParentFile().exists() == false) { - // System.out.println("Creating new directory"); - - if (newXmlFile.getFile().getParentFile().mkdirs() == false) { - // System.out.println("Could not create new directory..."); - } - } - - try { - // System.out.println("Saving -- " - // + newXmlFile.getFile().getAbsolutePath()); - jaxb.marshalToXmlFile(configXml, newXmlFile.getFile() - .getAbsolutePath()); - newXmlFile.save(); + try (SaveableOutputStream sos = newXmlFile.openOutputStream()) { + jaxb.marshalToStream(configXml, sos); + sos.save(); setPopulated(true); - - lf = newXmlFile; } catch (Exception e) { statusHandler.handle(Priority.WARN, - "SCANRunSiteConfigurationManager: " + newXmlFile.getName() + "SCANRunSiteConfigurationManager: " + newXmlFile.getPath() + " couldn't be saved.", e); } } @Override - public void fileUpdated(FileUpdatedMessage message) { - - if (message.getFileName().equals(CONFIG_FILE_NAME)) { + public void fileChanged(ILocalizationFile file) { + if (file.getPath().equals(CONFIG_FILE_NAME)) { try { readConfigXml(); // inform listeners for (MonitorConfigListener fl : listeners) { fl.configChanged(new MonitorConfigEvent(this)); } - } catch (Exception e) { - statusHandler.handle( - Priority.WARN, - "SCANRunSiteConfigurationManager: " - + message.getFileName() + statusHandler.handle(Priority.WARN, + "SCANRunSiteConfigurationManager: " + file.getPath() + " couldn't be updated.", e); } } @@ -216,7 +198,7 @@ public class SCANRunSiteConfigurationManager implements /** * Get a site listing - * + * * @return */ public ArrayList getSiteNames() { @@ -228,7 +210,7 @@ public class SCANRunSiteConfigurationManager implements /** * Get a local site listing - * + * * @return */ public ArrayList getLocalSiteNames() { @@ -240,7 +222,7 @@ public class SCANRunSiteConfigurationManager implements /** * Get a dial site listing - * + * * @return */ public ArrayList getDialSiteNames() { @@ -252,7 +234,7 @@ public class SCANRunSiteConfigurationManager implements /** * Get the lightning source. - * + * * @return */ public String getLightningSource() { @@ -264,7 +246,7 @@ public class SCANRunSiteConfigurationManager implements /** * Get the Site you are seeking - * + * * @param name * @return */ @@ -284,9 +266,8 @@ public class SCANRunSiteConfigurationManager implements /** * Creates a valid configuration based on radar config */ - public void createValidConfig() throws Exception { - - /** + public void createValidConfig() { + /* * Don't have one, so create an EDEX generated default */ List localsites = RadarsInUseUtil.getSite(null, @@ -319,10 +300,10 @@ public class SCANRunSiteConfigurationManager implements } /** - * + * * Enumeration for which type of ModelData. CAPE is: Convective Available * Potential Energy. HELI is: storm relative HELIcity. - * + * * @author dhladky * @version 1.0 */ @@ -340,6 +321,6 @@ public class SCANRunSiteConfigurationManager implements public String getType() { return type; } - }; + } }