Merge pull request #67 from ContainerSolutions/spring-boot-support-remove-and-sample

removed spring boot support, added spring boot sample

Author: csviri

README.md

@@ -11,9 +11,9 @@ The Controller only contains the logic to create, update and delete the actual r
 
 Feature we would like to implement and invite the community to help us implement in the future:
 
-* ~~Spring Boot support~~
-* Testing support
+* ~~Spring Boot sample~~
 * Class generation from CRD to POJO
+* Quarkus support
 
 ## Usage
 

pom.xml

@@ -36,7 +36,6 @@
 
     <modules>
         <module>operator-framework</module>
-        <module>spring-boot-starter</module>
         <module>samples</module>
     </modules>
 
@@ -50,7 +49,7 @@
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>openshift-client</artifactId>
-                <version>4.7.1</version>
+                <version>4.9.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -79,12 +78,6 @@
                 <version>3.0.0</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>5.1.8.RELEASE</version>
-                <scope>compile</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -100,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <!--<version>2.19.1</version> -->
+                <version>2.22.2</version>
                 <configuration>
                     <includes>
                         <include>**/*IT.java</include>

samples/basic/spring-boot/pom.xml

@@ -25,11 +25,16 @@
             <groupId>com.github.containersolutions</groupId>
             <artifactId>operator-framework-samples-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.github.containersolutions</groupId>
-            <artifactId>spring-boot-operator-framework-starter</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
@@ -38,7 +43,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.6.RELEASE</version>
+                <version>2.2.6.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

samples/basic/spring-boot/src/main/java/com/github/containersolutions/operator/sample/Config.java

@@ -0,0 +1,33 @@
+package com.github.containersolutions.operator.sample;
+
+import com.github.containersolutions.operator.Operator;
+import com.github.containersolutions.operator.api.ResourceController;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+@Configuration
+public class Config {
+
+    @Bean
+    public KubernetesClient kubernetesClient() {
+        return new DefaultKubernetesClient();
+    }
+
+    @Bean
+    public CustomServiceController customServiceController(KubernetesClient client) {
+        return new CustomServiceController(client);
+    }
+
+    //  Register all controller beans
+    @Bean
+    public Operator operator(KubernetesClient client, List<ResourceController> controllers) {
+        Operator operator = new Operator(client);
+        controllers.forEach(c -> operator.registerController(c));
+        return operator;
+    }
+
+}

samples/basic/spring-boot/src/main/java/com/github/containersolutions/operator/sample/SampleComponent.java

@@ -1,16 +1,8 @@
 package com.github.containersolutions.operator.sample;
 
-import com.github.containersolutions.operator.api.Controller;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 
-/**
- * Note that we have multiple options here either we can add this component scan as seen below. Or annotate controllers
- * with @Component or @Service annotation or just register the bean within a spring "@Configuration".
- */
-@ComponentScan(includeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, value = Controller.class)})
 @SpringBootApplication
 public class SpringBootStarterSampleApplication {