project review

Author: bnasslahsen

README.md

@@ -3,9 +3,9 @@
 
 # Spring-boot with OpenAPI Demo applications.
 
-## [Demo Spring Boot 2 webmvc with OpenAPI 3](https://springdoc-openapi-test-app2-silly-numbat.eu-de.mybluemix.net/).
-## [Demo Spring Boot 2 webflux with OpenAPI 3](https://springdoc-openapi-test-app3-terrific-rabbit.eu-de.mybluemix.net/swagger-ui.html).
-## [Demo Spring Boot 2 webmvc with OpenAPI 3](https://springdoc-openapi-test-app1-courteous-puku.eu-de.mybluemix.net/).
+## [Demo Spring Boot 2 webmvc with OpenAPI 3](https://springdoc-openapi-spring-boot-2-webmvc-silly-numbat.eu-de.mybluemix.net/).
+## [Demo Spring Boot 2 webflux with OpenAPI 3](https://springdoc-openapi-spring-boot-2-webflux-terrific-rabbit.eu-de.mybluemix.net/swagger-ui.html).
+## [Demo Spring Boot 2 webmvc with OpenAPI 3](https://springdoc-openapi-spring-boot-1-courteous-puku.eu-de.mybluemix.net/).
 
 
 ![Branching](https://springdoc.github.io/springdoc-openapi-demos/assets/images/pets.png)

manifest.yml

@@ -1,33 +1,33 @@
 ---
 applications:
-  - name: springdoc-openapi-test-app1
+  - name: springdoc-openapi-spring-boot-1
     random-route: true
     memory: 400m
-    path: springdoc-openapi-test-app1-cf.jar
+    path: springdoc-openapi-spring-boot-1-cf.jar
     env:
       JAVA_OPTS: '-XX:MaxMetaspaceSize=80780K -Xss512k -Xmx200M -XX:ReservedCodeCacheSize=16M -XX:MaxDirectMemorySize=16M'
       JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 1.8.0_212 } }'
     buildpack: java_buildpack
-  - name: springdoc-openapi-test-app2
+  - name: springdoc-openapi-spring-boot-2-webmvc
     random-route: true
     memory: 400m
-    path: springdoc-openapi-test-app2-cf.jar
+    path: springdoc-openapi-spring-boot-2-webmvc-cf.jar
     env:
       JAVA_OPTS: '-XX:MaxMetaspaceSize=80780K -Xss512k -Xmx200M -XX:ReservedCodeCacheSize=16M -XX:MaxDirectMemorySize=16M'
       JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 1.8.0_212 } }'
     buildpack: java_buildpack
-  - name: springdoc-openapi-test-app3
+  - name: springdoc-openapi-spring-boot-2-webflux
     random-route: true
     memory: 400m
-    path: springdoc-openapi-test-app3-cf.jar
+    path: springdoc-openapi-spring-boot-2-webflux-cf.jar
     env:
       JAVA_OPTS: '-XX:MaxMetaspaceSize=80780K -Xss512k -Xmx200M -XX:ReservedCodeCacheSize=16M -XX:MaxDirectMemorySize=16M'
       JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 1.8.0_212 } }'
     buildpack: java_buildpack
-  - name: springdoc-openapi-test-app4
+  - name: springdoc-openapi-spring-boot-2-webflux-functional
     random-route: true
     memory: 400m
-    path: springdoc-openapi-test-app4-cf.jar
+    path: springdoc-openapi-spring-boot-2-webflux-functional-cf.jar
     env:
       JAVA_OPTS: '-XX:MaxMetaspaceSize=80780K -Xss512k -Xmx200M -XX:ReservedCodeCacheSize=16M -XX:MaxDirectMemorySize=16M'
       JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 1.8.0_212 } }'

pom.xml

@@ -46,11 +46,12 @@
 	</distributionManagement>
 
 	<modules>
-		<module>springdoc-openapi-test-app1</module>
-		<module>springdoc-openapi-test-app2</module>
-		<module>springdoc-openapi-test-app3</module>
-		<module>spring-boot-springdoc</module>
-		<module>springdoc-openapi-test-app4</module>
+		<module>springdoc-openapi-spring-boot-1</module>
+		<module>springdoc-openapi-spring-boot-2-webmvc</module>
+		<module>springdoc-openapi-spring-boot-2-webflux</module>
+		<module>springdoc-openapi-spring-boot-2-webflux-functional</module>
+		<module>sample-springdoc-openapi-book-service</module>
+		<module>sample-springdoc-openapi-oauth2</module>
 	</modules>
 
 	<properties>

spring-boot-springdoc/.gitignore renamed to sample-springdoc-openapi-book-service/.gitignore

