diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionDuration.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionDuration.java similarity index 87% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionDuration.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionDuration.java index 204491e364..664b672f63 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionDuration.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionDuration.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionJSR223.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionJSR223.java similarity index 92% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionJSR223.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionJSR223.java index e5706ac528..a4e34310ad 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionJSR223.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionJSR223.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionJsonPath.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionJsonPath.java similarity index 91% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionJsonPath.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionJsonPath.java index aaff354c0e..da59605423 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionJsonPath.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionJsonPath.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionRegex.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionRegex.java similarity index 91% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionRegex.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionRegex.java index 9b43777a49..a1c914d447 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionRegex.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionRegex.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionType.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionType.java similarity index 90% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionType.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionType.java index 91ca271293..4ab8afb983 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionType.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionType.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import lombok.Data; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionXPath2.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionXPath2.java similarity index 89% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionXPath2.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionXPath2.java index 0aaf4823a2..3cca9ce4e1 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertionXPath2.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertionXPath2.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertions.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertions.java similarity index 93% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertions.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertions.java index c089fb6fd1..4602740e3f 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/assertion/MsAssertions.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/assertion/MsAssertions.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.assertion; +package io.metersphere.api.dto.request.assertion; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/logic/controller/MsLoopController.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/logic/controller/MsLoopController.java similarity index 87% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/logic/controller/MsLoopController.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/logic/controller/MsLoopController.java index c839fff40b..1b2d4c5ec4 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/logic/controller/MsLoopController.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/logic/controller/MsLoopController.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.logic.controller; +package io.metersphere.api.dto.request.logic.controller; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtract.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtract.java similarity index 89% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtract.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtract.java index 75afefd9f8..43c19042c8 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtract.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtract.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.extract; +package io.metersphere.api.dto.request.post.extract; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractCommon.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractCommon.java similarity index 90% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractCommon.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractCommon.java index 1ed96ae0bc..8990615671 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractCommon.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractCommon.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.extract; +package io.metersphere.api.dto.request.post.extract; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractJSONPath.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractJSONPath.java similarity index 81% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractJSONPath.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractJSONPath.java index 4c64849d23..00111c639b 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractJSONPath.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractJSONPath.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.extract; +package io.metersphere.api.dto.request.post.extract; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractRegex.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractRegex.java similarity index 84% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractRegex.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractRegex.java index 44f5463dab..d4a515608e 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractRegex.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractRegex.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.extract; +package io.metersphere.api.dto.request.post.extract; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractType.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractType.java similarity index 81% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractType.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractType.java index 4353ffca54..53c333141d 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractType.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractType.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.extract; +package io.metersphere.api.dto.request.post.extract; import lombok.Data; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractXPath.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractXPath.java similarity index 81% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractXPath.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractXPath.java index ade80dba13..1cd890a060 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/extract/MsExtractXPath.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/extract/MsExtractXPath.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.extract; +package io.metersphere.api.dto.request.post.extract; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/processors/MsPostJSR223Processor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/processors/MsPostJSR223Processor.java similarity index 87% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/processors/MsPostJSR223Processor.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/processors/MsPostJSR223Processor.java index ce6b66ebdb..7f4b8411f8 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/post/processors/MsPostJSR223Processor.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/post/processors/MsPostJSR223Processor.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.post.processors; +package io.metersphere.api.dto.request.post.processors; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/pre/processors/MsPreJSR223Processor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/pre/processors/MsPreJSR223Processor.java similarity index 87% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/pre/processors/MsPreJSR223Processor.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/pre/processors/MsPreJSR223Processor.java index 8d8016a28e..d0540d3d58 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/pre/processors/MsPreJSR223Processor.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/pre/processors/MsPreJSR223Processor.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.pre.processors; +package io.metersphere.api.dto.request.pre.processors; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/processors/MsJSR223Processor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsJSR223Processor.java similarity index 88% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/processors/MsJSR223Processor.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsJSR223Processor.java index 1df1e67249..001e42e85a 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/processors/MsJSR223Processor.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsJSR223Processor.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.processors; +package io.metersphere.api.dto.request.processors; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/sampler/MsDebugSampler.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/sampler/MsDebugSampler.java similarity index 97% rename from backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/sampler/MsDebugSampler.java rename to backend/services/api-test/src/main/java/io/metersphere/api/dto/request/sampler/MsDebugSampler.java index 4c577df961..96ab8e75f7 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/jmeter/sampler/MsDebugSampler.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/sampler/MsDebugSampler.java @@ -1,4 +1,4 @@ -package io.metersphere.api.dto.jmeter.sampler; +package io.metersphere.api.dto.request.sampler; import io.metersphere.plugin.api.annotation.PluginSubType; import io.metersphere.plugin.api.dto.TestElementDTO; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/util/ApiDataUtils.java b/backend/services/api-test/src/main/java/io/metersphere/api/util/ApiDataUtils.java index c9a7ab363c..acaee38bb8 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/util/ApiDataUtils.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/util/ApiDataUtils.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver; import com.fasterxml.jackson.databind.type.CollectionType; -import io.metersphere.api.dto.jmeter.post.processors.MsPostJSR223Processor; -import io.metersphere.api.dto.jmeter.sampler.MsDebugSampler; +import io.metersphere.api.dto.request.post.processors.MsPostJSR223Processor; +import io.metersphere.api.dto.request.sampler.MsDebugSampler; import io.metersphere.sdk.exception.MSException; import java.io.IOException; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/PluginSubTypeTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/PluginSubTypeTests.java index 7c6c0e1ab2..a27b33fe0d 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/PluginSubTypeTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/PluginSubTypeTests.java @@ -1,7 +1,7 @@ package io.metersphere.api.controller; -import io.metersphere.api.dto.jmeter.post.processors.MsPostJSR223Processor; -import io.metersphere.api.dto.jmeter.sampler.MsDebugSampler; +import io.metersphere.api.dto.request.post.processors.MsPostJSR223Processor; +import io.metersphere.api.dto.request.sampler.MsDebugSampler; import io.metersphere.api.util.ApiDataUtils; import io.metersphere.plugin.api.dto.TestElementDTO; import io.metersphere.system.uid.IDGenerator;