Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Fix feature config pusher warning"
[controller.git]
/
opendaylight
/
config
/
config-persister-feature-adapter
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
configpusherfeature
/
internal
/
AbstractFeatureWrapper.java
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 f95f2b89fd07a8e95c6b2051def6321ef6b4964d..9e3806b13bc10d6fb91d9ed478594b211e40a10f 100644
(file)
--- 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
@@
-10,7
+10,6
@@
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 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 javax.xml.bind.JAXBException;
import java.util.LinkedHashSet;
import java.util.List;
import javax.xml.bind.JAXBException;
@@
-33,7
+32,6
@@
import org.slf4j.LoggerFactory;
public class AbstractFeatureWrapper implements Feature {
private static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureWrapper.class);
public class AbstractFeatureWrapper implements Feature {
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 static final String CONFIG_FILE_SUFFIX = "xml";
protected Feature feature = null;
@@
-69,9
+67,7
@@
public class AbstractFeatureWrapper implements Feature {
}
private static boolean isConfigXMLFile(String fullName) {
}
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);
+ return Files.getFileExtension(fullName).equals(CONFIG_FILE_SUFFIX);
}
protected Optional<FeatureConfigSnapshotHolder> getFeatureConfigSnapshotHolder(final ConfigFileInfo c) {
}
protected Optional<FeatureConfigSnapshotHolder> getFeatureConfigSnapshotHolder(final ConfigFileInfo c) {