diff --git a/layoutparser-service/layoutparser-service-internal-api/pom.xml b/layoutparser-service/layoutparser-service-internal-api/pom.xml index 6c5ac50..7e808d6 100755 --- a/layoutparser-service/layoutparser-service-internal-api/pom.xml +++ b/layoutparser-service/layoutparser-service-internal-api/pom.xml @@ -17,7 +17,7 @@ com.google.guava guava - 31.1-jre + ${guava.version} diff --git a/layoutparser-service/layoutparser-service-processor/pom.xml b/layoutparser-service/layoutparser-service-processor/pom.xml index 3118ed5..dae4061 100644 --- a/layoutparser-service/layoutparser-service-processor/pom.xml +++ b/layoutparser-service/layoutparser-service-processor/pom.xml @@ -14,9 +14,14 @@ com.iqser.red.service - persistence-service-internal-api-v1 + persistence-service-shared-api-v1 2.36.0 + + com.knecon.fforesight + tenant-commons + ${tennat-commons.version} + com.knecon.fforesight layoutparser-service-internal-api @@ -25,12 +30,7 @@ com.iqser.red.commons storage-commons - 1.13.0 - - - com.iqser.red.commons - spring-commons - 6.2.0 + ${storage-commons.version} org.apache.pdfbox @@ -42,11 +42,6 @@ pdfbox-tools ${pdfbox.version} - - com.google.guava - guava - 31.1-jre - com.fasterxml.jackson.module jackson-module-afterburner @@ -57,67 +52,14 @@ jackson-datatype-jsr310 ${jackson.version} - - org.springframework.boot - spring-boot-starter-security - ${spring.version} - org.springframework.boot spring-boot-starter-web - ${spring.version} - - - org.springframework.cloud - spring-cloud-starter-openfeign - 4.0.2 org.springframework.boot spring-boot-starter-amqp - ${spring.version} - - - org.junit.platform - junit-platform-commons - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java index bcdfdbd..8a1fac9 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java @@ -22,7 +22,7 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.PageData; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.TenantContext; +import com.knecon.fforesight.tenantcommons.TenantContext; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/AsyncConfig.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/AsyncConfig.java deleted file mode 100644 index a4dc7d3..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/AsyncConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import java.util.concurrent.Executor; - -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.AsyncConfigurerSupport; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -@Configuration -public class AsyncConfig extends AsyncConfigurerSupport { - - @Override - public Executor getAsyncExecutor() { - - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - - executor.setCorePoolSize(7); - executor.setMaxPoolSize(42); - executor.setQueueCapacity(11); - executor.setThreadNamePrefix("TenantAwareTaskExecutor-"); - executor.setTaskDecorator(new TenantAwareTaskDecorator()); - executor.initialize(); - - return executor; - } - -} \ No newline at end of file diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/EncryptionDecryptionService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/EncryptionDecryptionService.java deleted file mode 100644 index dfda46c..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/EncryptionDecryptionService.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.security.SecureRandom; -import java.security.spec.KeySpec; -import java.util.Base64; - -import javax.crypto.Cipher; -import javax.crypto.SecretKey; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.GCMParameterSpec; -import javax.crypto.spec.PBEKeySpec; -import javax.crypto.spec.SecretKeySpec; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import jakarta.annotation.PostConstruct; -import lombok.SneakyThrows; - -@Service -public class EncryptionDecryptionService { - - @Value("${redaction-service.crypto.key:redaction}") - private String key; - - private SecretKey secretKey; - private byte[] iv; - - - @SneakyThrows - @PostConstruct - protected void postConstruct() { - - SecureRandom secureRandom = new SecureRandom(); - iv = new byte[12]; - secureRandom.nextBytes(iv); - secretKey = generateSecretKey(key, iv); - } - - - @SneakyThrows - public String encrypt(String strToEncrypt) { - - return Base64.getEncoder().encodeToString(encrypt(strToEncrypt.getBytes())); - } - - - @SneakyThrows - public String decrypt(String strToDecrypt) { - - byte[] bytes = Base64.getDecoder().decode(strToDecrypt); - return new String(decrypt(bytes), StandardCharsets.UTF_8); - } - - - @SneakyThrows - public byte[] encrypt(byte[] data) { - - Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); - GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv); - cipher.init(Cipher.ENCRYPT_MODE, secretKey, parameterSpec); - byte[] encryptedData = cipher.doFinal(data); - ByteBuffer byteBuffer = ByteBuffer.allocate(4 + iv.length + encryptedData.length); - byteBuffer.putInt(iv.length); - byteBuffer.put(iv); - byteBuffer.put(encryptedData); - return byteBuffer.array(); - } - - - @SneakyThrows - public byte[] decrypt(byte[] encryptedData) { - - ByteBuffer byteBuffer = ByteBuffer.wrap(encryptedData); - int noonceSize = byteBuffer.getInt(); - if (noonceSize < 12 || noonceSize >= 16) { - throw new IllegalArgumentException("Nonce size is incorrect. Make sure that the incoming data is an AES encrypted file."); - } - byte[] iv = new byte[noonceSize]; - byteBuffer.get(iv); - - SecretKey secretKey = generateSecretKey(key, iv); - - byte[] cipherBytes = new byte[byteBuffer.remaining()]; - byteBuffer.get(cipherBytes); - - Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); - GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv); - cipher.init(Cipher.DECRYPT_MODE, secretKey, parameterSpec); - return cipher.doFinal(cipherBytes); - } - - - @SneakyThrows - public SecretKey generateSecretKey(String password, byte[] iv) { - - KeySpec spec = new PBEKeySpec(password.toCharArray(), iv, 65536, 128); // AES-128 - SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); - byte[] key = secretKeyFactory.generateSecret(spec).getEncoded(); - return new SecretKeySpec(key, "AES"); - } - -} diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/ForwardTenantInterceptor.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/ForwardTenantInterceptor.java deleted file mode 100644 index 196bb42..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/ForwardTenantInterceptor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import org.springframework.stereotype.Component; - -import feign.RequestInterceptor; -import feign.RequestTemplate; - -@Component -public class ForwardTenantInterceptor implements RequestInterceptor { - - public static final String TENANT_HEADER_NAME = "X-TENANT-ID"; - - @Override - public void apply(RequestTemplate template) { - template.header(TENANT_HEADER_NAME, TenantContext.getTenantId()); - } -} \ No newline at end of file diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/MultiTenancyMessagingConfiguration.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/MultiTenancyMessagingConfiguration.java deleted file mode 100644 index f47010d..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/MultiTenancyMessagingConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - - - -import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class MultiTenancyMessagingConfiguration { - - @Bean - public static BeanPostProcessor multitenancyBeanPostProcessor() { - - return new BeanPostProcessor() { - - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - - if (bean instanceof RabbitTemplate) { - - ((RabbitTemplate) bean).setBeforePublishPostProcessors(m -> { - m.getMessageProperties().setHeader(ForwardTenantInterceptor.TENANT_HEADER_NAME, TenantContext.getTenantId()); - return m; - }); - - } else if (bean instanceof AbstractRabbitListenerContainerFactory) { - - ((AbstractRabbitListenerContainerFactory) bean).setAfterReceivePostProcessors(m -> { - String tenant = m.getMessageProperties().getHeader(ForwardTenantInterceptor.TENANT_HEADER_NAME); - - if (tenant != null) { - TenantContext.setTenantId(tenant); - } else { - throw new RuntimeException("No Tenant is set queue message"); - } - return m; - }); - } - return bean; - } - }; - } - -} diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/MultiTenancyWebConfiguration.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/MultiTenancyWebConfiguration.java deleted file mode 100644 index cf099c2..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/MultiTenancyWebConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; - -import com.iqser.red.commons.spring.DefaultWebMvcConfiguration; - -@Configuration -public class MultiTenancyWebConfiguration extends DefaultWebMvcConfiguration { - - private final TenantInterceptor tenantInterceptor; - - - @Autowired - public MultiTenancyWebConfiguration(TenantInterceptor tenantInterceptor) { - - this.tenantInterceptor = tenantInterceptor; - } - - - @Override - public void addInterceptors(InterceptorRegistry registry) { - - registry.addWebRequestInterceptor(tenantInterceptor); - } - -} \ No newline at end of file diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/StorageConnectionProviderImpl.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/StorageConnectionProviderImpl.java deleted file mode 100644 index 592f5d2..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/StorageConnectionProviderImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import org.springframework.stereotype.Service; - -import com.iqser.red.storage.commons.model.AzureStorageConnection; -import com.iqser.red.storage.commons.model.S3StorageConnection; -import com.iqser.red.storage.commons.service.StorageConnectionProvider; - -import lombok.RequiredArgsConstructor; - -@Service -@RequiredArgsConstructor -public class StorageConnectionProviderImpl implements StorageConnectionProvider { - - private final TenantsClient tenantsClient; - private final EncryptionDecryptionService encryptionDecryptionService; - - - @Override - public AzureStorageConnection getAzureStorageConnection(String tenantId) { - - var tenant = tenantsClient.getTenant(tenantId); - return AzureStorageConnection.builder() - .connectionString(encryptionDecryptionService.decrypt(tenant.getAzureStorageConnection().getConnectionString())) - .containerName(tenant.getAzureStorageConnection().getContainerName()) - .build(); - } - - - @Override - public S3StorageConnection getS3StorageConnection(String tenantId) { - - var tenant = tenantsClient.getTenant(tenantId); - return S3StorageConnection.builder() - .key(tenant.getS3StorageConnection().getKey()) - .secret(encryptionDecryptionService.decrypt(tenant.getS3StorageConnection().getSecret())) - .signerType(tenant.getS3StorageConnection().getSignerType()) - .bucketName(tenant.getS3StorageConnection().getBucketName()) - .region(tenant.getS3StorageConnection().getRegion()) - .endpoint(tenant.getS3StorageConnection().getEndpoint()) - .build(); - } - -} diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantAwareTaskDecorator.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantAwareTaskDecorator.java deleted file mode 100644 index a500112..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantAwareTaskDecorator.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import org.springframework.core.task.TaskDecorator; -import org.springframework.lang.NonNull; - -public class TenantAwareTaskDecorator implements TaskDecorator { - - @Override - @NonNull - public Runnable decorate(@NonNull Runnable runnable) { - - String tenantId = TenantContext.getTenantId(); - return () -> { - try { - TenantContext.setTenantId(tenantId); - runnable.run(); - } finally { - TenantContext.setTenantId(null); - } - }; - } - -} \ No newline at end of file diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantContext.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantContext.java deleted file mode 100644 index d042b05..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantContext.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public final class TenantContext { - - private static InheritableThreadLocal currentTenant = new InheritableThreadLocal<>(); - - - public static void setTenantId(String tenantId) { - - log.debug("Setting tenantId to " + tenantId); - currentTenant.set(tenantId); - } - - - public static String getTenantId() { - - return currentTenant.get(); - } - - - public static void clear() { - - currentTenant.remove(); - } - -} \ No newline at end of file diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantInterceptor.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantInterceptor.java deleted file mode 100644 index a077df0..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantInterceptor.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import org.springframework.stereotype.Component; -import org.springframework.ui.ModelMap; -import org.springframework.web.context.request.WebRequest; -import org.springframework.web.context.request.WebRequestInterceptor; - -@Component -public class TenantInterceptor implements WebRequestInterceptor { - - public static final String TENANT_HEADER_NAME = "X-TENANT-ID"; - - - @Override - public void preHandle(WebRequest request) { - - if (request.getHeader(TENANT_HEADER_NAME) != null) { - TenantContext.setTenantId(request.getHeader(TENANT_HEADER_NAME)); - } - } - - - @Override - public void postHandle(WebRequest request, ModelMap model) { - - TenantContext.clear(); - } - - - @Override - public void afterCompletion(WebRequest request, Exception ex) { - - } - -} \ No newline at end of file diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantsClient.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantsClient.java deleted file mode 100644 index 8b7d135..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/TenantsClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.multitenancy; - -import org.springframework.cloud.openfeign.FeignClient; - -import com.iqser.red.service.persistence.service.v1.api.internal.resources.TenantsResource; - -@FeignClient(name = "TenantsResource", url = "${persistence-service.url}") -public interface TenantsClient extends TenantsResource { - -} diff --git a/layoutparser-service/layoutparser-service-server/pom.xml b/layoutparser-service/layoutparser-service-server/pom.xml index bc38329..9b9a296 100644 --- a/layoutparser-service/layoutparser-service-server/pom.xml +++ b/layoutparser-service/layoutparser-service-server/pom.xml @@ -18,24 +18,16 @@ ${project.version} - com.iqser.red.commons - spring-commons - 6.2.0 - - - javax.servlet - javax.servlet-api - 4.0.1 + org.springframework.boot + spring-boot-starter-amqp org.springframework.cloud spring-cloud-starter-openfeign - 4.0.2 org.springframework.boot - spring-boot-starter-amqp - ${spring.version} + spring-boot-starter-actuator org.springframework.boot diff --git a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java index d7286a0..55478bb 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java +++ b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java @@ -2,22 +2,19 @@ package com.knecon.fforesight.service.layoutparser.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Import; import com.amazonaws.services.s3.model.metrics.MetricsConfiguration; import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingServiceProcessorConfiguration; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.AsyncConfig; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.MultiTenancyMessagingConfiguration; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.MultiTenancyWebConfiguration; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.TenantsClient; import com.knecon.fforesight.service.layoutparser.processor.queue.MessagingConfiguration; +import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration; -@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MultiTenancyMessagingConfiguration.class, MetricsConfiguration.class, LayoutParsingServiceProcessorConfiguration.class, StorageAutoConfiguration.class, MessagingConfiguration.class}) -@EnableFeignClients(basePackageClasses = TenantsClient.class) +@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class}) +@Import({MetricsConfiguration.class, StorageAutoConfiguration.class, LayoutParsingServiceProcessorConfiguration.class, MessagingConfiguration.class}) @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) public class Application { diff --git a/layoutparser-service/layoutparser-service-server/src/main/resources/application-dev.yml b/layoutparser-service/layoutparser-service-server/src/main/resources/application-dev.yml index 789bcf1..626c3ba 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/resources/application-dev.yml +++ b/layoutparser-service/layoutparser-service-server/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ server: port: 8083 -persistence-service.url: "http://localhost:8085" +tenant-user-management-service.url: "http://localhost:8091/internal" storage: bucket-name: 'redaction' @@ -9,9 +9,3 @@ storage: key: minioadmin secret: minioadmin - -redaction-service: - enableImageClassification: false - cvTableParsingEnabled: false - nerServiceEnabled: false - priorityMode: false diff --git a/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml b/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml index 0692bdc..83c7a1c 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml +++ b/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml @@ -1,7 +1,8 @@ info: description: Layout Parser Service Processor -persistence-service.url: "http://persistence-service-v1:8080" +tenant-user-management-service.url: "http://tenant-user-management-service:8080/internal" +fforesight.tenants.remote: true server: port: 8080 @@ -9,8 +10,6 @@ server: spring: main: allow-circular-references: true # FIXME - profiles: - active: kubernetes rabbitmq: host: ${RABBITMQ_HOST:localhost} port: ${RABBITMQ_PORT:5672} diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BaseTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BaseTest.java index 962ab2f..1600ed5 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BaseTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BaseTest.java @@ -22,10 +22,10 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import com.iqser.red.storage.commons.service.StorageService; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingStorageService; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.TenantContext; -import com.knecon.fforesight.service.layoutparser.processor.multitenancy.TenantsClient; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; import com.knecon.fforesight.service.layoutparser.server.Application; +import com.knecon.fforesight.tenantcommons.TenantContext; +import com.knecon.fforesight.tenantcommons.TenantsClient; import lombok.SneakyThrows; @@ -40,7 +40,7 @@ public class BaseTest { @Autowired protected StorageService storageService; - @Autowired + @MockBean protected TenantsClient tenantsClient; @MockBean diff --git a/layoutparser-service/pom.xml b/layoutparser-service/pom.xml index 575f493..9d80c40 100644 --- a/layoutparser-service/pom.xml +++ b/layoutparser-service/pom.xml @@ -4,10 +4,9 @@ 4.0.0 - com.iqser.red - platform-dependency - 2.3.0 - + org.springframework.boot + spring-boot-starter-parent + 3.0.6 com.knecon.fforesight @@ -24,26 +23,37 @@ 17 - 2.13.2 - 2.0.7 3.0.0-alpha2 - 3.0.1 - 2022.0.1 + 31.1-jre 2.15.0-rc2 - + 0.10.0 + 2.1.0 UTF-8 + + + org.projectlombok + lombok + 1.18.28 + provided + + + + - org.springdoc - springdoc-openapi-ui - 1.6.13 + org.springframework.cloud + spring-cloud-dependencies + 2022.0.2 + pom + import +