fix: fixing examples.

Author: secondsun

examples/pom.xml

@@ -4,15 +4,11 @@
 
     <groupId>com.redhat.cloud</groupId>
     <artifactId>sdk-tests</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>sdk-tests</name>
     <url>http://console.redhat.com</url>
-    <parent>
-        <groupId>com.redhat.cloud</groupId>
-        <artifactId>rhoas-sdk-java</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
-    </parent>
+    
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -24,17 +20,17 @@
         <dependency>
             <groupId>com.redhat.cloud</groupId>
             <artifactId>kafka-management-sdk</artifactId>
-            <version>1.1.2</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.redhat.cloud</groupId>
             <artifactId>registry-management-sdk</artifactId>
-            <version>0.5.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.redhat.cloud</groupId>
             <artifactId>kafka-instance-sdk</artifactId>
-            <version>0.3.0</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -73,7 +69,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.37.0</version>
+                <version>0.38.1</version>
                 <executions>
                     <execution>
                         <id>start</id>
@@ -95,22 +91,45 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>quay.io/wtrocki/api-mock</name>
+                            <name>quay.io/rhosak/api-mock</name>
                             <run>
                                 <ports>
-                                    <port>8080:8000</port>
+                                    <port>8000:8000</port>
                                 </ports>
                             </run>
                         </image>
 
                     </images>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>add-integration-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/integration-test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>2.22.2</version> 
+                <configuration>
+                    <includes>
+                        <include>**/*IT</include>
+                    </includes>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>

…va/com/redhat/cloud/KafkaInstanceIT.java …va/com/redhat/cloud/KafkaInstanceIT.javaexamples/src/test/java/com/redhat/cloud/KafkaInstanceIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/KafkaInstanceIT.java examples/src/test/java/com/redhat/cloud/KafkaInstanceIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/KafkaInstanceIT.java

@@ -2,10 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.concurrent.TimeUnit;
-
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 import com.openshift.cloud.api.kas.auth.TopicsApi;
 import com.openshift.cloud.api.kas.auth.invoker.*;
@@ -18,23 +16,24 @@ public class KafkaInstanceIT {
     @Test
     public void testCreateExample() {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://localhost:8080/rest");
+        defaultClient.setBasePath("http://localhost:8000/data/kafka");
 
         OAuth oauth = (OAuth) defaultClient.getAuthentication("Bearer");
         oauth.setAccessToken("accessToken");
 
         TopicsApi apiInstance = new TopicsApi(defaultClient);
 
         try {
-            TopicsList result = apiInstance.getTopics(null, null, null, null, null, null, null);
+            TopicsList result = apiInstance.getTopics(null, null, null, null, null);
             assertNotNull(result);
-            assertEquals(1, result.getItems().size());
+            assertEquals(4, result.getItems().size());
+            assertEquals("topic-1", result.getItems().get(0).getName());
         } catch (ApiException e) {
             System.err.println("Exception when calling TopicsApi#getTopics");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
+            Assertions.fail(e);    
+        } 
     }
 }

…/com/redhat/cloud/KafkaManagementIT.java …/com/redhat/cloud/KafkaManagementIT.javaexamples/src/test/java/com/redhat/cloud/KafkaManagementIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/KafkaManagementIT.java examples/src/test/java/com/redhat/cloud/KafkaManagementIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/KafkaManagementIT.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import com.openshift.cloud.api.kas.invoker.*;
 import com.openshift.cloud.api.kas.invoker.auth.*;
@@ -12,7 +13,7 @@ public class KafkaManagementIT {
     @Test
     public void testCreateExample() {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://localhost:8080");
+        defaultClient.setBasePath("http://localhost:8000");
 
         // Configure HTTP bearer authorization: Bearer
         HttpBearerAuth Bearer = (HttpBearerAuth) defaultClient.getAuthentication("Bearer");
@@ -31,13 +32,14 @@ public void testCreateExample() {
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
+            Assertions.fail(e);    
         }
     }
 
     @Test
     public void testListExample() {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://localhost:8080");
+        defaultClient.setBasePath("http://localhost:8000");
 
         // Configure HTTP bearer authorization: Bearer
         HttpBearerAuth Bearer = (HttpBearerAuth) defaultClient.getAuthentication("Bearer");
@@ -56,6 +58,7 @@ public void testListExample() {
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
+            Assertions.fail(e);    
         }
     }
 }

…a/com/redhat/cloud/ServiceAccountIT.java …a/com/redhat/cloud/ServiceAccountIT.javaexamples/src/test/java/com/redhat/cloud/ServiceAccountIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/ServiceAccountIT.java examples/src/test/java/com/redhat/cloud/ServiceAccountIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/ServiceAccountIT.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.openshift.cloud.api.kas.SecurityApi;
@@ -17,7 +18,7 @@ public class ServiceAccountIT {
     @Test
     public void testCreateExample() {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://localhost:8080");
+        defaultClient.setBasePath("http://localhost:8000");
 
         // Configure HTTP bearer authorization: Bearer
         HttpBearerAuth Bearer = (HttpBearerAuth) defaultClient.getAuthentication("Bearer");
@@ -29,15 +30,14 @@ public void testCreateExample() {
         serviceAccountRequest.setName("sa_name");
         try {
             ServiceAccount result = apiInstance.createServiceAccount(serviceAccountRequest);
-
             assertNotNull(result);
-            
         } catch (ApiException e) {
             System.err.println("Exception when calling DefaultApi#createKafka");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
+            Assertions.fail(e);    
         }
     }
 

…/com/redhat/cloud/ServiceRegistryIT.java …/com/redhat/cloud/ServiceRegistryIT.javaexamples/src/test/java/com/redhat/cloud/ServiceRegistryIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/ServiceRegistryIT.java examples/src/test/java/com/redhat/cloud/ServiceRegistryIT.java renamed to examples/src/integration-test/java/com/redhat/cloud/ServiceRegistryIT.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.openshift.cloud.api.srs.*;
@@ -15,23 +16,26 @@ public class ServiceRegistryIT {
     @Test
     public void testListExample() {
         var defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://localhost:8080");
+        defaultClient.setBasePath("http://localhost:8000");
 
         var oauth = (HttpBearerAuth) defaultClient.getAuthentication("Bearer");
         oauth.setBearerToken("bearerToken");
 
         var apiInstance = new RegistriesApi(defaultClient);
 
         try {
-            RegistryListRest result = apiInstance.getRegistries(null, null, null, null);
+            RegistryList result = apiInstance.getRegistries(null, null, null, null);
             assertNotNull(result);
             assertEquals(1, result.getItems().size());
+            return;
         } catch (ApiException e) {
             System.err.println("Exception when calling RegistriesApi#getRegistries");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
+            Assertions.fail(e);    
         }
+        
     }
 }

scripts/templates/pom.mustache

@@ -7,8 +7,9 @@
     <name>{{artifactId}}</name>
     <description>Red Hat Aplicaiton Services Java SDK</description>
     <url>https://github.com/redhat-developer/app-services-sdk-java</url>
+    
+    <version>0.0.1-SNAPSHOT</version>
 
-    <version>{{artifactVersion}}</version>
     <scm>
         <connection>{{scmConnection}}</connection>
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>