Fix checkstyle issues to enforce it.
Change-Id: Ic1c79114162d0c9772479e98df628d09daaa623b
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
import com.google.common.base.Optional;
import com.google.common.io.Files;
+
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
+
import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder;
import org.opendaylight.controller.config.persist.api.Persister;
import org.opendaylight.controller.config.persist.storage.file.xml.model.ConfigSnapshot;
private final Optional<FilenameFilter> extensionsFilter;
/**
- * Creates XmlDirectoryPersister that picks up all files in specified folder
+ * Creates XmlDirectoryPersister that picks up all files in specified folder.
*/
public XmlDirectoryPersister(final File storage) {
this(storage, Optional.<FilenameFilter>absent());
}
/**
- * Creates XmlDirectoryPersister that picks up files only with specified file extension
+ * Creates XmlDirectoryPersister that picks up files only with specified file extension.
*/
public XmlDirectoryPersister(final File storage, final Set<String> fileExtensions) {
this(storage, Optional.of(getFilter(fileExtensions)));
@Override
public List<ConfigSnapshotHolder> loadLastConfigs() throws IOException {
- File[] filesArray = extensionsFilter.isPresent() ? storage.listFiles(extensionsFilter.get()) : storage.listFiles();
+ File[] filesArray =
+ extensionsFilter.isPresent() ? storage.listFiles(extensionsFilter.get()) : storage.listFiles();
if (filesArray == null || filesArray.length == 0) {
return Collections.emptyList();
}
List<ConfigSnapshotHolder> result = new ArrayList<>();
for (File file : sortedFiles) {
LOG.trace("Adding file '{}' to combined result", file);
- Optional<ConfigSnapshotHolder> h = fromXmlSnapshot(file);
+ Optional<ConfigSnapshotHolder> configSnapshotHolderOptional = fromXmlSnapshot(file);
// Ignore non valid snapshot
- if(h.isPresent() == false) {
+ if (!configSnapshotHolderOptional.isPresent()) {
continue;
}
- result.add(h.get());
+ result.add(configSnapshotHolderOptional.get());
}
return result;
}
} catch (final JAXBException e) {
// In case of parse error, issue a warning, ignore and continue
LOG.warn(
- "Unable to parse configuration snapshot from {}. Initial config from {} will be IGNORED in this run. ",
+ "Unable to parse configuration snapshot from {}. "
+ + "Initial config from {} will be IGNORED in this run. ",
file, file);
LOG.warn(
"Note that subsequent config files may fail due to this problem. ",
};
}
- private static FilenameFilter getFilter(final Set<String>fileExtensions) {
- checkArgument(fileExtensions.isEmpty() == false, "No file extension provided", fileExtensions);
+ private static FilenameFilter getFilter(final Set<String> fileExtensions) {
+ checkArgument(!fileExtensions.isEmpty(), "No file extension provided", fileExtensions);
return (dir, name) -> {
String ext = Files.getFileExtension(name);
@Override
public void close() {
-
}
@Override
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
+
import java.io.File;
import java.util.Set;
+
import org.opendaylight.controller.config.persist.api.Persister;
import org.opendaylight.controller.config.persist.api.PropertiesProvider;
import org.opendaylight.controller.config.persist.api.StorageAdapter;
public static final String INCLUDE_EXT_PROP = "includeExtensions";
private static final char EXTENSIONS_SEPARATOR = ',';
-
@Override
public Persister instantiate(final PropertiesProvider propertiesProvider) {
String fileStorageProperty = propertiesProvider.getProperty(DIRECTORY_STORAGE_PROP);
- Preconditions.checkNotNull(fileStorageProperty, "Unable to find " + propertiesProvider.getFullKeyForReporting(DIRECTORY_STORAGE_PROP));
- File storage = new File(fileStorageProperty);
+ Preconditions.checkNotNull(fileStorageProperty,
+ "Unable to find " + propertiesProvider.getFullKeyForReporting(DIRECTORY_STORAGE_PROP));
+ File storage = new File(fileStorageProperty);
String fileExtensions = propertiesProvider.getProperty(INCLUDE_EXT_PROP);
LOG.debug("Using storage: {}", storage);
- if(fileExtensions != null) {
+ if (fileExtensions != null) {
LOG.debug("Using extensions: {}", fileExtensions);
return new XmlDirectoryPersister(storage, splitExtensions(fileExtensions));
} else {
return Sets.newHashSet(Splitter.on(EXTENSIONS_SEPARATOR).trimResults().omitEmptyStrings()
.split(fileExtensions));
}
-
}
import static org.junit.Assert.fail;
import com.google.common.base.Optional;
+
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.SortedSet;
+
import org.junit.Test;
import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder;
import org.opendaylight.controller.config.persist.api.Persister;
private static final Logger LOG = LoggerFactory.getLogger(DirectoryStorageAdapterTest.class);
Persister tested;
- private Persister instantiatePersisterFromAdapter(final File file, final Optional<String> extensions){
+ private Persister instantiatePersisterFromAdapter(final File file, final Optional<String> extensions) {
PropertiesProviderTest pp = new PropertiesProviderTest();
- pp.addProperty(XmlDirectoryStorageAdapter.DIRECTORY_STORAGE_PROP,file.getPath());
- if(extensions.isPresent()) {
+ pp.addProperty(XmlDirectoryStorageAdapter.DIRECTORY_STORAGE_PROP, file.getPath());
+ if (extensions.isPresent()) {
pp.addProperty(XmlDirectoryStorageAdapter.INCLUDE_EXT_PROP, extensions.get());
}
return dsa.instantiate(pp);
}
- private Persister instantiatePersisterFromAdapter(final File file){
+ private Persister instantiatePersisterFromAdapter(final File file) {
return instantiatePersisterFromAdapter(file, Optional.<String>absent());
}
});
fail();
} catch (final UnsupportedOperationException e) {
-
+ // TODO: empty catch block
}
}
private File getFolder(final String folderName) {
- File result = new File(("src/test/resources/" +
- folderName).replace("/", File.separator));
+ File result = new File(("src/test/resources/" + folderName).replace("/", File.separator));
assertTrue(result + " is not a directory", result.isDirectory());
return result;
}
LOG.info("Testing : {}", tested);
}
- private void assertResult(final ConfigSnapshotHolder result, final String s, final String... caps) throws SAXException, IOException {
- assertXMLEqual(s, result.getConfigSnapshot());
- int i = 0;
+ private void assertResult(final ConfigSnapshotHolder result,
+ final String string,
+ final String... caps) throws SAXException, IOException {
+ assertXMLEqual(string, result.getConfigSnapshot());
+ int index = 0;
for (String capFromSnapshot : result.getCapabilities()) {
- assertEquals(capFromSnapshot, caps[i++]);
+ assertEquals(capFromSnapshot, caps[index++]);
}
}