Skip to content
Snippets Groups Projects
Commit bc30ed7a authored by Jesper Zedlitz's avatar Jesper Zedlitz
Browse files

Collections mit in die Ausgabe aufnehmen

parent 3150e512
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
pom.xml
+ 69
− 68
View file @ bc30ed7a
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.landsh.opendata</groupId>
<artifactId>dcat-catalog-proxy</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dcat-catalog-proxy</name>
<description>DCAT catalog proxy</description>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.3</version>
<relativePath/>
</parent>
<properties>
<java.version>1.8</java.version>
<jena.version>3.15.0</jena.version>
</properties>
<groupId>de.landsh.opendata</groupId>
<artifactId>dcat-catalog-proxy</artifactId>
<version>0.1-SNAPSHOT</version>
<name>dcat-catalog-proxy</name>
<description>DCAT catalog proxy</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<properties>
<java.version>1.8</java.version>
<jena.version>3.15.0</jena.version>
</properties>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>${jena.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>${jena.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>${jena.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>${jena.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
src/main/java/de/landsh/opendata/catalogproxy/CatalogFilter.java
+ 6
− 1
View file @ bc30ed7a
......@@ -54,7 +54,7 @@ public class CatalogFilter implements InitializingBean {
final ResIterator it = model.listSubjectsWithProperty(RDF.type, DCAT.Dataset);
while (it.hasNext()) {
Resource dataset = it.next();
if (hasAtLeastOneValidDistribution(dataset)) {
if (hasAtLeastOneValidDistribution(dataset) || isCollection(dataset)) {
usedDistributionIds.addAll(getDistributionsForDataset(dataset));
} else {
model.remove(dataset.listProperties());
......@@ -234,6 +234,11 @@ public class CatalogFilter implements InitializingBean {
return result;
}
boolean isCollection(Resource dataset) {
final Resource type = dataset.getPropertyResourceValue(DCTerms.type);
return type != null && "http://dcat-ap.de/def/datasetTypes/collection".equals(type.getURI());
}
boolean hasAtLeastOneValidDistribution(Resource dataset) {
final StmtIterator it = dataset.listProperties(ResourceFactory.createProperty("http://www.w3.org/ns/dcat#distribution"));
boolean atLeastOneValidFormat = false;
......
src/test/java/de/landsh/opendata/catalogproxy/CatalogFilterTest.java
+ 16
− 1
View file @ bc30ed7a
......@@ -55,7 +55,7 @@ public class CatalogFilterTest {
}
@Test
public void test() throws Exception {
public void work() throws Exception {
final InputStream inputStream = getClass().getResourceAsStream("/catalog.xml");
catalogFilter.work(inputStream);
inputStream.close();
......@@ -137,4 +137,19 @@ public class CatalogFilterTest {
assertEquals("https://data.sh/fileadmin/Dokumente/Statistische_Berichte/landwirtschaft/C_II_1_m_S/C_II_1_m0409_S.pdf", accessURL.getURI());
assertEquals("https://opendata.sh/file.csv", downloadURL.getURI());
}
/**
* Collections (dcat:Dataset with dct:type "http://dcat-ap.de/def/datasetTypes/collection" will be included in the
* filtered results.
*/
@Test
public void work_will_preseve_collections() throws Exception {
final InputStream inputStream = getClass().getResourceAsStream("/with_collection.xml");
final Model model = catalogFilter.work(inputStream);
Assertions.assertEquals(8, countInstances(model, DCAT.Dataset));
Assertions.assertEquals(7, countInstances(model, DCAT.Distribution));
inputStream.close();
}
}
src/test/resources/with_collection.xml 0 → 100644
+ 358
− 0
View file @ bc30ed7a
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit