diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java index 4488c38e11..236cf62019 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java @@ -221,7 +221,7 @@ public SingletonStore createIdMappingStore(String pathName, ObjectM openStoresInEnv.put(bigStore.getDataXodusStore().getEnvironment(), bigStore.getDataXodusStore()); openStoresInEnv.put(bigStore.getMetaXodusStore().getEnvironment(), bigStore.getMetaXodusStore()); - return new SingletonStore<>(bigStore); + return new SingletonStore<>(new CachedStore<>(bigStore)); } } diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java index 999182e671..1e8ebc03cc 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java @@ -66,18 +66,6 @@ public class AdminProcessor { private final ObjectWriter jsonWriter = Jackson.MAPPER.writer(); private final Supplier> nodeProvider; - public void addRoles(List roles) { - - for (Role role : roles) { - try { - addRole(role); - } - catch (Exception e) { - log.error(String.format("Failed to add Role: %s", role), e); - } - } - } - public synchronized void addRole(Role role) throws JSONException { ValidatorHelper.failOnError(log, validator.validate(role)); log.trace("New role:\tLabel: {}\tName: {}\tId: {} ", role.getLabel(), role.getName(), role.getId()); @@ -296,7 +284,7 @@ public Object executeScript(String script) { groovy.setProperty("managerNode", getManagerNode()); groovy.setProperty("datasetRegistry", getDatasetRegistry()); groovy.setProperty("jobManager", getJobManager()); - groovy.setProperty("config", getConfig()); + groovy.setProperty("conqueryConfig", getConfig()); groovy.setProperty("storage", getStorage()); try { diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/ScriptEndTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ScriptEndTest.java new file mode 100644 index 0000000000..2aa4ff5f99 --- /dev/null +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/ScriptEndTest.java @@ -0,0 +1,30 @@ +package com.bakdata.conquery.integration.tests; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.net.URI; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + +import com.bakdata.conquery.integration.IntegrationTest; +import com.bakdata.conquery.io.storage.MetaStorage; +import com.bakdata.conquery.resources.admin.rest.AdminResource; +import com.bakdata.conquery.resources.hierarchies.HierarchyHelper; +import com.bakdata.conquery.util.support.StandaloneSupport; + +public class ScriptEndTest extends IntegrationTest.Simple implements ProgrammaticIntegrationTest { + @Override + public void execute(StandaloneSupport conquery) throws Exception { + final URI scriptUri = HierarchyHelper.hierarchicalPath(conquery.defaultAdminURIBuilder() + , AdminResource.class, "executeScript") + .build(); + + try(Response resp = conquery.getClient().target(scriptUri).request(MediaType.TEXT_PLAIN_TYPE).post(Entity.entity("storage", MediaType.TEXT_PLAIN_TYPE))){ + assertThat(resp.getStatusInfo().getFamily()).isEqualTo(Response.Status.Family.SUCCESSFUL); + + assertThat(resp.readEntity(String.class)) + .contains(MetaStorage.class.getSimpleName()); + } + } +}