Merge branch 'develop' into quartz-manager-drivers

Author: omursahin

.gitignore

@@ -371,4 +371,8 @@ jdk_8_maven/em/external/rest/spring-batch-rest/target
 
 /jdk_11_maven/cs/rest-gui/quartz-manager/target
 /jdk_11_maven/em/embedded/rest/quartz-manager/target
-/jdk_11_maven/em/external/rest/quartz-manager/target
+/jdk_11_maven/em/external/rest/quartz-manager/target
+
+/jdk_8_maven/cs/rest/original/spring-ecommerce/target
+/jdk_8_maven/em/embedded/rest/spring-ecommerce/target
+/jdk_8_maven/em/external/rest/spring-ecommerce/target

README.md

@@ -70,7 +70,7 @@ For simplicity, all schemas are also available as JSON/YML files under the folde
 > **IMPORTANT**: More details (e.g., #LOCs and used databases) on these APIs can be found [in this table](statistics/table_emb.md).
 
 
-### REST: Java/Kotlin (33)
+### REST: Java/Kotlin (34)
 
 * **Bibliothek** (MIT), [jdk_17_gradle/cs/rest/bibliothek](jdk_17_gradle/cs/rest/bibliothek), from [https://github.com/PaperMC/bibliothek](https://github.com/PaperMC/bibliothek)
 
@@ -128,6 +128,8 @@ For simplicity, all schemas are also available as JSON/YML files under the folde
 
 * **Spring Boot Restful API Example** (MIT), [jdk_17_maven/cs/rest/spring-rest-example](jdk_17_maven/cs/rest/spring-rest-example), from [https://github.com/phantasmicmeans/spring-boot-restful-api-example](https://github.com/phantasmicmeans/spring-boot-restful-api-example)
 
+* **Spring ECommerce** (not-known license), [jdk_8_maven/cs/rest/original/spring-ecommerce](jdk_8_maven/cs/rest/original/spring-ecommerce), from [https://github.com/SaiUpadhyayula/SpringAngularEcommerce](https://github.com/SaiUpadhyayula/SpringAngularEcommerce)
+
 * **Swagger Petstore** (Apache), [jdk_8_maven/cs/rest/original/swagger-petstore](jdk_8_maven/cs/rest/original/swagger-petstore), from [https://github.com/swagger-api/swagger-petstore](https://github.com/swagger-api/swagger-petstore)
 
 * **Tiltaksgjennomføring** (MIT), [jdk_17_maven/cs/rest/tiltaksgjennomforing](jdk_17_maven/cs/rest/tiltaksgjennomforing), from [https://github.com/navikt/tiltaksgjennomforing-api](https://github.com/navikt/tiltaksgjennomforing-api)

auth/spring-ecommerce-auth.yaml

@@ -0,0 +1,17 @@
+auth:
+  - name: user1
+    loginEndpointAuth:
+      payloadRaw: "{\"username\": \"user1\", \"password\": \"12345678\"}"
+  - name: user2
+    loginEndpointAuth:
+      payloadRaw: "{\"username\": \"user2\", \"password\": \"12345678\"}"
+
+authTemplate:
+    loginEndpointAuth:
+        endpoint: /api/auth/login
+        verb: POST
+        contentType: application/json
+        token:
+            extractFromField: /accessToken
+            httpHeaderName: Authorization
+            headerPrefix: "Bearer "

dockerfiles/bibliothek.yaml

@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:6
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+

dockerfiles/blogapi.yaml

@@ -13,9 +13,12 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
+    
       db:
-        condition: service_healthy
+          condition: service_healthy
+    
 
+
   db:
     image: mysql:8.0
     tmpfs:
@@ -35,9 +38,10 @@ services:
 
 
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
       retries: 3
 
 
+

dockerfiles/familie-ba-sak.yaml

@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: postgres:13.13
     tmpfs:
@@ -27,6 +28,7 @@ services:
 
 
 
+
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
     environment:

dockerfiles/genome-nexus.yaml

@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:3.6.2
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+

dockerfiles/gestaohospital.yaml

@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:6
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+

dockerfiles/ocvn.yaml

@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:3.2
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+

dockerfiles/pay-publicapi.yaml

@@ -12,10 +12,12 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: redis:7.2.3
 
 
 
 
 
+