Pull request #524 : RED-6224: Made dictionary cache multitenancy ready

Merge in RED/redaction-service from RED-6224 to master * commit '339833e2d6f4f85757f7fdb84c2006f17d766f38': RED-6224: Fixed pr findings RED-6224: Made dictionary cache multitenancy ready
RED-6224: Fixed pr findings
2023-03-17 16:17:57 +01:00 · 2023-03-17 16:07:20 +01:00 · 2023-03-17 13:54:22 +01:00 · 2023-03-16 10:33:38 +01:00 · 2023-03-15 18:16:53 +01:00 · 2023-03-15 16:40:04 +01:00
14 changed files with 175 additions and 101 deletions
@@ -12,7 +12,7 @@

    <artifactId>redaction-service-v1</artifactId>
    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>4.0-SNAPSHOT</version>

    <packaging>pom</packaging>

@@ -6,7 +6,7 @@
    <parent>
        <artifactId>redaction-service-v1</artifactId>
        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>4.0-SNAPSHOT</version>
    </parent>

    <artifactId>redaction-service-api-v1</artifactId>
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>redaction-service-v1</artifactId>
        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>4.0-SNAPSHOT</version>
    </parent>

    <artifactId>redaction-service-server-v1</artifactId>
@@ -93,6 +93,7 @@
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
            <artifactId>metric-commons</artifactId>
+            <version>1.7.0</version>
        </dependency>
        <!-- other external -->
        <dependency>
@@ -9,7 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.multitenancy.AsyncConfig;
 import com.iqser.red.service.redaction.v1.server.multitenancy.MultiTenancyMessagingConfiguration;
@@ -19,7 +18,7 @@ import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettin
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;

-@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MultiTenancyMessagingConfiguration.class})
+@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MultiTenancyMessagingConfiguration.class, MetricsConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.iqser.gin4.commons.metrics.MetricCommonsConfiguration;
+import com.iqser.gin4.commons.metrics.meters.FunctionTimerFactory;
+import com.iqser.gin4.commons.metrics.meters.FunctionTimerValues;
+
+@Configuration
+@Import({MetricCommonsConfiguration.class})
+public class MetricsConfiguration {
+
+    private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
+
+
+    @Bean
+    @Qualifier(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME)
+    public FunctionTimerValues redactmanagerAnalyzePagewise(FunctionTimerFactory factory) {
+
+        return factory.create(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME);
+    }
+
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class TenantDictionary {
+
+    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
+    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
+}
@@ -1,24 +1,44 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntry;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;

-import feign.FeignException;
-import io.micrometer.core.annotation.Timed;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.PostConstruct;

 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;

-import java.awt.*;
-import java.util.List;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntry;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryEntries;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.TenantDictionary;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
+import feign.FeignException;
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@@ -28,22 +48,39 @@ public class DictionaryService {
    private static final String DEFAULT_COLOR = "#cccccc";
    private final DictionaryClient dictionaryClient;

-    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
-    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
+    private final RedactionServiceSettings settings;
+
+    private LoadingCache<String, TenantDictionary> tenantDictionaryCache;


+    @PostConstruct
+    protected void createCache() {
+
+        tenantDictionaryCache = CacheBuilder.newBuilder()
+                .maximumSize(settings.getDictionaryCacheMaximumSize())
+                .expireAfterAccess(settings.getDictionaryCacheExpireAfterAccessDays(), TimeUnit.DAYS)
+                .build(new CacheLoader<>() {
+                    public TenantDictionary load(String key) {
+
+                        return new TenantDictionary();
+                    }
+                });
+    }
+
+
+    @SneakyThrows
    @Timed("redactmanager_updateDictionary")
    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

        log.info("Updating dictionary data for dossierTemplate {} and dossier {}", dossierTemplateId, dossierId);
        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId);
-        var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
+        var dossierTemplateDictionary = getDossierTemplateDictionary(dossierTemplateId);
        if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, getVersion(dossierTemplateDictionary), null);
        }

        long dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
-        var dossierDictionary = dictionariesByDossier.get(dossierId);
+        var dossierDictionary = getDossierDictionary(dossierId);
        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, getVersion(dossierDictionary), dossierId);
        }
@@ -52,13 +89,14 @@ public class DictionaryService {
    }


+    @SneakyThrows
    @Timed("redactmanager_getDictionaryIncrements")
    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {

        DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);

        Set<DictionaryIncrementValue> newValues = new HashSet<>();
