[pull] develop from Onlineberatung:develop

.github/workflows/dockerImage.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 17.0.7
           java-package: jdk
           architecture: x64
 
@@ -43,7 +43,7 @@ jobs:
         run: mvn -B -Pprod  clean package -DskipTests
       - name: Maven Verify
         run: mvn -B -Pprod clean verify
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: targetfiles
           path: target/*.jar
@@ -64,7 +64,7 @@ jobs:
   push_to_registry:
     strategy:
       matrix:
-        registry: ["docker.pkg.github.com", "ghcr.io"]
+        registry: ["ghcr.io"]
     needs: [test]
     name: Push Docker image to GitHub Packages
     runs-on: ubuntu-latest
@@ -74,7 +74,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Download buildfiles artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: targetfiles
       - name: Get current time
@@ -182,4 +182,4 @@ jobs:
               value: ${{ env.DOCKER_IMAGE_TAG }}
           custom-actions: |
             - text: View CI
-              url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.github/workflows/feature-branch.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 17.0.7
           java-package: jdk
           architecture: x64
 

.gitignore

@@ -26,3 +26,4 @@
 /.nb-gradle/
 wrapper
 log
+/src/main/resources/application-local.properties

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11
+FROM openjdk:17-oracle
 VOLUME ["/tmp","/log"]
 EXPOSE 8080
 ARG JAR_FILE

api/videoservice.yaml

@@ -30,7 +30,7 @@ paths:
           content:
             'application/json':
               schema:
-                $ref: '#/components/schemas/CreateVideoCallResponseDTO'
+                $ref: '#/components/schemas/VideoCallResponseDTO'
         400:
           description: BAD REQUEST - invalid/incomplete request or body object
         401:
@@ -44,6 +44,39 @@ paths:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
       security:
         - Bearer: [ ]
+  /videocalls/join/{roomId}:
+    post:
+      tags:
+        - video-controller
+      summary: 'Join an existing new video call room Id [Authorization: Role: consultant]'
+      operationId: joinGroupVideoCall
+      parameters:
+        - name: roomId
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        200:
+          description: JOINED - joined successfully to a video call room
+          content:
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/VideoCallResponseDTO'
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
+        403:
+          description: 'FORBIDDEN - no/invalid role/authorization, CSRF token or consultant without
+          permission for given session'
+        404:
+          description: NOT FOUND - Room not found
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
+      security:
+        - Bearer: [ ]
 
   /videocalls/stop/{roomId}:
     post:
@@ -73,6 +106,33 @@ paths:
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
 
+  /videocalls/event/stop/{roomId}:
+    post:
+      tags:
+        - video-controller
+      summary: 'Stops a video call [Auth: jitsi-technical]'
+      description: 'Handles video call stop event fired by Jitsi (Machine2Machine).'
+      operationId: handleVideoCallStoppedEvent
+      parameters:
+        - name: roomId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        204:
+          description: NO CONTENT
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
+        403:
+          description: FORBIDDEN - access denied
+        404:
+          description: NOT FOUND - room ID unknown
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
+
   /videocalls/reject:
     post:
       tags:
@@ -129,20 +189,47 @@ paths:
           description: NOT FOUND - rcGroupId unknown
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
+  /videocalls/room/{jitsiRoomId}:
+    post:
+      tags:
+        - video-controller
+      summary: 'Creates a new room [Authorization: Role: jitsi-technical]'
+      operationId: createRoom
+      parameters:
+        - name: jitsiRoomId
+          in: path
+          required: true
+          schema:
+            type: long
+      responses:
+        200:
+          description: OK - successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VideoRoomResponseDTO'
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
+
 
 components:
   schemas:
     CreateVideoCallDTO:
       type: object
-      required:
-        - sessionId
       properties:
         sessionId:
           type: integer
           format: int64
+        groupChatId:
+          type: integer
+          format: int64
         initiatorDisplayName:
           type: string
-    CreateVideoCallResponseDTO:
+    VideoCallResponseDTO:
       type: object
       required:
         - moderatorVideoCallUrl
@@ -178,6 +265,20 @@ components:
         jwt:
           type: string
 
+    VideoRoomResponseDTO:
+      type: object
+      properties:
+        jitsiRoomId:
+          type: long
+          example: 12132
+        videoLink:
+          type: string
+          example: 12132
+        createDate:
+          type: string
+        updateDate:
+          type: string
+
   securitySchemes:
     Bearer:
       type: apiKey

google_checks_light.xml

@@ -175,11 +175,13 @@
       <message key="name.invalidPattern"
         value="Type name ''{0}'' must match pattern ''{1}''."/>
     </module>
+    <!--
     <module name="MemberName">
         <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
         <message key="name.invalidPattern"
          value="Member name ''{0}'' must match pattern ''{1}''."/>
     </module>
+     -->
     <module name="ParameterName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
@@ -226,14 +228,14 @@
       <message key="ws.notPreceded"
         value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
     </module>
-    <module name="Indentation">
-      <property name="basicOffset" value="2"/>
-      <property name="braceAdjustment" value="0"/>
-      <property name="caseIndent" value="2"/>
-      <property name="throwsIndent" value="4"/>
-      <property name="lineWrappingIndentation" value="4"/>
-      <property name="arrayInitIndent" value="2"/>
-    </module>
+<!--    <module name="Indentation">-->
+<!--      <property name="basicOffset" value="2"/>-->
+<!--      <property name="braceAdjustment" value="0"/>-->
+<!--      <property name="caseIndent" value="2"/>-->
+<!--      <property name="throwsIndent" value="4"/>-->
+<!--      <property name="lineWrappingIndentation" value="4"/>-->
+<!--      <property name="arrayInitIndent" value="2"/>-->
+<!--    </module>-->
     <module name="AbbreviationAsWordInName">
       <property name="ignoreFinal" value="false"/>
       <property name="allowedAbbreviationLength" value="1"/>
@@ -283,7 +285,6 @@
       <property name="tokens" value="VARIABLE_DEF"/>
       <property name="allowSamelineMultipleAnnotations" value="true"/>
     </module>
-
     <!--
     <module name="NonEmptyAtclauseDescription"/>
     <module name="InvalidJavadocPosition"/>
@@ -299,18 +300,18 @@
          value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
     </module>
     -->
-
     <module name="JavadocMethod">
       <property name="scope" value="public"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
       <property name="allowedAnnotations" value="Override, Test"/>
       <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
     </module>
+    <!--
     <module name="MissingJavadocMethod">
         <property name="scope" value="public"/>
         <property name="minLineCount" value="2"/>
-        <property name="allowedAnnotations" value="Override, Test, Before"/>
+        <property name="allowedAnnotations" value="Override, Test"/>
         <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
     </module>
     <module name="MethodName">
@@ -321,6 +322,7 @@
     <module name="SingleLineJavadoc">
         <property name="ignoreInlineTags" value="false"/>
     </module>
+    -->
     <module name="EmptyCatchBlock">
       <property name="exceptionVariableName" value="expected"/>
     </module>