X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-persister-feature-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfigpusherfeature%2Finternal%2FAbstractFeatureWrapper.java;h=f95f2b89fd07a8e95c6b2051def6321ef6b4964d;hb=64e760caf2a5d223cca7598b3ff8941ac37c7a96;hp=3e004b4d7cf03a99a7bcfb4e2906f0c437fadf73;hpb=8161319be53a57e3ac22ba72f267483526e11e0d;p=controller.git diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java index 3e004b4d7c..f95f2b89fd 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java @@ -7,22 +7,23 @@ */ package org.opendaylight.controller.configpusherfeature.internal; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.io.Files; +import java.io.File; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; - import javax.xml.bind.JAXBException; - +import javax.xml.stream.XMLStreamException; import org.apache.karaf.features.BundleInfo; import org.apache.karaf.features.Conditional; import org.apache.karaf.features.ConfigFileInfo; +import org.apache.karaf.features.ConfigInfo; import org.apache.karaf.features.Dependency; import org.apache.karaf.features.Feature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /* * Wrap a Feature for the purposes of extracting the FeatureConfigSnapshotHolders from * its underlying ConfigFileInfo's @@ -30,7 +31,11 @@ import com.google.common.base.Preconditions; * Delegates the the contained feature and provides additional methods. */ public class AbstractFeatureWrapper implements Feature { - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractFeatureWrapper.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureWrapper.class); + + private static final String CONFIG_FILE_PATH_SUFFIX = "opendaylight" + File.separator + "karaf"; + protected static final String CONFIG_FILE_SUFFIX = "xml"; + protected Feature feature = null; protected AbstractFeatureWrapper() { @@ -40,7 +45,7 @@ public class AbstractFeatureWrapper implements Feature { /* * @param f Feature to wrap */ - public AbstractFeatureWrapper(Feature f) { + public AbstractFeatureWrapper(final Feature f) { Preconditions.checkNotNull(f,"FeatureWrapper requires non-null Feature in constructor"); this.feature = f; } @@ -50,27 +55,51 @@ public class AbstractFeatureWrapper implements Feature { * from the underlying Feature Config files */ public LinkedHashSet getFeatureConfigSnapshotHolders() throws Exception { - LinkedHashSet snapShotHolders = new LinkedHashSet(); - for(ConfigFileInfo c: getConfigurationFiles()) { - try { - snapShotHolders.add(new FeatureConfigSnapshotHolder(c,this)); - } catch (JAXBException e) { - LOGGER.debug("{} is not a config subsystem config file",c.getFinalname()); + final LinkedHashSet snapShotHolders = new LinkedHashSet<>(); + for(final ConfigFileInfo c: getConfigurationFiles()) { + // Skip non xml files + if(isConfigXMLFile(c.getFinalname())) { + final Optional featureConfigSnapshotHolder = getFeatureConfigSnapshotHolder(c); + if(featureConfigSnapshotHolder.isPresent()) { + snapShotHolders.add(featureConfigSnapshotHolder.get()); + } } } return snapShotHolders; } + private static boolean isConfigXMLFile(String fullName) { + String path = new File(fullName).getPath(); + return path.contains(CONFIG_FILE_PATH_SUFFIX) && + Files.getFileExtension(fullName).equals(CONFIG_FILE_SUFFIX); + } + + protected Optional getFeatureConfigSnapshotHolder(final ConfigFileInfo c) { + try { + return Optional.of(new FeatureConfigSnapshotHolder(c, this)); + } catch (final JAXBException e) { + LOG.warn("Unable to parse configuration snapshot. Config from '{}' will be IGNORED. " + + "Note that subsequent config files may fail due to this problem. " + + "Xml markup in this file needs to be fixed, for detailed information see enclosed exception.", + c.getFinalname(), e); + } catch (final XMLStreamException e) { + // Files that cannot be loaded are ignored as non config subsystem files e.g. jetty.xml + LOG.debug("Unable to read configuration file '{}'. Not a configuration snapshot", + c.getFinalname(), e); + } + return Optional.absent(); + } + @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((feature == null) ? 0 : feature.hashCode()); + result = prime * result + (feature == null ? 0 : feature.hashCode()); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -80,7 +109,7 @@ public class AbstractFeatureWrapper implements Feature { if (getClass() != obj.getClass()) { return false; } - AbstractFeatureWrapper other = (AbstractFeatureWrapper) obj; + final AbstractFeatureWrapper other = (AbstractFeatureWrapper) obj; if (feature == null) { if (other.feature != null) { return false; @@ -100,6 +129,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getId() */ + @Override public String getId() { return feature.getId(); } @@ -108,6 +138,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getName() */ + @Override public String getName() { return feature.getName(); } @@ -116,6 +147,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getDescription() */ + @Override public String getDescription() { return feature.getDescription(); } @@ -124,6 +156,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getDetails() */ + @Override public String getDetails() { return feature.getDetails(); } @@ -132,6 +165,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getVersion() */ + @Override public String getVersion() { return feature.getVersion(); } @@ -140,6 +174,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#hasVersion() */ + @Override public boolean hasVersion() { return feature.hasVersion(); } @@ -148,6 +183,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getResolver() */ + @Override public String getResolver() { return feature.getResolver(); } @@ -156,6 +192,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getInstall() */ + @Override public String getInstall() { return feature.getInstall(); } @@ -164,6 +201,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getDependencies() */ + @Override public List getDependencies() { return feature.getDependencies(); } @@ -172,6 +210,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getBundles() */ + @Override public List getBundles() { return feature.getBundles(); } @@ -180,7 +219,8 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getConfigurations() */ - public Map> getConfigurations() { + @Override + public List getConfigurations() { return feature.getConfigurations(); } @@ -188,6 +228,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getConfigurationFiles() */ + @Override public List getConfigurationFiles() { return feature.getConfigurationFiles(); } @@ -196,6 +237,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getConditional() */ + @Override public List getConditional() { return feature.getConditional(); } @@ -204,6 +246,7 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getStartLevel() */ + @Override public int getStartLevel() { return feature.getStartLevel(); } @@ -212,8 +255,9 @@ public class AbstractFeatureWrapper implements Feature { * @return * @see org.apache.karaf.features.Feature#getRegion() */ + @Override public String getRegion() { return feature.getRegion(); } -} \ No newline at end of file +}