Merge branch 'develop' into CARITAS-244-add-tracing

# Conflicts:
#	src/main/resources/application.properties

.github/workflows/dockerImage.yml

@@ -29,7 +29,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
 
@@ -44,7 +44,7 @@ jobs:
         run: mvn -B -Pprod  clean package -DskipTests=true
       - name: Maven Verify
         run: mvn -B -Pprod clean verify -DskipTests=true
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: targetfiles
           path: target/*.jar
@@ -76,7 +76,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

.github/workflows/dockerImageSkipTests.yml

@@ -27,7 +27,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
 
@@ -40,7 +40,7 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
       - name: Maven Package
         run: mvn -B -Pprod  clean package -DskipTests
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: targetfiles
           path: target/*.jar
@@ -71,7 +71,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
@@ -179,4 +179,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
 

Dockerfile

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

api/messageservice.yaml

@@ -82,54 +82,6 @@ paths:
         - Bearer: [ ]
       x-codegen-request-body-name: Message
 
-  /messages/feedback/new:
-    post:
-      tags:
-        - message-controller
-      summary: 'Add new Rocket.Chat message to feedback chat [Authorization: authority
-        for feedback chat]'
-      operationId: createFeedbackMessage
-      parameters:
-        - name: rcToken
-          in: header
-          required: true
-          schema:
-            type: string
-        - name: rcUserId
-          in: header
-          required: true
-          schema:
-            type: string
-        - name: rcFeedbackGroupId
-          in: header
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          'application/json':
-            schema:
-              $ref: '#/components/schemas/MessageDTO'
-        required: true
-      responses:
-        201:
-          description: CREATED - message was successfully created
-          content:
-            'application/json':
-              schema:
-                $ref: '#/components/schemas/MessageResponseDTO'
-        400:
-          description: BAD REQUEST - invalid/incomplete request or body object
-        401:
-          description: UNAUTHORIZED - no/invalid Keycloak token
-        403:
-          description: FORBIDDEN - no/invalid role/authorization
-        500:
-          description: INTERNAL SERVER ERROR - server encountered unexpected condition
-      security:
-        - Bearer: [ ]
-      x-codegen-request-body-name: Message
-
   /messages/videohint/new:
     post:
       tags:
@@ -323,54 +275,6 @@ paths:
       security:
         - Bearer: [ ]
 
-  /messages/forward:
-    post:
-      tags:
-        - message-controller
-      summary: 'Forward a Rocket.Chat message to another group [Authorization: Role:
-        u25-consultant]'
-      operationId: forwardMessage
-      parameters:
-        - name: rcToken
-          in: header
-          required: true
-          schema:
-            type: string
-        - name: rcUserId
-          in: header
-          required: true
-          schema:
-            type: string
-        - name: rcGroupId
-          in: header
-          required: true
-          schema:
-            type: string
-      requestBody:
-        description: Body description
-        content:
-          'application/json':
-            schema:
-              $ref: '#/components/schemas/ForwardMessageDTO'
-        required: true
-      responses:
-        201:
-          description: CREATED - message was successfully created
-          content:
-            'application/json':
-              schema:
-                $ref: '#/components/schemas/MessageResponseDTO'
-        400:
-          description: BAD REQUEST - invalid/incomplete request or body object
-        401:
-          description: UNAUTHORIZED - no/invalid Keycloak token
-        403:
-          description: FORBIDDEN - no/invalid role/authorization
-        500:
-          description: INTERNAL SERVER ERROR - server encountered unexpected condition
-      security:
-        - Bearer: [ ]
-
   /messages/draft:
     post:
       tags:
@@ -629,45 +533,13 @@ components:
     AliasMessageDTO:
       type: object
       properties:
-        forwardMessageDTO:
-          $ref: '#/components/schemas/ForwardMessageDTO'
         videoCallMessageDTO:
           $ref: '#/components/schemas/VideoCallMessageDTO'
         messageType:
           $ref: '#/components/schemas/MessageType'
         content:
           type: string
 
-    ForwardMessageDTO:
-      type: object
-      required:
-        - message
-        - timestamp
-        - username
-        - rcUserId
-      properties:
-        message:
-          type: string
-          example: "Lorem ipsum dolor sit amet, consetetur..."
-        org:
-          type: string
-          example: "Lorem ipsum dolor sit amet, consetetur..."
-          description: "Legacy fallback for stringified messages"
-        timestamp:
-          type: string
-          description: "Full qualified timestamp"
-          example: "2018-11-15T09:33:00.057Z"
-        username:
-          type: string
-          example: "asker23"
-        displayName:
-          type: string
-        rcUserId:
-          type: string
-          example: "ag89h3tjkerg94t"
-        t:
-          type: string
-
     VideoCallMessageDTO:
       type: object
       required:
@@ -708,7 +580,6 @@ components:
         - "APPOINTMENT_CANCELLED"
         - "APPOINTMENT_RESCHEDULED"
         - "FINISHED_CONVERSATION"
-        - "FORWARD"
         - "FURTHER_STEPS"
         - "UPDATE_SESSION_DATA"
         - "VIDEOCALL"
@@ -720,10 +591,6 @@ components:
         - "REASSIGN_CONSULTANT_RESET_LAST_MESSAGE"
 
     AliasArgs:
-      oneOf:
-        - $ref: '#/components/schemas/ConsultantReassignment'
-
-    ConsultantReassignment:
       type: object
       description: >
         toConsultantId, toConsultantName, toAskerName and fromConsultantName are required during

google_checks_light.xml

@@ -306,7 +306,6 @@
         </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"/>