Skip to content
Snippets Groups Projects
Commit 165d9ed8 authored by User expired's avatar User expired
Browse files

removed dependency to commons-io

reverted jdk to 1.7 (since new findbugs is not available by repo)
added reportLevel='low' to findbugs
parent c20b771d
No related branches found
No related tags found
No related merge requests found
...@@ -18,8 +18,10 @@ import org.apache.tools.ant.filters.ReplaceTokens ...@@ -18,8 +18,10 @@ import org.apache.tools.ant.filters.ReplaceTokens
group = 'at.uibk.dbis' group = 'at.uibk.dbis'
version = '0.3.2-SNAPSHOT' version = '0.3.2-SNAPSHOT'
sourceCompatibility=JavaVersion.VERSION_1_8 sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_8 targetCompatibility=JavaVersion.VERSION_1_7
//sourceCompatibility=JavaVersion.VERSION_1_8
//targetCompatibility=JavaVersion.VERSION_1_8
description = 'PhD project of Nikolaus Krismer' description = 'PhD project of Nikolaus Krismer'
...@@ -125,7 +127,6 @@ buildscript { ...@@ -125,7 +127,6 @@ buildscript {
} }
dependencies { dependencies {
compile group: 'commons-io', name: 'commons-io', version: '2.+'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.+' compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.+'
compile group: 'com.jolbox', name: 'bonecp', version: '+' compile group: 'com.jolbox', name: 'bonecp', version: '+'
compile group: 'com.tngtech.java', name: 'config-builder', version: '1.+' compile group: 'com.tngtech.java', name: 'config-builder', version: '1.+'
...@@ -207,6 +208,7 @@ eclipse { ...@@ -207,6 +208,7 @@ eclipse {
findbugs { findbugs {
effort = 'max' effort = 'max'
ignoreFailures = true ignoreFailures = true
reportLevel = 'low'
toolVersion = '+' toolVersion = '+'
} }
......
...@@ -15,9 +15,16 @@ import it.unibz.inf.isochrone.db.TableEntry; ...@@ -15,9 +15,16 @@ import it.unibz.inf.isochrone.db.TableEntry;
import it.unibz.inf.isochrone.util.EnumContainer.TableType; import it.unibz.inf.isochrone.util.EnumContainer.TableType;
import it.unibz.inf.isochrone.util.ResourceHelper; import it.unibz.inf.isochrone.util.ResourceHelper;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
...@@ -36,7 +43,6 @@ import java.util.regex.Pattern; ...@@ -36,7 +43,6 @@ import java.util.regex.Pattern;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -60,7 +66,7 @@ public class ConfigDataset { ...@@ -60,7 +66,7 @@ public class ConfigDataset {
Calendar targetTime = Calendar.getInstance(); Calendar targetTime = Calendar.getInstance();
try { try {
targetTime.setTimeInMillis(dateFormat.parse(str).getTime()); targetTime.setTimeInMillis(dateFormat.parse(str).getTime());
} catch (ParseException e) { } catch (final ParseException e) {
targetTime = null; targetTime = null;
e.printStackTrace(); e.printStackTrace();
} }
...@@ -318,19 +324,26 @@ public class ConfigDataset { ...@@ -318,19 +324,26 @@ public class ConfigDataset {
final ClassLoader cLoader = Thread.currentThread().getContextClassLoader(); final ClassLoader cLoader = Thread.currentThread().getContextClassLoader();
final Pattern dsConfigPattern = Pattern.compile(DS_CONFIG_PATTERN); final Pattern dsConfigPattern = Pattern.compile(DS_CONFIG_PATTERN);
URL r = null;
final Collection<String> resources = new ArrayList<>(); final Collection<String> resources = new ArrayList<>();
try { try {
// find resources on disk and add to available ones // find resources on disk and add to available ones
r = cLoader.getResource("/"); URI r = null;
try {
r = cLoader.getResource("/").toURI();
} catch (final URISyntaxException e1) {
LOGGER.warn("Datasets directory URI could not be created. There might be no configured datasets available!");
}
if (r != null) { if (r != null) {
final Collection<File> files = FileUtils.listFiles(new File(r.getFile()), new String[] {DS_CONFIG_EXTENSION}, true); Files.walkFileTree(Paths.get(r), new SimpleFileVisitor<Path>() {
for (File file : files) { @Override
final String filename = file.getName(); public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
if (dsConfigPattern.matcher(filename).matches()) { if (attrs.isRegularFile() && file.endsWith(DS_CONFIG_EXTENSION)) {
resources.add(filename); resources.add(file.getFileName().toString());
}
return FileVisitResult.CONTINUE;
} }
} });
} }
// find resources on classpath (in jar files...) and add to available ones // find resources on classpath (in jar files...) and add to available ones
...@@ -343,7 +356,7 @@ public class ConfigDataset { ...@@ -343,7 +356,7 @@ public class ConfigDataset {
final Collection<String> files = ResourceHelper.findFilesInResources(webappResources, dsConfigPattern); final Collection<String> files = ResourceHelper.findFilesInResources(webappResources, dsConfigPattern);
resources.addAll(files); resources.addAll(files);
} }
} catch (IOException e) { } catch (final IOException e) {
LOGGER.warn("Datasets could not be read. There might be no configured datasets available!"); LOGGER.warn("Datasets could not be read. There might be no configured datasets available!");
} }
...@@ -353,7 +366,7 @@ public class ConfigDataset { ...@@ -353,7 +366,7 @@ public class ConfigDataset {
} }
final List<String> datasets = new ArrayList<>(resources.size()); final List<String> datasets = new ArrayList<>(resources.size());
for (String fileName : resources) { for (final String fileName : resources) {
final Matcher m = dsConfigPattern.matcher(fileName); final Matcher m = dsConfigPattern.matcher(fileName);
if (m.matches()) { if (m.matches()) {
final String dataset = m.group(1); final String dataset = m.group(1);
...@@ -373,7 +386,8 @@ public class ConfigDataset { ...@@ -373,7 +386,8 @@ public class ConfigDataset {
// Private methods // Private methods
private boolean hasValidDatabase(final Collection<String> allTables) { private boolean hasValidDatabase(final Collection<String> allTables) {
Collection<String> configTables = new ArrayList<>(); final Collection<String> configTables = new ArrayList<>();
configTables.add(getTableDatecodes()); configTables.add(getTableDatecodes());
configTables.add(getTableEdges()); configTables.add(getTableEdges());
// configTables.add(getTableIsoAreaBuffer()); // configTables.add(getTableIsoAreaBuffer());
...@@ -428,7 +442,7 @@ public class ConfigDataset { ...@@ -428,7 +442,7 @@ public class ConfigDataset {
final Collection<String> allTables; final Collection<String> allTables;
try { try {
allTables = DbUtils.getAllTables(config.getConnection()); allTables = DbUtils.getAllTables(config.getConnection());
} catch (SQLException e) { } catch (final SQLException e) {
LOGGER.warn("Could not get tables from database... datasets will not be filtered at all"); LOGGER.warn("Could not get tables from database... datasets will not be filtered at all");
return datasets; return datasets;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment