From c27205c463526f1dcf479fa03d83bdad158869d0 Mon Sep 17 00:00:00 2001 From: rchen9 Date: Mon, 23 Sep 2024 16:05:14 +0800 Subject: [PATCH] feat: add the logic "expire" to ComparisonIgnoreCategory --- .../beans/ExpandableBeanConfiguration.java | 7 ++++ .../controller/ReportQueryController.java | 1 + .../ComparisonExclusionsController.java | 39 +++++++------------ .../ComparisonIgnoreCategoryController.java | 29 ++++++++------ .../ComparisonRootTransformController.java | 16 +++----- .../config/ComparisonTransformController.java | 36 ++++++----------- ...AbstractComparisonConfigurableHandler.java | 9 +++-- ...mparisonExclusionsConfigurableHandler.java | 7 ++-- .../replay/ComparisonSummaryService.java | 13 +++++-- ...omparisonTransformConfigurableHandler.java | 4 +- .../filesystem/FileSystemService.java | 10 ++--- ...bstractComparisonDetailsConfiguration.java | 7 ++++ pom.xml | 2 +- 13 files changed, 87 insertions(+), 93 deletions(-) diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/beans/ExpandableBeanConfiguration.java b/arex-web-api/src/main/java/com/arextest/web/api/service/beans/ExpandableBeanConfiguration.java index 5e9340ea..c2272145 100644 --- a/arex-web-api/src/main/java/com/arextest/web/api/service/beans/ExpandableBeanConfiguration.java +++ b/arex-web-api/src/main/java/com/arextest/web/api/service/beans/ExpandableBeanConfiguration.java @@ -3,6 +3,7 @@ import com.arextest.common.cache.CacheProvider; import com.arextest.config.repository.impl.SystemConfigurationRepositoryImpl; import com.arextest.web.core.business.ConfigLoadService; +import com.arextest.web.core.business.filesystem.FileSystemService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -38,4 +39,10 @@ public SystemConfigBootstrap systemConfigBootstrap( return new SystemConfigBootstrap(configLoadService, systemConfigurationRepository); } + @Bean + @ConditionalOnMissingBean(FileSystemService.class) + public FileSystemService fileSystemService() { + return new FileSystemService(); + } + } diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/ReportQueryController.java b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/ReportQueryController.java index 3c2687f6..d3ba1398 100644 --- a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/ReportQueryController.java +++ b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/ReportQueryController.java @@ -450,6 +450,7 @@ public Response syncResponse(@Valid @RequestBody OverwriteContractRequestType re return ResponseUtils.successResponse(schemaInferService.overwriteContract(requestType)); } + // todo from storage to get it @GetMapping("/listCategoryType") @ResponseBody public Response listCategoryType() { diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonExclusionsController.java b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonExclusionsController.java index 9d926ff5..1bdbc5bf 100644 --- a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonExclusionsController.java +++ b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonExclusionsController.java @@ -7,11 +7,7 @@ import com.arextest.web.model.contract.contracts.config.replay.ComparisonExclusionsConfiguration; import com.arextest.web.model.contract.contracts.config.replay.QueryComparisonRequestType; import java.util.List; -import javax.annotation.Resource; -import lombok.Getter; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,13 +20,13 @@ public class ComparisonExclusionsController extends AbstractConfigurableController { - @Getter - @Resource - ComparisonExclusionsConfigurableHandler comparisonExclusionsConfigurableHandler; + ComparisonExclusionsConfigurableHandler exclusionsHandler; - public ComparisonExclusionsController( - @Autowired ConfigurableHandler configurableHandler) { + protected ComparisonExclusionsController( + ConfigurableHandler configurableHandler, + ComparisonExclusionsConfigurableHandler exclusionsHandler) { super(configurableHandler); + this.exclusionsHandler = exclusionsHandler; } @Deprecated @@ -42,12 +38,9 @@ public final Response useResultList(@RequestParam String appId, if (StringUtils.isEmpty(appId)) { return InvalidResponse.REQUESTED_APP_ID_IS_EMPTY; } - List configs = - getComparisonExclusionsConfigurableHandler().useResultAsList(appId, operationId); - if (filterExpired && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> getComparisonExclusionsConfigurableHandler().removeDetailsExpired(config)); - } + List configs = exclusionsHandler.useResultAsList(appId, + operationId); + exclusionsHandler.removeDetailsExpired(configs, filterExpired); return ResponseUtils.successResponse(configs); } @@ -64,25 +57,19 @@ public final Response queryByInterfaceId(@RequestParam String interfaceId, if (StringUtils.isEmpty(interfaceId)) { return InvalidResponse.REQUESTED_INTERFACE_ID_IS_EMPTY; } - List configs = - getComparisonExclusionsConfigurableHandler().queryByInterfaceId(interfaceId); - if (filterExpired && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> getComparisonExclusionsConfigurableHandler().removeDetailsExpired(config)); - } + List configs = exclusionsHandler.queryByInterfaceId( + interfaceId); + exclusionsHandler.removeDetailsExpired(configs, filterExpired); return ResponseUtils.successResponse(configs); } @PostMapping("/queryComparisonConfig") @ResponseBody public Response queryComparisonConfig(@RequestBody QueryComparisonRequestType request) { - List configs = getComparisonExclusionsConfigurableHandler().queryComparisonConfig( + List configs = exclusionsHandler.queryComparisonConfig( request.getAppId(), request.getOperationId(), request.getOperationType(), request.getOperationName()); - if (Boolean.TRUE.equals(request.getFilterExpired()) && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> getComparisonExclusionsConfigurableHandler().removeDetailsExpired(config)); - } + exclusionsHandler.removeDetailsExpired(configs, request.getFilterExpired()); return ResponseUtils.successResponse(configs); } diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonIgnoreCategoryController.java b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonIgnoreCategoryController.java index 789fbfb0..2473bdcc 100644 --- a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonIgnoreCategoryController.java +++ b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonIgnoreCategoryController.java @@ -6,10 +6,8 @@ import com.arextest.web.core.business.config.replay.ComparisonIgnoreCategoryConfigurableHandler; import com.arextest.web.model.contract.contracts.config.replay.ComparisonIgnoreCategoryConfiguration; import com.arextest.web.model.contract.contracts.config.replay.QueryComparisonRequestType; -import javax.annotation.Resource; -import lombok.Getter; +import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,13 +25,13 @@ public class ComparisonIgnoreCategoryController extends AbstractConfigurableController { - @Getter - @Resource - ComparisonIgnoreCategoryConfigurableHandler configurableHandler; + ComparisonIgnoreCategoryConfigurableHandler ignoreCategoryHandler; protected ComparisonIgnoreCategoryController( - @Autowired ConfigurableHandler configurableHandler) { + ConfigurableHandler configurableHandler, + ComparisonIgnoreCategoryConfigurableHandler ignoreCategoryHandler) { super(configurableHandler); + this.ignoreCategoryHandler = ignoreCategoryHandler; } /** @@ -41,18 +39,25 @@ protected ComparisonIgnoreCategoryController( */ @RequestMapping("/queryByInterfaceId") @ResponseBody - public final Response queryByInterfaceId(@RequestParam String interfaceId) { + public final Response queryByInterfaceId(@RequestParam String interfaceId, + @RequestParam(defaultValue = "false") Boolean filterExpired) { if (StringUtils.isEmpty(interfaceId)) { return InvalidResponse.REQUESTED_INTERFACE_ID_IS_EMPTY; } - return ResponseUtils.successResponse(getConfigurableHandler().queryByInterfaceId(interfaceId)); + + List configs = ignoreCategoryHandler.queryByInterfaceId( + interfaceId); + ignoreCategoryHandler.removeDetailsExpired(configs, filterExpired); + return ResponseUtils.successResponse(configs); } @PostMapping("/queryComparisonConfig") @ResponseBody public Response queryComparisonConfig(@RequestBody QueryComparisonRequestType request) { - return ResponseUtils.successResponse( - this.configurableHandler.queryComparisonConfig(request.getAppId(), - request.getOperationId(), request.getOperationType(), request.getOperationName())); + List configs = + this.ignoreCategoryHandler.queryComparisonConfig(request.getAppId(), + request.getOperationId(), request.getOperationType(), request.getOperationName()); + ignoreCategoryHandler.removeDetailsExpired(configs, request.getFilterExpired()); + return ResponseUtils.successResponse(configs); } } diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonRootTransformController.java b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonRootTransformController.java index eb424772..cc06ce8b 100644 --- a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonRootTransformController.java +++ b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonRootTransformController.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.stream.Collectors; import javax.annotation.Resource; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,17 +31,12 @@ public Response queryComparisonConfig(@RequestBody QueryComparisonRequestType re List configs = comparisonTransformConfigurableHandler. queryComparisonConfig(request.getAppId(), request.getOperationId(), request.getOperationType(), request.getOperationName()); - if (Boolean.TRUE.equals(request.getFilterExpired()) && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> comparisonTransformConfigurableHandler.removeDetailsExpired(config)); - } + comparisonTransformConfigurableHandler.removeDetailsExpired(configs, + request.getFilterExpired()); List rootTransformConfigurations = configs.stream() - .map(ConfigComparisonTransformMapper.INSTANCE::requestTypeFromDto).filter(item -> { - if (item.getTransformMethodName() != null) { - return true; - } - return false; - }).collect(Collectors.toList()); + .map(ConfigComparisonTransformMapper.INSTANCE::requestTypeFromDto) + .filter(item -> item.getTransformMethodName() != null) + .collect(Collectors.toList()); return ResponseUtils.successResponse(rootTransformConfigurations); } diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonTransformController.java b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonTransformController.java index f6cabe4a..a23df6f0 100644 --- a/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonTransformController.java +++ b/arex-web-api/src/main/java/com/arextest/web/api/service/controller/config/ComparisonTransformController.java @@ -7,11 +7,7 @@ import com.arextest.web.model.contract.contracts.config.replay.ComparisonTransformConfiguration; import com.arextest.web.model.contract.contracts.config.replay.QueryComparisonRequestType; import java.util.List; -import javax.annotation.Resource; -import lombok.Getter; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -25,13 +21,13 @@ public class ComparisonTransformController extends AbstractConfigurableController { - @Getter - @Resource - ComparisonTransformConfigurableHandler comparisonTransformConfigurableHandler; + ComparisonTransformConfigurableHandler transformHandler; public ComparisonTransformController( - @Autowired ConfigurableHandler configurableHandler) { + ConfigurableHandler configurableHandler, + ComparisonTransformConfigurableHandler transformHandler) { super(configurableHandler); + this.transformHandler = transformHandler; } @Deprecated @@ -44,11 +40,8 @@ public final Response useResultList(@RequestParam String appId, return InvalidResponse.REQUESTED_APP_ID_IS_EMPTY; } List configs = - getComparisonTransformConfigurableHandler().useResultAsList(appId, operationId); - if (filterExpired && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> getComparisonTransformConfigurableHandler().removeDetailsExpired(config)); - } + transformHandler.useResultAsList(appId, operationId); + transformHandler.removeDetailsExpired(configs, filterExpired); return ResponseUtils.successResponse(configs); } @@ -66,24 +59,18 @@ public final Response queryByInterfaceId(@RequestParam String interfaceId, return InvalidResponse.REQUESTED_INTERFACE_ID_IS_EMPTY; } List configs = - getComparisonTransformConfigurableHandler().queryByInterfaceId(interfaceId); - if (filterExpired && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> getComparisonTransformConfigurableHandler().removeDetailsExpired(config)); - } + transformHandler.queryByInterfaceId(interfaceId); + transformHandler.removeDetailsExpired(configs, filterExpired); return ResponseUtils.successResponse(configs); } @PostMapping("/queryComparisonConfig") @ResponseBody public Response queryComparisonConfig(@RequestBody QueryComparisonRequestType request) { - List configs = getComparisonTransformConfigurableHandler(). + List configs = transformHandler. queryComparisonConfig(request.getAppId(), request.getOperationId(), request.getOperationType(), request.getOperationName()); - if (Boolean.TRUE.equals(request.getFilterExpired()) && CollectionUtils.isNotEmpty(configs)) { - configs.removeIf( - config -> getComparisonTransformConfigurableHandler().removeDetailsExpired(config)); - } + transformHandler.removeDetailsExpired(configs, request.getFilterExpired()); return ResponseUtils.successResponse(configs); } @@ -93,8 +80,7 @@ public final Response getTransformMethod(@RequestParam String appId) { if (StringUtils.isEmpty(appId)) { return InvalidResponse.REQUESTED_APP_ID_IS_EMPTY; } - return ResponseUtils.successResponse( - getComparisonTransformConfigurableHandler().getTransformMethodList()); + return ResponseUtils.successResponse(transformHandler.getTransformMethodList()); } } \ No newline at end of file diff --git a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/AbstractComparisonConfigurableHandler.java b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/AbstractComparisonConfigurableHandler.java index c34b1c64..8787f529 100644 --- a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/AbstractComparisonConfigurableHandler.java +++ b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/AbstractComparisonConfigurableHandler.java @@ -3,7 +3,6 @@ import com.arextest.config.repository.ConfigRepositoryProvider; import com.arextest.web.core.business.config.AbstractConfigurableHandler; import com.arextest.web.core.repository.AppContractRepository; -import com.arextest.web.model.contract.contracts.common.enums.ExpirationType; import com.arextest.web.model.contract.contracts.config.replay.AbstractComparisonDetailsConfiguration; import com.arextest.web.model.dto.AppContractDto; import com.arextest.web.model.enums.ContractTypeEnum; @@ -16,6 +15,7 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; /** @@ -86,9 +86,10 @@ public List queryComparisonConfig(String appId, String operationId, String op return this.useResultAsList(appId, null); } - public boolean removeDetailsExpired(T comparisonDetails) { - return comparisonDetails.getExpirationType() == ExpirationType.SOFT_TIME_EXPIRED.getCodeValue() - && comparisonDetails.getExpirationDate().getTime() < System.currentTimeMillis(); + public void removeDetailsExpired(List comparisonDetails, Boolean filterExpired) { + if (CollectionUtils.isNotEmpty(comparisonDetails) && Boolean.TRUE.equals(filterExpired)) { + comparisonDetails.removeIf(T::expired); + } } @Override diff --git a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonExclusionsConfigurableHandler.java b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonExclusionsConfigurableHandler.java index d90444f7..a67c36e2 100644 --- a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonExclusionsConfigurableHandler.java +++ b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonExclusionsConfigurableHandler.java @@ -36,9 +36,10 @@ protected ComparisonExclusionsConfigurableHandler( public List queryConfigOfCategory(String appId, String operationId, List dependencyIds) { - List configs = comparisonExclusionsConfigurationRepository.queryConfigOfCategory( - appId, operationId, dependencyIds); - configs.removeIf(this::removeDetailsExpired); + List configs = + comparisonExclusionsConfigurationRepository.queryConfigOfCategory(appId, operationId, + dependencyIds); + removeDetailsExpired(configs, true); return configs; } diff --git a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonSummaryService.java b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonSummaryService.java index 559bde8e..71975808 100644 --- a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonSummaryService.java +++ b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonSummaryService.java @@ -205,6 +205,8 @@ protected void getComparisonExclusionsConfiguration(String interfaceId, Set> exclusionSet = new HashSet<>(); List comparisonExclusionsConfigurationList = exclusionsConfigurableHandler.queryByInterfaceId(interfaceId); + exclusionsConfigurableHandler.removeDetailsExpired(comparisonExclusionsConfigurationList + , true); Optional.ofNullable(comparisonExclusionsConfigurationList).orElse(Collections.emptyList()) .forEach(item -> { exclusionSet.add(item.getExclusions()); @@ -217,6 +219,8 @@ protected void getComparisonInclusionsConfiguration(String interfaceId, Set> inclusionSet = new HashSet<>(); List comparisonInclusionsConfigurationList = inclusionsConfigurableHandler.queryByInterfaceId(interfaceId); + inclusionsConfigurableHandler.removeDetailsExpired( + comparisonInclusionsConfigurationList, true); Optional.ofNullable(comparisonInclusionsConfigurationList).orElse(Collections.emptyList()) .forEach(item -> { inclusionSet.add(item.getInclusions()); @@ -229,6 +233,8 @@ protected void getComparisonListSortConfiguration(String interfaceId, Map, List>> listSortMap = new HashMap<>(); List comparisonListSortConfigurationList = listSortConfigurableHandler.queryByInterfaceId(interfaceId); + listSortConfigurableHandler.removeDetailsExpired( + comparisonListSortConfigurationList, true); Optional.ofNullable(comparisonListSortConfigurationList).orElse(Collections.emptyList()) .forEach(item -> { if (CollectionUtils.isNotEmpty(item.getListPath())) { @@ -243,6 +249,8 @@ protected void getComparisonReferenceConfiguration(String interfaceId, Map, List> referenceMap = new HashMap<>(); List comparisonReferenceConfigurationList = referenceConfigurableHandler.queryByInterfaceId(interfaceId); + referenceConfigurableHandler.removeDetailsExpired( + comparisonReferenceConfigurationList, true); Optional.ofNullable(comparisonReferenceConfigurationList).orElse(Collections.emptyList()) .forEach(item -> { if (CollectionUtils.isNotEmpty(item.getFkPath())) { @@ -267,10 +275,8 @@ protected Map buildMultiConfig buildComparisonConfig(replayConfigurationMap, exclusionsConfigurableHandler.useResultAsList(appId), (configurations, summaryConfiguration) -> { + exclusionsConfigurableHandler.removeDetailsExpired(configurations, true); Set> operationExclusion = configurations.stream() - .filter(config -> - config.getExpirationType() == ExpirationType.PINNED_NEVER_EXPIRED.getCodeValue() - || config.getExpirationDate().getTime() > System.currentTimeMillis()) .map(ComparisonExclusionsConfiguration::getExclusions).collect(Collectors.toSet()); summaryConfiguration.setExclusionList(operationExclusion); }, operationInfoMap, appContractDtoMap); @@ -278,6 +284,7 @@ protected Map buildMultiConfig buildComparisonConfig(replayConfigurationMap, ignoreCategoryConfigurableHandler.useResultAsList(appId), (configurations, summaryConfiguration) -> { + ignoreCategoryConfigurableHandler.removeDetailsExpired(configurations, true); List ignoreCategoryTypes = configurations.stream() .map(ComparisonIgnoreCategoryConfiguration::getIgnoreCategoryDetail) .collect(Collectors.toList()); diff --git a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonTransformConfigurableHandler.java b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonTransformConfigurableHandler.java index 43b95bbd..da1fecf0 100644 --- a/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonTransformConfigurableHandler.java +++ b/arex-web-core/src/main/java/com/arextest/web/core/business/config/replay/ComparisonTransformConfigurableHandler.java @@ -45,7 +45,7 @@ public List queryConfigOfCategory(String appId String operationId, List dependencyIds) { List configs = comparisonTransformConfigurationRepository.queryConfigOfCategory( appId, operationId, dependencyIds); - configs.removeIf(this::removeDetailsExpired); + removeDetailsExpired(configs, true); return configs; } @@ -74,7 +74,7 @@ public List getTransformMethodList() { SystemConfiguration comparePluginInfoConfig = systemConfigurationService.getSystemConfigByKey( KeySummary.COMPARE_PLUGIN_INFO); - return comparePluginInfoConfig ==null || comparePluginInfoConfig.getComparePluginInfo() == null + return comparePluginInfoConfig == null || comparePluginInfoConfig.getComparePluginInfo() == null ? Collections.emptyList() : comparePluginInfoConfig.getComparePluginInfo().getTransMethodList(); } diff --git a/arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java b/arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java index cdce3789..ecbaf648 100644 --- a/arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java +++ b/arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java @@ -131,10 +131,8 @@ import org.apache.commons.lang3.tuple.Pair; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import org.springframework.stereotype.Component; @Slf4j -@Component public class FileSystemService { private static final String DEFAULT_WORKSPACE_NAME = "MyWorkSpace"; @@ -768,7 +766,7 @@ public FSQueryCaseResponseType queryDebuggingCase(String planId, String recordId header.setActive(true); caseDto.getHeaders().add(0, header); KeyValuePairDto skipMockHeader = generateSkipMockHeader(appId); - if(skipMockHeader != null) { + if (skipMockHeader != null) { caseDto.getHeaders().add(skipMockHeader); } @@ -896,7 +894,6 @@ public List addItemsByAppAndInterface(FSAddItemsByAppAndInterfaceRequest pinMock(pinMockRequest); } - // add the related information about the replay interface to the manual interface this.addReplayInfoToManual(request.getOperationId(), path); return path; @@ -1000,7 +997,8 @@ public boolean importItem(FSImportItemRequestType request) { } public KeyValuePairDto generateSkipMockHeader(String appId) { - List scheduleConfigurations = scheduleConfigurationProvider.listBy(appId); + List scheduleConfigurations = scheduleConfigurationProvider.listBy( + appId); if (CollectionUtils.isEmpty(scheduleConfigurations)) { return null; } @@ -1128,7 +1126,7 @@ private void updateParentId(FSNodeDto fsNodeDto, String parentId, Integer parent } } - private Boolean sendInviteEmail(String arexUiUrl, String invitor, String invitee, + protected Boolean sendInviteEmail(String arexUiUrl, String invitor, String invitee, String workspaceId, String token) { FSTreeDto workspace = fsTreeRepository.queryFSTreeById(workspaceId); diff --git a/arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/config/replay/AbstractComparisonDetailsConfiguration.java b/arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/config/replay/AbstractComparisonDetailsConfiguration.java index 3e9015ad..d2681881 100644 --- a/arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/config/replay/AbstractComparisonDetailsConfiguration.java +++ b/arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/config/replay/AbstractComparisonDetailsConfiguration.java @@ -4,6 +4,7 @@ import com.arextest.web.model.contract.contracts.common.enums.CompareConfigType; import com.arextest.web.model.contract.contracts.common.enums.ExpirationType; import java.util.Date; +import java.util.Optional; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.StringUtils; @@ -64,4 +65,10 @@ public void validParameters() throws Exception { } } + public boolean expired() { + return ExpirationType.SOFT_TIME_EXPIRED.getCodeValue() == expirationType + && Optional.ofNullable(expirationDate).map(Date::getTime).orElse(0L) + < System.currentTimeMillis(); + } + } diff --git a/pom.xml b/pom.xml index 186ee670..210c777c 100644 --- a/pom.xml +++ b/pom.xml @@ -495,7 +495,7 @@ - 0.6.5.3 + 0.6.5.4 0.1.28 0.0.1 1.2.24