Small features added

HuygensING · Oct 24, 2022 · 5349c39 · 5349c39
1 parent e2bdf9f
commit 5349c39
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/timbuctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/server/TimbuctooV4.java b/timbuctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/server/TimbuctooV4.java
@@ -215,7 +215,7 @@ public void run(TimbuctooConfiguration configuration, Environment environment) t
 
     final int numThreads = Math.max(Runtime.getRuntime().availableProcessors() - 2, 2);
     DataSetRepository dataSetRepository = configuration.getDataSetConfiguration().createRepository(
-      environment.lifecycle().executorService("dataSet").maxThreads(numThreads).build(),
+      environment.lifecycle().executorService("dataSet").minThreads(numThreads).maxThreads(numThreads).build(),
       securityConfig.getPermissionFetcher(),
       configuration.getDatabases(),
       configuration.getMetadata(),

diff --git a/...ctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/v5/dataset/DataSetRepository.java b/...ctoo-instancev4/src/main/java/nl/knaw/huygens/timbuctoo/v5/dataset/DataSetRepository.java
@@ -220,7 +220,12 @@ public boolean userMatchesPrefix(User user, String prefix) {
 
   public DataSet createDataSet(User user, String dataSetId) throws DataStoreCreationException,
       IllegalDataSetNameException, DataSetCreationException {
-    return createDataSet(user, dataSetId, null);
+    return createDataSet(user, dataSetId, Optional.empty());
+  }
+
+  public DataSet createDataSet(User user, String dataSetId, Optional<String> optBaseUri)
+      throws DataStoreCreationException, IllegalDataSetNameException, DataSetCreationException {
+    return createDataSet(user, dataSetId, optBaseUri, null);
   }
 
   public DataSet createDataSet(User user, String dataSetId,

diff --git a/...src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/metadataprops/MetadataPropsSchema.java b/...src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/metadataprops/MetadataPropsSchema.java
@@ -85,7 +85,7 @@ private static String createReadProp(String name, MetadataProp metadataProp) {
 
   private static String createWriteProp(String name, MetadataProp metadataProp) {
     if (metadataProp instanceof UriMetadataProp) {
-      return name + ": UriInput\n";
+      return name + ": String\n";
     }
     if (metadataProp instanceof SimpleMetadataProp) {
       return name + ": String\n";

diff --git a/...4/src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/mutations/CreateDataSetMutation.java b/...4/src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/mutations/CreateDataSetMutation.java
@@ -11,6 +11,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 import static nl.knaw.huygens.timbuctoo.v5.graphql.mutations.MutationHelpers.getUser;
 
 public class CreateDataSetMutation extends Mutation {
@@ -28,9 +30,11 @@ public Object executeAction(DataFetchingEnvironment env) {
     User currentUser = getUser(env);
 
     String dataSetName = env.getArgument("dataSetName");
+    String baseUri = env.getArgument("baseUri");
+
     try {
       return new DataSetWithDatabase(
-        dataSetRepository.createDataSet(currentUser, dataSetName),
+        dataSetRepository.createDataSet(currentUser, dataSetName, Optional.ofNullable(baseUri)),
         env.<ContextData>getContext().getUserPermissionCheck()
       );
     } catch (DataStoreCreationException e) {

diff --git a/...src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/mutations/DataSetMetadataMutation.java b/...src/main/java/nl/knaw/huygens/timbuctoo/v5/graphql/mutations/DataSetMetadataMutation.java
@@ -75,10 +75,8 @@ private static List<MutationOperation> createMutationOperations(Map<String, Meta
   private static MutationOperation withMetadataProp(String name, MetadataProp metadataProp,
                                                     String baseUri, Map<?, ?> md) {
     if (md.containsKey(name)) {
-      if (metadataProp instanceof UriMetadataProp && md.get(name) instanceof Map &&
-          ((Map<?, ?>) md.get(name)).containsKey("uri")) {
-        String uri = (String) ((Map<?, ?>) md.get(name)).get("uri");
-
+      if (metadataProp instanceof UriMetadataProp) {
+        String uri = (String) md.get(name);
         return replace(metadataProp.getPredicate(), subject(uri));
       } else if (metadataProp instanceof SimpleMetadataProp) {
         String value = (String) md.get(name);

diff --git a/...stancev4/src/main/resources/nl/knaw/huygens/timbuctoo/v5/graphql/rootquery/schema.graphql b/...stancev4/src/main/resources/nl/knaw/huygens/timbuctoo/v5/graphql/rootquery/schema.graphql
@@ -417,10 +417,6 @@ type Message {
   message: String!
 }
 
-input UriInput {
-  uri: String!
-}
-
 input CollectionMetadataInput {
   title: String
   archeType: String
@@ -452,7 +448,7 @@ type Mutation {
   setViewConfig(dataSetId: String!, collectionUri: String!, viewConfig: [ComponentInput!]!): [Component]
   setSummaryProperties(dataSetId: String!, collectionUri: String!, summaryProperties: SummaryPropertiesInput!): SummaryProperties
   setIndexConfig(dataSetId: String!, collectionUri: String!, indexConfig: IndexConfigInput!): IndexConfig!
-  createDataSet(dataSetName: String!): DataSetMetadata!
+  createDataSet(dataSetName: String!, baseUri: String): DataSetMetadata!
   deleteDataSet(dataSetId: String!): RemovedDataSet!
   publish(dataSetId: String!): DataSetMetadata!
   extendSchema(dataSetId: String!, customSchema: [CustomSchemaTypeInput!]!): ExtendSchemaMessage!