rename url to uri

parodos-dev · Jun 22, 2023 · b69e52f · b69e52f
1 parent 412c094
commit b69e52f
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 21 deletions.
diff --git a/parodos-model-api/src/main/java/com/redhat/parodos/workflow/parameter/WorkParameterType.java b/parodos-model-api/src/main/java/com/redhat/parodos/workflow/parameter/WorkParameterType.java
@@ -27,7 +27,7 @@
  */
 public enum WorkParameterType {
 
-	PASSWORD, TEXT, EMAIL, DATE, NUMBER, URL, SELECT, MULTI_SELECT;
+	PASSWORD, TEXT, EMAIL, DATE, NUMBER, URI, SELECT, MULTI_SELECT;
 
 	private EnumSet<WorkParameterType> selectedTypes() {
 		return EnumSet.of(SELECT, MULTI_SELECT);
@@ -53,9 +53,9 @@ public Map<String, Object> getAsJsonSchema() {
 				properties.put("format", "email");
 			}
 			case NUMBER -> properties.put("type", "number");
-			case URL -> {
+			case URI -> {
 				properties.put("type", "string");
-				properties.put("format", "url");
+				properties.put("format", "uri");
 			}
 			case DATE -> {
 				properties.put("type", "string");

diff --git a/...-model-api/src/test/java/com/redhat/parodos/workflow/parameter/WorkParameterTypeTest.java b/...-model-api/src/test/java/com/redhat/parodos/workflow/parameter/WorkParameterTypeTest.java
@@ -15,7 +15,7 @@ public class WorkParameterTypeTest {
 	@Test
 	public void testJsonSchema() {
 		WorkParameterType[] inputValues = { WorkParameterType.PASSWORD, WorkParameterType.TEXT, WorkParameterType.EMAIL,
-				WorkParameterType.NUMBER, WorkParameterType.URL, WorkParameterType.DATE, WorkParameterType.SELECT,
+				WorkParameterType.NUMBER, WorkParameterType.URI, WorkParameterType.DATE, WorkParameterType.SELECT,
 				WorkParameterType.MULTI_SELECT };
 
 		List<Map<String, Object>> outputs = new ArrayList<>();
@@ -45,7 +45,7 @@ public void testJsonSchema() {
 
 		Map<String, String> expectedURLOutput = new HashMap<>();
 		expectedURLOutput.put("type", "string");
-		expectedURLOutput.put("format", "url");
+		expectedURLOutput.put("format", "uri");
 		assertEquals(expectedURLOutput, outputs.get(4));
 
 		Map<String, String> expectedDateOutput = new HashMap<>();

diff --git a/...mples/src/main/java/com/redhat/parodos/examples/complex/ComplexWorkFlowConfiguration.java b/...mples/src/main/java/com/redhat/parodos/examples/complex/ComplexWorkFlowConfiguration.java
@@ -199,7 +199,7 @@ WorkFlow complexRollbackWorkFlow(RollbackWorkFlowTask rollbackWorkFlowTask) {
 	@Infrastructure(parameters = {
 			@Parameter(key = "workloadId", description = "The workload id", type = WorkParameterType.TEXT,
 					optional = false),
-			@Parameter(key = "projectUrl", description = "The project url", type = WorkParameterType.URL,
+			@Parameter(key = "projectUrl", description = "The project url", type = WorkParameterType.URI,
 					optional = true),
 			@Parameter(key = "WORKFLOW_SELECT_SAMPLE", description = "Workflow select parameter sample",
 					type = WorkParameterType.SELECT, optional = true, selectOptions = { "option1", "option2" },

diff --git a/...ples/src/main/java/com/redhat/parodos/examples/complex/task/LoadBalancerWorkFlowTask.java b/...ples/src/main/java/com/redhat/parodos/examples/complex/task/LoadBalancerWorkFlowTask.java
@@ -24,7 +24,7 @@ public WorkReport execute(WorkContext workContext) {
 	@Override
 	public List<WorkParameter> getWorkFlowTaskParameters() {
 		return List.of(
-				WorkParameter.builder().key("hostname").description("The hostname").type(WorkParameterType.URL)
+				WorkParameter.builder().key("hostname").description("The hostname").type(WorkParameterType.URI)
 						.optional(false).build(),
 				WorkParameter.builder().key("appId").description("The app id").type(WorkParameterType.TEXT)
 						.optional(false).build());

diff --git a/.../src/main/java/com/redhat/parodos/examples/complex/task/SslCertificationWorkFlowTask.java b/.../src/main/java/com/redhat/parodos/examples/complex/task/SslCertificationWorkFlowTask.java
@@ -24,7 +24,7 @@ public WorkReport execute(WorkContext workContext) {
 	@Override
 	public List<WorkParameter> getWorkFlowTaskParameters() {
 		return List.of(
-				WorkParameter.builder().key("domainName").description("The domain name").type(WorkParameterType.URL)
+				WorkParameter.builder().key("domainName").description("The domain name").type(WorkParameterType.URI)
 						.optional(false).build(),
 				WorkParameter.builder().key("ipAddress").description("The api address").type(WorkParameterType.TEXT)
 						.optional(false).build());

diff --git a/...java/com/redhat/parodos/examples/prebuilt/migrationtoolkit/MigrationAnalysisWorkflow.java b/...java/com/redhat/parodos/examples/prebuilt/migrationtoolkit/MigrationAnalysisWorkflow.java
@@ -72,7 +72,7 @@ public GetAnalysisTask getAnalysisTask(Notifier notifier) {
 	@Bean(name = "AnalyzeApplication")
 	@Infrastructure(parameters = {
 			@Parameter(key = "repositoryURL", description = "The repository with the code to analyze",
-					type = WorkParameterType.URL, optional = false),
+					type = WorkParameterType.URI, optional = false),
 			@Parameter(key = "applicationName", description = "The name of the application to analyze",
 					type = WorkParameterType.TEXT, optional = false) })
 	public WorkFlow AnalyzeApplication(CreateApplicationTask createApplicationTask, GetApplicationTask getAppTask,

diff --git a/...va/com/redhat/parodos/examples/prebuilt/migrationtoolkit/MigrationAssessmentWorkflow.java b/...va/com/redhat/parodos/examples/prebuilt/migrationtoolkit/MigrationAssessmentWorkflow.java
@@ -86,7 +86,7 @@ WorkFlowOption defaultOption() {
 	@Bean(name = "AnalyzeApplicationAssessment")
 	@Assessment(parameters = {
 			@Parameter(key = "repositoryURL", description = "The repository with the code to analyze",
-					type = WorkParameterType.URL, optional = false),
+					type = WorkParameterType.URI, optional = false),
 			@Parameter(key = "applicationName", description = "The name of the application to analyze",
 					type = WorkParameterType.TEXT, optional = false),
 			@Parameter(key = "branch", description = "The repository branch to analyze", type = WorkParameterType.TEXT,

diff --git a/...w-examples/src/main/java/com/redhat/parodos/examples/simple/task/LoggingWorkFlowTask.java b/...w-examples/src/main/java/com/redhat/parodos/examples/simple/task/LoggingWorkFlowTask.java
@@ -61,7 +61,7 @@ public WorkReport execute(WorkContext workContext) {
 	@Override
 	public List<WorkParameter> getWorkFlowTaskParameters() {
 		return List.of(
-				WorkParameter.builder().key("api-server").description("The api server").type(WorkParameterType.URL)
+				WorkParameter.builder().key("api-server").description("The api server").type(WorkParameterType.URI)
 						.optional(false).build(),
 				WorkParameter.builder().key("user-id").description("The user id").type(WorkParameterType.TEXT)
 						.optional(false).jsonSchemaOptions(Map.of("minLength", "1", "maxLength", "64")).build());

diff --git a/...w-examples/src/main/java/com/redhat/parodos/examples/simple/task/RestAPIWorkFlowTask.java b/...w-examples/src/main/java/com/redhat/parodos/examples/simple/task/RestAPIWorkFlowTask.java
@@ -67,7 +67,7 @@ public WorkReport execute(WorkContext workContext) {
 	public List<WorkParameter> getWorkFlowTaskParameters() {
 		return List.of(
 				WorkParameter.builder().key(URL_KEY).description("The Url of the service (ie: https://httpbin.org/post")
-						.optional(false).type(WorkParameterType.URL).build(),
+						.optional(false).type(WorkParameterType.URI).build(),
 				WorkParameter.builder().key("user-id").description("The user id").type(WorkParameterType.TEXT)
 						.optional(false).build());
 	}

diff --git a/...-examples/src/main/java/com/redhat/parodos/examples/simple/task/SecureAPIGetTestTask.java b/...-examples/src/main/java/com/redhat/parodos/examples/simple/task/SecureAPIGetTestTask.java
@@ -85,7 +85,7 @@ HttpEntity<String> getRequestWithHeaders(String username, String password) {
 	public List<WorkParameter> getWorkFlowTaskParameters() {
 		return List.of(
 				WorkParameter.builder().key(SECURED_URL).description("The URL of the Secured API you wish to call")
-						.optional(false).type(WorkParameterType.URL).build(),
+						.optional(false).type(WorkParameterType.URI).build(),
 				WorkParameter.builder().key(USERNAME).description("Please enter your username authentication")
 						.optional(false).type(WorkParameterType.TEXT).build(),
 				WorkParameter.builder().key(PASSWORD)

diff --git a/...mples/src/main/java/org/parodos/workflow/examples/custom/CustomWorkFlowConfiguration.java b/...mples/src/main/java/org/parodos/workflow/examples/custom/CustomWorkFlowConfiguration.java
@@ -57,7 +57,7 @@ CustomWorkFlowTask customWorkFlowTaskTwo() {
 	@Infrastructure(parameters = {
 			@Parameter(key = "workloadId", description = "The workload id", type = WorkParameterType.TEXT,
 					optional = false),
-			@Parameter(key = "projectUrl", description = "The project url", type = WorkParameterType.URL,
+			@Parameter(key = "projectUrl", description = "The project url", type = WorkParameterType.URI,
 					optional = true) })
 	WorkFlow customWorkflow(@Qualifier("customWorkFlowTaskOne") CustomWorkFlowTask customWorkFlowTaskOne,
 			@Qualifier("customWorkFlowTaskTwo") CustomWorkFlowTask customWorkFlowTaskTwo) {

diff --git a/...amples/src/test/java/com/redhat/parodos/examples/simple/task/LoggingWorkFlowTaskTest.java b/...amples/src/test/java/com/redhat/parodos/examples/simple/task/LoggingWorkFlowTaskTest.java
@@ -92,7 +92,7 @@ public void getWorkFlowTaskParameters() {
 		// then
 		assertNotNull(loggingWorkFlowTask.getWorkFlowTaskParameters());
 		assertEquals(2, workParameters.size());
-		assertEquals(WorkParameterType.URL, workParameters.get(0).getType());
+		assertEquals(WorkParameterType.URI, workParameters.get(0).getType());
 		assertEquals(WORKFLOW_PARAMETER_API_SERVER_KEY, workParameters.get(0).getKey());
 		assertEquals(WORKFLOW_PARAMETER_API_SERVER_DESCRIPTION, workParameters.get(0).getDescription());
 	}

diff --git a/...amples/src/test/java/com/redhat/parodos/examples/simple/task/RestAPIWorkFlowTaskTest.java b/...amples/src/test/java/com/redhat/parodos/examples/simple/task/RestAPIWorkFlowTaskTest.java
@@ -104,7 +104,7 @@ public void testGetWorkFlowTaskParameters() {
 		assertEquals(2, workParameters.size());
 		assertEquals(URL_KEY, workParameters.get(0).getKey());
 		assertEquals("The Url of the service (ie: https://httpbin.org/post", workParameters.get(0).getDescription());
-		assertEquals(WorkParameterType.URL, workParameters.get(0).getType());
+		assertEquals(WorkParameterType.URI, workParameters.get(0).getType());
 	}
 
 	@Test

diff --git a/...mples/src/test/java/com/redhat/parodos/examples/simple/task/SecureAPIGetTestTaskTest.java b/...mples/src/test/java/com/redhat/parodos/examples/simple/task/SecureAPIGetTestTaskTest.java
@@ -136,7 +136,7 @@ public void getWorkFlowTaskParameters() {
 		assertEquals(3, workParameters.size());
 		assertEquals(SECURED_URL, workParameters.get(0).getKey());
 		assertEquals("The URL of the Secured API you wish to call", workParameters.get(0).getDescription());
-		assertEquals(WorkParameterType.URL, workParameters.get(0).getType());
+		assertEquals(WorkParameterType.URI, workParameters.get(0).getType());
 
 		assertEquals(USERNAME, workParameters.get(1).getKey());
 		assertEquals("Please enter your username authentication", workParameters.get(1).getDescription());

diff --git a/...ava/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImplTest.java b/...ava/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImplTest.java
@@ -108,7 +108,7 @@ public void simpleSaveTest() {
 		WorkFlowDefinition workFlowDefinition = this.sampleWorkFlowDefinition(workFlowName);
 		WorkFlowTask workFlowTask = mock(WorkFlowTask.class);
 		WorkParameter workParameter = WorkParameter.builder().key("key").description("the key").optional(false)
-				.type(WorkParameterType.URL).build();
+				.type(WorkParameterType.URI).build();
 		when(workFlowTask.getName()).thenReturn(workFlowTaskName);
 		when(workFlowTask.getWorkFlowTaskParameters()).thenReturn(List.of(workParameter));
 		WorkFlowTaskDefinition workFlowTaskDefinition = this.sampleWorkFlowTaskDefinition(workFlowDefinition,
@@ -148,7 +148,7 @@ public void simpleSaveTest_skipSave_when_sameWorkflowFoundInDB() {
 		workFlowDefinition.setParameters("{}");
 		WorkFlowTask workFlowTask = mock(WorkFlowTask.class);
 		WorkParameter workParameter = WorkParameter.builder().key("key").description("the key").optional(false)
-				.type(WorkParameterType.URL).build();
+				.type(WorkParameterType.URI).build();
 		when(workFlowTask.getName()).thenReturn(workFlowTaskName);
 		when(workFlowTask.getWorkFlowTaskParameters()).thenReturn(List.of(workParameter));
 		WorkFlowTaskDefinition workFlowTaskDefinition = this.sampleWorkFlowTaskDefinition(workFlowDefinition,
@@ -380,7 +380,7 @@ void getWorkParametersByWorkName_when_workIsFound_then_returnParameters() {
 		// given
 		WorkFlowDefinition workFlowDefinition = this.sampleWorkFlowDefinition(workFlowName);
 		WorkParameter workParameter = WorkParameter.builder().key(KEY).description("the key").optional(false)
-				.type(WorkParameterType.URL).build();
+				.type(WorkParameterType.URI).build();
 		WorkFlowTaskDefinition workFlowTaskDefinition = this.sampleWorkFlowTaskDefinition(workFlowDefinition,
 				workFlowTaskName, workParameter);
 		workFlowDefinition.setWorkFlowTaskDefinitions(List.of(workFlowTaskDefinition));
@@ -404,7 +404,7 @@ void getParentWorkFlowByWorkName_when_workIsTask_then_returnWorkflow() {
 		// given
 		WorkFlowDefinition workFlowDefinition = this.sampleWorkFlowDefinition(workFlowName);
 		WorkParameter workParameter = WorkParameter.builder().key("key").description("the key").optional(false)
-				.type(WorkParameterType.URL).build();
+				.type(WorkParameterType.URI).build();
 		WorkFlowTaskDefinition workFlowTaskDefinition = this.sampleWorkFlowTaskDefinition(workFlowDefinition,
 				workFlowTaskName, workParameter);
 		workFlowDefinition.setWorkFlowTaskDefinitions(List.of(workFlowTaskDefinition));