Final cleanup before release

Dockerfile

@@ -23,13 +23,5 @@ ENV timbuctoo_port="80"
 ENV timbuctoo_adminPort="81"
 ENV base_uri=http://localhost:8080
 
-ENV timbuctoo_elasticsearch_host=http://example.com/elasticsearchhost
-ENV timbuctoo_elasticsearch_port=80
-ENV timbuctoo_elasticsearch_user=user
-ENV timbuctoo_elasticsearch_password=password
-
 ENV timbuctoo_dataPath="/root/data"
 ENV timbuctoo_authPath="/root/data/auth"
-
-ENV timbuctoo_search_url=http://localhost:8082
-ENV timbuctoo_indexer_url=http://indexer

example_config.yaml

@@ -30,7 +30,7 @@ archetypesSchema: |
 defaultSummaryProps:
   defaultTitles:
   - path:
-    - http://timbuctoo.huygens.knaw.nl/static/predicate/names
+    - http://timbuctoo.huygens.knaw.nl/static/v5/predicate/names
     type: SimplePath
   - path:
     - http://schema.org/name
@@ -129,7 +129,6 @@ rdfUriHelper:
 
 webhooks:
   dataSetUpdatedUrls:
-   - ${timbuctoo_indexer_url}
   httpClient:
     connectionRequestTimeout: 200ms
 

pom.xml

@@ -6,11 +6,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>nl.knaw.huygens</groupId>
   <artifactId>timbuctoo</artifactId>
-  <version>4.4.0-SNAPSHOT</version>
+  <version>7.15</version>
 
   <name>Timbuctoo</name>
   <description>
-    Back-end software that provides different front-ends to share data and variations on that data.
+    An RDF datastore that gives researchers control over the sharing of data between datasets
   </description>
   <organization>
     <name>Huygens ING</name>

src/main/java/nl/knaw/huygens/timbuctoo/webhook/WebhookFactory.java

@@ -9,6 +9,7 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -23,13 +24,13 @@ public class WebhookFactory {
 
   @JsonSetter("dataSetUpdatedUrls")
   public void setDataSetUpdatedUrls(List<String> dataSetUpdatedUrls) {
-    this.dataSetUpdatedUrls = dataSetUpdatedUrls.stream()
+    this.dataSetUpdatedUrls = dataSetUpdatedUrls != null ? dataSetUpdatedUrls.stream()
       .filter(Objects::nonNull)
-      .collect(Collectors.toList());
+      .collect(Collectors.toList()) : new ArrayList<>();
   }
 
   public Webhooks getWebHook(Environment environment) {
-    if (dataSetUpdatedUrls != null && !dataSetUpdatedUrls.isEmpty()) {
+    if (!dataSetUpdatedUrls.isEmpty()) {
       final CloseableHttpClient httpClient = new HttpClientBuilder(environment)
         .using(httpClientConfig)
         .build("webhook-client");

src/test/resources/test_config.yaml

@@ -125,7 +125,6 @@ rdfUriHelper:
 
 webhooks:
   dataSetUpdatedUrls:
-   -
   httpClient:
     connectionRequestTimeout: 200ms