cleanup

Author: Jonas-C

taxonomy-api/src/main/kotlin/no/ndla/taxonomy/rest/v1/UrlResolver.kt

@@ -20,7 +20,6 @@ import no.ndla.taxonomy.service.UrlResolverService
 import no.ndla.taxonomy.service.dtos.ResolvedUrl
 import org.springframework.http.HttpStatus
 import org.springframework.security.access.prepost.PreAuthorize
-import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PutMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -34,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController
 class UrlResolver(private val urlResolverService: UrlResolverService) {
 
   @GetMapping("/resolve")
-  @Transactional(readOnly = true)
   fun resolve(
       @RequestParam path: String,
       @RequestParam(value = "language", defaultValue = Constants.DefaultLanguage, required = false)
@@ -45,7 +43,6 @@ class UrlResolver(private val urlResolverService: UrlResolverService) {
 
   @GetMapping("/mapping")
   @Operation(summary = "Returns paths for an url or HTTP 404")
-  @Transactional(readOnly = true)
   fun getTaxonomyPathForUrl(
       @Parameter(
           description = "url in old rig except 'https://'",
@@ -64,15 +61,15 @@ class UrlResolver(private val urlResolverService: UrlResolverService) {
   )
   @ResponseStatus(HttpStatus.NO_CONTENT)
   @PreAuthorize("hasAuthority('TAXONOMY_WRITE')")
-  @Transactional
-  fun putTaxonomyNodeAndSubjectForOldUrl(@RequestBody urlMapping: UrlMapping): Unit =
-      try {
-        urlResolverService.putUrlMapping(
-            urlMapping.url,
-            URI.create(urlMapping.nodeId),
-            if (urlMapping.subjectId != null) URI.create(urlMapping.subjectId) else null,
-        )
-      } catch (e: UrlResolverService.NodeIdNotFoundException) {
-        throw NotFoundHttpResponseException(e.message)
-      }
+  fun putTaxonomyNodeAndSubjectForOldUrl(@RequestBody urlMapping: UrlMapping) {
+    try {
+      urlResolverService.putUrlMapping(
+          urlMapping.url,
+          URI.create(urlMapping.nodeId),
+          urlMapping.subjectId?.let { URI.create(it) },
+      )
+    } catch (e: UrlResolverService.NodeIdNotFoundException) {
+      throw NotFoundHttpResponseException(e.message)
+    }
+  }
 }

taxonomy-api/src/main/kotlin/no/ndla/taxonomy/service/UrlResolverService.kt

@@ -36,21 +36,13 @@ class UrlResolverService(
    * @return return a resolved URL or null
    */
   fun resolveOldUrl(oldUrl: String): String? {
-    val results = getCachedUrlOldRig(oldUrl)
-    if (!results.isEmpty()) {
-      val result = results.first()
-      val subjectId = result.subjectId
-      if (subjectId != null) {
-        val allPaths = getAllPaths(result.publicId)
-        val shortestPath = findShortestPathStartingWith(subjectId, allPaths)
-        if (shortestPath != null) {
-          return shortestPath
-        }
+    val result = getCachedUrlOldRig(oldUrl).firstOrNull() ?: return null
+    result.subjectId?.let { subjectId ->
+      findShortestPathStartingWith(subjectId, getAllPaths(result.publicId))?.let {
+        return it
       }
-      return getPrimaryPath(result.publicId)
-    } else {
-      return null
     }
+    return getPrimaryPath(result.publicId)
   }
 
   private fun findShortestPathStartingWith(subjectId: URI, allPaths: List<String>): String? =
@@ -80,8 +72,7 @@ class UrlResolverService(
       // url
       // e.g. oldUrl /node/54 should not match /node/54321 - therefore we add only if IDs
       // match
-      val mappingOldUrl = mapping.oldUrl
-      getNodeId(mappingOldUrl) == nodeId
+      getNodeId(mapping.oldUrl) == nodeId
     }
   }
 
@@ -102,6 +93,7 @@ class UrlResolverService(
    * @param subjectId subjectID to be associated with this URL (optional)
    * @throws NodeIdNotFoundException if node id not found in taxonomy
    */
+  @Transactional
   @Throws(NodeIdNotFoundException::class)
   fun putUrlMapping(oldUrl: String, nodeId: URI, subjectId: URI?) {
     val canonified = canonifier.canonify(oldUrl)
@@ -149,7 +141,7 @@ class UrlResolverService(
                 ctx.nodeType,
             )
 
-        return ResolvedUrl(
+        ResolvedUrl(
             exactMatch = context != null,
             contentUri = leafNode.contentUri,
             id = URI.create(ctx.publicId),