@@ -0,0 +1,16 @@
+## Spring Security OAuth - New Stack
+
+### Relevant information:
+
+1. `oauth-authorization-server` is a Keycloak Authorization Server wrapped as a Spring Boot application
+2. There is one OAuth Client registered in the Authorization Server:
+   1. Client Id: newClient
+   2. Client secret: newClientSecret
+   3. Redirect Uri: http://localhost:8089/
+2. There are two OAuth Angular Front-end Apps:
+   1. `oauth-ui-authorization-code-angular` - A simple Angular App
+   2. `oauth-ui-authorization-code-angular-zuul` - An Angular App hosted as a Boot Application with embedded Zuul proxy
+3. `oauth-resource-server` is a Spring Boot based RESTFul API, acting as a backend Application
+4. There are two users registered in the Authorization Server:
+   1. john@test.com / 123
+   2. mike@other.com / pass

spring-boot-springdoc/README.md renamed to sample-springdoc-openapi-book-service/README.md

@@ -0,0 +1,184 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.springdoc</groupId>
+    <artifactId>oauth-authorization-server</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
+
+    <dependencies>
+
+        <!-- web -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+
+        <!-- persistence -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Keycloak server -->
+
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>${resteasy.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <version>${resteasy.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-infinispan</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-services</artifactId>
+            <version>${keycloak.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+                    <groupId>org.jboss.spec.javax.servlet</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.modules</groupId>
+            <artifactId>jboss-modules</artifactId>
+            <version>${jboss.modules}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-jpa</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-js-adapter</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-themes</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-core</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-authz-policy-common</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-wildfly-extensions</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
+
+        <!-- config properties processor -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- test -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- non-dependencies -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+
+        <keycloak.version>8.0.0</keycloak.version>
+        <resteasy.version>3.9.0.Final</resteasy.version>
+        <jboss.modules>1.9.2.Final</jboss.modules>
+    </properties>
+
+</project>

spring-boot-springdoc/pom.xml renamed to sample-springdoc-openapi-book-service/pom.xml

@@ -0,0 +1,38 @@
+package org.springdoc.demo.auth;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Bean;
+
+import org.springdoc.demo.auth.config.KeycloakServerProperties;
+
+@SpringBootApplication(exclude = LiquibaseAutoConfiguration.class)
+@EnableConfigurationProperties(KeycloakServerProperties.class)
+public class AuthorizationServerApp {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AuthorizationServerApp.class);
+
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(AuthorizationServerApp.class, args);
+    }
+
+    @Bean
+    ApplicationListener<ApplicationReadyEvent> onApplicationReadyEventListener(ServerProperties serverProperties, KeycloakServerProperties keycloakServerProperties) {
+
+        return (evt) -> {
+
+            Integer port = serverProperties.getPort();
+            String keycloakContextPath = keycloakServerProperties.getContextPath();
+
+            LOG.info("Embedded Keycloak started: http://localhost:{}{} to use keycloak", port, keycloakContextPath);
+        };
+    }
+
+}

spring-boot-springdoc/src/main/java/com/baeldung/springdoc/SpringdocApplication.java renamed to sample-springdoc-openapi-book-service/src/main/java/com/baeldung/springdoc/SpringdocApplication.java

@@ -0,0 +1,71 @@
+package org.springdoc.demo.auth.config;
+
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.services.managers.ApplianceBootstrap;
+import org.keycloak.services.managers.RealmManager;
+import org.keycloak.services.resources.KeycloakApplication;
+import org.keycloak.util.JsonSerialization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import org.springdoc.demo.auth.config.KeycloakServerProperties.AdminUser;
+
+public class EmbeddedKeycloakApplication extends KeycloakApplication {
+
+	private static final Logger LOG = LoggerFactory.getLogger(EmbeddedKeycloakApplication.class);
+
+	static KeycloakServerProperties keycloakServerProperties;
+
+	public EmbeddedKeycloakApplication() {
+
+		super();
+
+		createMasterRealmAdminUser();
+
+		createSpringdocRealm();
+	}
+
+	private void createMasterRealmAdminUser() {
+
+		KeycloakSession session = getSessionFactory().create();
+
+		ApplianceBootstrap applianceBootstrap = new ApplianceBootstrap(session);
+
+		AdminUser admin = keycloakServerProperties.getAdminUser();
+
+		try {
+			session.getTransactionManager().begin();
+			applianceBootstrap.createMasterRealmUser(admin.getUsername(), admin.getPassword());
+			session.getTransactionManager().commit();
+		} catch (Exception ex) {
+			LOG.warn("Couldn't create keycloak master admin user: {}", ex.getMessage());
+			session.getTransactionManager().rollback();
+		}
+
+		session.close();
+	}
+
+	private void createSpringdocRealm() {
+		KeycloakSession session = getSessionFactory().create();
+
+		try {
+			session.getTransactionManager().begin();
+
+			RealmManager manager = new RealmManager(session);
+			Resource lessonRealmImportFile = new ClassPathResource(keycloakServerProperties.getRealmImportFile());
+
+			manager.importRealm(
+					JsonSerialization.readValue(lessonRealmImportFile.getInputStream(), RealmRepresentation.class));
+
+			session.getTransactionManager().commit();
+		} catch (Exception ex) {
+			LOG.warn("Failed to import Realm json file: {}", ex.getMessage());
+			session.getTransactionManager().rollback();
+		}
+
+		session.close();
+	}
+}