DMND-1721 Successfully creating RSD & Collections and adding skills t…

.github/workflows/api-tests.yml

@@ -15,10 +15,10 @@ jobs:
     steps:
       - name: Checkout out branch
         uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Maven version
         run: mvn -version

.github/workflows/maven.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Maven version
       run: mvn -version

api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>edu.wgu.osmt</groupId>
         <artifactId>osmt-parent</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <repositories>
@@ -27,11 +27,11 @@
 
     <groupId>edu.wgu.osmt</groupId>
     <artifactId>osmt-api</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>2.6.1-SNAPSHOT</version>
     <description>WGU Open Skills Management Toolset</description>
 
     <properties>
-        <java.version>11</java.version>
+        <app.version>2.6.1-SNAPSHOT</app.version>
         <kotlin.version>1.7.21</kotlin.version>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.coroutines.version>1.5.1</kotlin.coroutines.version>
@@ -42,8 +42,8 @@
 <!--        TODO - is this needed?-->
         <kotest.version>4.1.3</kotest.version>
         <start-class>edu.wgu.osmt.ApplicationKt</start-class>
-        <testcontainers.version>1.17.6</testcontainers.version>
-        <spring-data-elasticsearch.version>4.4.1</spring-data-elasticsearch.version>
+        <testcontainers.version>1.18.3</testcontainers.version>
+        <spring-data-elasticsearch.version>5.1.3</spring-data-elasticsearch.version>
         <ehcache.version>3.9.2</ehcache.version>
         <log4j.version>2.17.1</log4j.version>
         <bucket4j.version>4.10.0</bucket4j.version>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>edu.wgu.osmt</groupId>
             <artifactId>osmt-ui</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>${app.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.github.sonus21</groupId>
             <artifactId>rqueue-spring-boot-starter</artifactId>
-            <version>2.13.0-RELEASE</version>
+            <version>3.1.0-RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
@@ -121,6 +121,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+<!--        Remove when WGU fully migrate to ElasticSearch v8.x apis DMND-1778-->
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <version>7.17.8</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>

api/src/main/kotlin/edu/wgu/osmt/PropertyLogger.kt

@@ -15,7 +15,7 @@ import java.util.stream.StreamSupport
 
 
 @Component
-@Profile("dev")
+@Profile("debug")
 class PropertyLogger {
     @EventListener
     fun handleContextRefresh(event: ContextRefreshedEvent) {
@@ -43,4 +43,4 @@ class PropertyLogger {
     companion object {
         private val LOGGER = LoggerFactory.getLogger(PropertyLogger::class.java)
     }
-}
+}

api/src/main/kotlin/edu/wgu/osmt/RoutePaths.kt

@@ -57,6 +57,7 @@ object RoutePaths {
     const val COLLECTION_REMOVE = "$COLLECTION_DETAIL/remove"
 
     const val WORKSPACE_PATH = "/workspace"
+    const val WORKSPACE_LIST = WORKSPACE_PATH
 
     private const val TASKS_PATH = "/results"
     const val TASK_DETAIL_TEXT = "$TASKS_PATH/text/{uuid}"

api/src/main/kotlin/edu/wgu/osmt/api/ApiErrorHandler.kt

@@ -33,7 +33,9 @@ class GeneralApiExceptionHandler : ResponseEntityExceptionHandler() {
 @ControllerAdvice
 class ApiErrorHandler : ResponseEntityExceptionHandler() {
 
-    override fun handleHttpMessageNotReadable(
+// No longer abstract method in spring-webmvc:6.0.11
+//    override fun handleHttpMessageNotReadable(
+    fun handleHttpMessageNotReadable(
         ex: HttpMessageNotReadableException,
         headers: HttpHeaders,
         status: HttpStatus,
@@ -57,8 +59,8 @@ class ApiErrorHandler : ResponseEntityExceptionHandler() {
 
     @ExceptionHandler(ResponseStatusException::class)
     fun handleResponseStatus(ex: ResponseStatusException): ResponseEntity<Any> {
-        val apiError = ApiError(ex.status.toString())
-        return ResponseEntity(apiError, ex.status)
+        val apiError = ApiError(ex.message)
+        return ResponseEntity(apiError, ex.statusCode)
     }
 
 }

api/src/main/kotlin/edu/wgu/osmt/auditlog/AuditLogDao.kt

@@ -1,7 +1,7 @@
 package edu.wgu.osmt.auditlog
 
-import com.google.common.reflect.TypeToken
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import edu.wgu.osmt.db.OutputsModel
 import org.jetbrains.exposed.dao.LongEntity
 import org.jetbrains.exposed.dao.LongEntityClass

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt

@@ -3,14 +3,7 @@ package edu.wgu.osmt.collection
 import edu.wgu.osmt.HasAllPaginated
 import edu.wgu.osmt.RoutePaths
 import edu.wgu.osmt.api.GeneralApiException
-import edu.wgu.osmt.api.model.ApiCollection
-import edu.wgu.osmt.api.model.ApiCollectionUpdate
-import edu.wgu.osmt.api.model.ApiCollectionV2
-import edu.wgu.osmt.api.model.ApiSearch
-import edu.wgu.osmt.api.model.ApiSearchV2
-import edu.wgu.osmt.api.model.ApiSkillListUpdate
-import edu.wgu.osmt.api.model.ApiStringListUpdate
-import edu.wgu.osmt.api.model.CollectionSortEnum
+import edu.wgu.osmt.api.model.*
 import edu.wgu.osmt.auditlog.AuditLog
 import edu.wgu.osmt.auditlog.AuditLogRepository
 import edu.wgu.osmt.auditlog.AuditLogSortEnum
@@ -20,34 +13,18 @@ import edu.wgu.osmt.db.PublishStatus
 import edu.wgu.osmt.elasticsearch.OffsetPageable
 import edu.wgu.osmt.richskill.RichSkillRepository
 import edu.wgu.osmt.security.OAuthHelper
-import edu.wgu.osmt.task.AppliesToType
-import edu.wgu.osmt.task.CsvTask
-import edu.wgu.osmt.task.CsvTaskV2
-import edu.wgu.osmt.task.PublishTask
-import edu.wgu.osmt.task.PublishTaskV2
-import edu.wgu.osmt.task.RemoveCollectionSkillsTask
-import edu.wgu.osmt.task.Task
-import edu.wgu.osmt.task.TaskMessageService
-import edu.wgu.osmt.task.TaskResult
-import edu.wgu.osmt.task.UpdateCollectionSkillsTask
-import edu.wgu.osmt.task.XlsxTask
+import edu.wgu.osmt.task.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpStatus
+import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.security.oauth2.jwt.Jwt
 import org.springframework.stereotype.Controller
 import org.springframework.transaction.annotation.Transactional
-import org.springframework.web.bind.annotation.DeleteMapping
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.ResponseBody
+import org.springframework.web.bind.annotation.*
 import org.springframework.web.server.ResponseStatusException
 import org.springframework.web.util.UriComponentsBuilder
 
@@ -346,7 +323,7 @@ class CollectionController @Autowired constructor(
         @PathVariable uuid: String
     ): HttpEntity<List<AuditLog>> {
         val pageable = OffsetPageable(0, Int.MAX_VALUE, AuditLogSortEnum.forValueOrDefault(AuditLogSortEnum.DateDesc.apiValue).sort)
-        val collection = collectionRepository.findByUUID(uuid)
+        val collection = collectionRepository.findByUUID(uuid) ?: throw ResponseStatusException(NOT_FOUND, "Collection with id $uuid not ready or not found")
         val sizedIterable = auditLogRepository.findByTableAndId(CollectionTable.tableName, entityId = collection!!.id.value, offsetPageable = pageable)
 
         return ResponseEntity.status(200).body(sizedIterable.toList().map { it.toModel() })

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 import edu.wgu.osmt.config.INDEX_COLLECTION_DOC
 import edu.wgu.osmt.db.PublishStatus
-import org.elasticsearch.core.Nullable
+import javax.annotation.Nullable
 import org.springframework.data.annotation.Id
 import org.springframework.data.elasticsearch.annotations.*
 import org.springframework.data.elasticsearch.annotations.FieldType.*