From 36a087b2f902c6301cfc5c10bada79bc6d170ae5 Mon Sep 17 00:00:00 2001 From: Hylston Barbosa Date: Fri, 28 Jul 2023 19:24:29 -0300 Subject: [PATCH] removing BoxSDKServiceConfigEntityService which is a circular dependency format fix --- .../boxsdk/BoxSDKServiceConfigProvider.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/webapp/src/main/java/com/box/l10n/mojito/boxsdk/BoxSDKServiceConfigProvider.java b/webapp/src/main/java/com/box/l10n/mojito/boxsdk/BoxSDKServiceConfigProvider.java index 0ff96a05d3..16997ee41a 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/boxsdk/BoxSDKServiceConfigProvider.java +++ b/webapp/src/main/java/com/box/l10n/mojito/boxsdk/BoxSDKServiceConfigProvider.java @@ -1,16 +1,22 @@ package com.box.l10n.mojito.boxsdk; -import com.box.l10n.mojito.service.boxsdk.BoxSDKServiceConfigEntityService; -import org.springframework.beans.factory.annotation.Autowired; +import com.box.l10n.mojito.service.boxsdk.BoxSDKServiceConfigEntityRepository; import org.springframework.stereotype.Component; /** @author wyau */ @Component public class BoxSDKServiceConfigProvider { - @Autowired BoxSDKServiceConfigFromProperties boxSDKServiceConfigFromProperties; + private final BoxSDKServiceConfigFromProperties boxSDKServiceConfigFromProperties; - @Autowired BoxSDKServiceConfigEntityService boxSDKServiceConfigEntityService; + private final BoxSDKServiceConfigEntityRepository boxSDKServiceConfigEntityRepository; + + public BoxSDKServiceConfigProvider( + BoxSDKServiceConfigFromProperties boxSDKServiceConfigFromProperties, + BoxSDKServiceConfigEntityRepository boxSDKServiceConfigEntityRepository) { + this.boxSDKServiceConfigFromProperties = boxSDKServiceConfigFromProperties; + this.boxSDKServiceConfigEntityRepository = boxSDKServiceConfigEntityRepository; + } /** * @return The config to be used @@ -22,7 +28,7 @@ public BoxSDKServiceConfig getConfig() throws BoxSDKServiceException { if (boxSDKServiceConfigFromProperties.isUseConfigsFromProperties()) { result = boxSDKServiceConfigFromProperties; } else { - result = boxSDKServiceConfigEntityService.getBoxSDKServiceConfigEntity(); + result = boxSDKServiceConfigEntityRepository.findFirstByOrderByIdAsc(); if (result == null) { throw new BoxSDKServiceException(