-        List<DictionaryModel> dictionaryModels = dictionariesByDossierTemplate.get(dossierTemplateId).getDictionary();
+        List<DictionaryModel> dictionaryModels = getDossierTemplateDictionary(dossierTemplateId).getDictionary();
        dictionaryModels.forEach(dictionaryModel -> {
            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
@@ -77,8 +115,8 @@ public class DictionaryService {
            });
        });

-        if (dictionariesByDossier.containsKey(dossierId)) {
-            dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();
+        if (dossierDictionaryExists(dossierId)) {
+            dictionaryModels = getDossierDictionary(dossierId).getDictionary();
            dictionaryModels.forEach(dictionaryModel -> {
                dictionaryModel.getEntries().forEach(dictionaryEntry -> {
                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
@@ -102,6 +140,7 @@ public class DictionaryService {
    }


+    @SneakyThrows
    private void updateDictionaryEntry(String dossierTemplateId, long version, Long currentVersion, String dossierId) {

        try {
@@ -115,10 +154,10 @@ public class DictionaryService {

                    Optional<DictionaryModel> oldModel;
                    if (dossierId == null) {
-                        var representation = dictionariesByDossierTemplate.get(dossierTemplateId);
+                        var representation = getDossierTemplateDictionary(dossierTemplateId);
                        oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
                    } else {
-                        var representation = dictionariesByDossier.get(dossierId);
+                        var representation = getDossierDictionary(dossierId);
                        oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
                    }

@@ -178,9 +217,9 @@ public class DictionaryService {
                dictionaryRepresentation.setDictionary(dictionary);

                if (dossierId == null) {
-                    dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
+                    addDictionaryRepresentationForDossierTemplate(dossierTemplateId, dictionaryRepresentation);
                } else {
-                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
+                    addDictionaryRepresentationForDossier(dossierId, dictionaryRepresentation);
                }
            }
        } catch (FeignException e) {
@@ -219,19 +258,21 @@ public class DictionaryService {
    }


+    @SneakyThrows
    public float[] getColor(String type, String dossierTemplateId) {

-        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        DictionaryModel model = getDossierTemplateDictionary(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.getColor();
        }
-        return dictionariesByDossierTemplate.get(dossierTemplateId).getDefaultColor();
+        return getDossierTemplateDictionary(dossierTemplateId).getDefaultColor();
    }


+    @SneakyThrows
    public boolean isHint(String type, String dossierTemplateId) {

-        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        DictionaryModel model = getDossierTemplateDictionary(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isHint();
        }
@@ -239,20 +280,21 @@ public class DictionaryService {
    }


+    @SneakyThrows
    @Timed("redactmanager_getDeepCopyDictionary")
    public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {

        List<DictionaryModel> copy = new ArrayList<>();

-        var dossierTemplateRepresentation = dictionariesByDossierTemplate.get(dossierTemplateId);
+        var dossierTemplateRepresentation = getDossierTemplateDictionary(dossierTemplateId);
        dossierTemplateRepresentation.getDictionary().forEach(dm -> {
            copy.add(SerializationUtils.clone(dm));
        });

        //TODO merge dictionaries if they have same names
        long dossierDictionaryVersion = -1;
-        if (dictionariesByDossier.containsKey(dossierId)) {
-            var dossierRepresentation = dictionariesByDossier.get(dossierId);
+        if (dossierDictionaryExists(dossierId)) {
+            var dossierRepresentation = getDossierDictionary(dossierId);
            dossierRepresentation.getDictionary().forEach(dm -> {
                copy.add(SerializationUtils.clone(dm));
            });
@@ -264,9 +306,45 @@ public class DictionaryService {
    }


+    @SneakyThrows
    public float[] getNotRedactedColor(String dossierTemplateId) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getNotRedactedColor();
+        return getDossierTemplateDictionary(dossierTemplateId).getNotRedactedColor();
+    }
+
+
+    @SneakyThrows
+    private void addDictionaryRepresentationForDossierTemplate(String dossierTemplateId, DictionaryRepresentation dictionaryRepresentation) {
+
+        tenantDictionaryCache.get(TenantContext.getTenantId()).getDictionariesByDossierTemplate().put(dossierTemplateId, dictionaryRepresentation);
+    }
+
+
+    @SneakyThrows
+    private void addDictionaryRepresentationForDossier(String dossierId, DictionaryRepresentation dictionaryRepresentation) {
+
+        tenantDictionaryCache.get(TenantContext.getTenantId()).getDictionariesByDossier().put(dossierId, dictionaryRepresentation);
+    }
+
+
+    @SneakyThrows
+    private DictionaryRepresentation getDossierTemplateDictionary(String dossierTemplateId) {
+
+        return tenantDictionaryCache.get(TenantContext.getTenantId()).getDictionariesByDossierTemplate().get(dossierTemplateId);
+    }
+
+
+    @SneakyThrows
+    private DictionaryRepresentation getDossierDictionary(String dossierId) {
+
+        return tenantDictionaryCache.get(TenantContext.getTenantId()).getDictionariesByDossier().get(dossierId);
+    }
+
+
+    @SneakyThrows
+    private boolean dossierDictionaryExists(String dossierId) {
+
+        return tenantDictionaryCache.get(TenantContext.getTenantId()).getDictionariesByDossier().containsKey(dossierId);
    }


@@ -8,13 +8,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;

+import com.iqser.gin4.commons.metrics.meters.FunctionTimerValues;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
@@ -53,10 +53,8 @@ import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettin
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;

 import io.micrometer.core.annotation.Timed;
-import io.micrometer.core.instrument.FunctionTimer;
-import io.micrometer.core.instrument.MeterRegistry;
 import lombok.AccessLevel;
-import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
@@ -64,8 +62,11 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
 public class AnalyzeService {

+    private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
+
    DictionaryService dictionaryService;
    DroolsExecutionService droolsExecutionService;
    EntityRedactionService entityRedactionService;
@@ -80,50 +81,8 @@ public class AnalyzeService {
    ImageService imageService;
    ImportedRedactionService importedRedactionService;
    SectionFinder sectionFinder;
-    PagewiseCounter analyzeCounter = new PagewiseCounter();

-
-    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
-    public AnalyzeService(DictionaryService dictionaryService,
-                          DroolsExecutionService droolsExecutionService,
-                          EntityRedactionService entityRedactionService,
-                          RedactionLogCreatorService redactionLogCreatorService,
-                          RedactionStorageService redactionStorageService,
-                          PdfSegmentationService pdfSegmentationService,
-                          RedactionChangeLogService redactionChangeLogService,
-                          LegalBasisClient legalBasisClient,
-                          RedactionServiceSettings redactionServiceSettings,
-                          SectionTextBuilderService sectionTextBuilderService,
-                          SectionGridCreatorService sectionGridCreatorService,
-                          ImageService imageService,
-                          ImportedRedactionService importedRedactionService,
-                          SectionFinder sectionFinder,
-                          MeterRegistry meterRegistry) {
-
-        this.dictionaryService = dictionaryService;
-        this.droolsExecutionService = droolsExecutionService;
-        this.entityRedactionService = entityRedactionService;
-        this.redactionLogCreatorService = redactionLogCreatorService;
-        this.redactionStorageService = redactionStorageService;
-        this.pdfSegmentationService = pdfSegmentationService;
-        this.redactionChangeLogService = redactionChangeLogService;
-        this.legalBasisClient = legalBasisClient;
-        this.redactionServiceSettings = redactionServiceSettings;
-        this.sectionTextBuilderService = sectionTextBuilderService;
-        this.sectionGridCreatorService = sectionGridCreatorService;
-        this.imageService = imageService;
-        this.importedRedactionService = importedRedactionService;
-        this.sectionFinder = sectionFinder;
-
-        // This is just here as an example of how to do a timer with a counter.
-        // For a full implementation this should be moved to a common helper class.
-        FunctionTimer.builder("redactmanager_analyze.pagewise", //
-                        analyzeCounter, //
-                        PagewiseCounter::getTotalPageCount, //
-                        PagewiseCounter::getTotalTimeMillis, //
-                        TimeUnit.MILLISECONDS) //
-                .register(meterRegistry);
-    }
+    FunctionTimerValues redactmanagerAnalyzePagewiseValues;


    @Timed("redactmanager_analyzeDocumentStructure")
@@ -296,7 +255,7 @@ public class AnalyzeService {

        long duration = System.currentTimeMillis() - startTime;

-        analyzeCounter.increase(text.getNumberOfPages(), duration);
+        redactmanagerAnalyzePagewiseValues.increase(text.getNumberOfPages(), duration);

        return AnalyzeResult.builder()
                .dossierId(analyzeRequest.getDossierId())
@@ -347,21 +306,4 @@ public class AnalyzeService {
        return SimplifiedText.builder().numberOfPages(numberOfPages).sectionTexts(sectionTexts).build();
    }

-
-    @FieldDefaults(level = AccessLevel.PRIVATE)
-    @Getter
-    private static final class PagewiseCounter {
-
-        long totalPageCount;
-        long totalTimeMillis;
-
-
-        public void increase(long pageCount, long durationMillis) {
-
-            totalPageCount += pageCount;
-            totalTimeMillis += durationMillis;
-        }
-
-    }
-
 }
@@ -24,4 +24,8 @@ public class RedactionServiceSettings {

    private boolean priorityMode;

+    private long dictionaryCacheMaximumSize = 100;
+
+    private int dictionaryCacheExpireAfterAccessDays = 3;
+
 }
@@ -27,6 +27,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
@@ -63,6 +64,8 @@ public class DictionaryServiceTest {
    @Test
    public void testDictionaryServiceConsistency() {

+        TenantContext.setTenantId("redaction");
+
        when(dictionaryClient.getVersion(anyString())).thenReturn(0L);
        when(dictionaryClient.getColors(anyString())).thenReturn(new Colors("dossierTemplateId",
                "#cccccc",
@@ -240,6 +240,7 @@ public class HeadlinesGoldStandardIntegrationTest {
    @BeforeEach
    public void stubClients() {

+        TenantContext.setTenantId("redaction");
        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(JSONPrimitive.of(RULES));

@@ -213,6 +213,8 @@ public class RedactionIntegrationTest {
    @BeforeEach
    public void stubClients() {

+        TenantContext.setTenantId("redaction");
+
        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(JSONPrimitive.of(RULES));

@@ -245,6 +245,7 @@ public class RulesTest {
    @BeforeEach
    public void stubClients() {

+        TenantContext.setTenantId("redaction");
        objectMapper.registerModule(new JavaTimeModule());
        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

@@ -42,6 +42,7 @@ import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.redaction.v1.server.queue.RedactionMessageReceiver;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
@@ -114,6 +115,7 @@ public class LiveDataIntegrationTest {
    @BeforeEach
    public void prepareTest() {

+        TenantContext.setTenantId("redaction");
        when(dictionaryClient.getVersion(anyString())).thenReturn(1L);
        when(dictionaryClient.getVersionForDossier(anyString())).thenReturn(1L);
Author	SHA1	Message	Date
Dominique Eiflaender	cec18a472f	Pull request #524 : RED-6224: Made dictionary cache multitenancy ready Merge in RED/redaction-service from RED-6224 to master * commit '339833e2d6f4f85757f7fdb84c2006f17d766f38': RED-6224: Fixed pr findings RED-6224: Made dictionary cache multitenancy ready	2023-03-17 16:17:57 +01:00
deiflaender	339833e2d6	RED-6224: Fixed pr findings	2023-03-17 16:07:20 +01:00
deiflaender	ec0de5b6a2	RED-6224: Made dictionary cache multitenancy ready	2023-03-17 13:54:22 +01:00
Viktor Seifert	4b42c8d13f	Pull request #523 : RED-6250 Merge in RED/redaction-service from RED-6250 to master * commit 'fe5121b1edf784d5cc57abd9cd8e27f70dea0f4a': RED-6250: Switched to new metrics-commons version to not have to instantiate a factory (reduces code duplication) RED-6250: Changed function-timer metric to use code from metric commons	2023-03-16 10:33:38 +01:00
Viktor Seifert	fe5121b1ed	RED-6250: Switched to new metrics-commons version to not have to instantiate a factory (reduces code duplication)	2023-03-15 18:16:53 +01:00
Viktor Seifert	519bb9cb52	RED-6250: Changed function-timer metric to use code from metric commons	2023-03-15 16:40:04 +01:00
Timo Bejan	6c0886e2c4	Pull request #522 : RED-6162 - bumped version Merge in RED/redaction-service from RED-6162 to master * commit '9f396cccdf4b6762904c12923c6ba278398869ca': RED-6162 - bumped version	2023-03-10 21:44:17 +01:00
Dominique Eiflaender	9f70fb75dd	Pull request #521 : RED-4645: Multitenancy for storage Merge in RED/redaction-service from RED-4645 to master * commit 'c13d148ae7bc4a8f9e4d9355fc93e66e97603eac': RED-4645: Multitenancy for storage	2023-03-10 16:44:18 +01:00
Timo Bejan	9f396cccdf	RED-6162 - bumped version	2023-03-10 15:58:29 +02:00