Merge pull request #4 from AzBuilder/refactor-search

Add method getModuleByNameAndProvider
AzBuilder · Jul 17, 2021 · 0126bbe · 0126bbe
2 parents e7fe2fb + 62d6328
commit 0126bbe
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,6 @@ Simply add the following dependency to your project's `pom.xml` will enable you
 <dependency>
     <groupId>org.azbuilder.api.spring.starter</groupId>
     <artifactId>api-client-spring-boot-starter</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
 </dependency>
 ```
diff --git a/api-client-spring-boot-autoconfigure/pom.xml b/api-client-spring-boot-autoconfigure/pom.xml
@@ -19,7 +19,7 @@
 		<gson.version>2.8.6</gson.version>
 		<feign.version>11.1</feign.version>
 		<okhttp.version>4.9.1</okhttp.version>
-		<revision>0.3.0</revision>
+		<revision>0.3.1</revision>
 		<maven.deploy.skip>false</maven.deploy.skip>
 		<lombok.version>1.18.20</lombok.version>
 	</properties>

diff --git a/api-client-spring-boot-starter-sample/pom.xml b/api-client-spring-boot-starter-sample/pom.xml
@@ -15,7 +15,7 @@
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>11</java.version>
-		<revision>0.3.0</revision>
+		<revision>0.3.1</revision>
 		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 	<dependencies>

diff --git a/...src/test/java/org/azbuilder/api/client/sample/ApiClientStarterSampleApplicationTests.java b/...src/test/java/org/azbuilder/api/client/sample/ApiClientStarterSampleApplicationTests.java
@@ -1,6 +1,5 @@
 package org.azbuilder.api.client.sample;
 
-import org.azbuilder.api.client.model.organization.JobData;
 import org.azbuilder.api.client.model.organization.Organization;
 import org.azbuilder.api.client.model.organization.job.Job;
 import org.azbuilder.api.client.model.organization.job.JobRequest;
@@ -60,6 +59,10 @@ void contextLoads() {
 
 		restClient.updateJob(jobRequest, job.getRelationships().getOrganization().getData().getId(), job.getId());
 
-		restClient.updateJob(jobRequest,organizationId, "1");*/
+		restClient.updateJob(jobRequest,organizationId, "1");
+
+		System.out.println(restClient.getModuleByNameAndProvider(organizationId, "azure","azurerm").getData().get(0).getAttributes().getSource());
+		*/
+
 	}
 }
diff --git a/api-client-spring-boot-starter/pom.xml b/api-client-spring-boot-starter/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>0.3.0</revision>
+    <revision>0.3.1</revision>
     <maven.deploy.skip>false</maven.deploy.skip>
   </properties>
 

diff --git a/api-client/pom.xml b/api-client/pom.xml
@@ -15,7 +15,7 @@
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>11</java.version>
-		<revision>0.3.0</revision>
+		<revision>0.3.1</revision>
 		<feign.version>11.1</feign.version>
 		<feign-form.version>3.8.0</feign-form.version>
 		<maven.deploy.skip>false</maven.deploy.skip>

diff --git a/api-client/src/main/java/org/azbuilder/api/client/RestClient.java b/api-client/src/main/java/org/azbuilder/api/client/RestClient.java
@@ -6,6 +6,7 @@
 import org.azbuilder.api.client.model.organization.Organization;
 import org.azbuilder.api.client.model.organization.job.Job;
 import org.azbuilder.api.client.model.organization.job.JobRequest;
+import org.azbuilder.api.client.model.organization.module.Module;
 import org.azbuilder.api.client.model.organization.workspace.Workspace;
 import org.azbuilder.api.client.model.organization.workspace.environment.Environment;
 import org.azbuilder.api.client.model.organization.workspace.secret.Secret;
@@ -57,4 +58,8 @@ public interface RestClient {
     @RequestLine("GET /api/v1/organization?filter[organization]=name=={organizationName}")
     Response<List<Organization>> getOrganizationByName(@Param("organizationName") String organizationName);
 
+    @RequestLine("GET /api/v1/organization/{organizationId}/module?filter[module]=name=={moduleName};provider=={providerName}")
+    Response<List<Module>> getModuleByNameAndProvider(@Param("organizationId") String organizationId, @Param("moduleName") String moduleName, @Param("providerName") String providerName);
+
+
 }