Make minor refactoring

julianmendez · Dec 22, 2019 · d14e196 · d14e196
1 parent a31ae70
commit d14e196
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/tabulas-core/src/main/scala/de/tudresden/inf/lat/tabulas/table/PrefixMapImpl.scala b/tabulas-core/src/main/scala/de/tudresden/inf/lat/tabulas/table/PrefixMapImpl.scala
@@ -17,17 +17,24 @@ case class PrefixMapImpl(prefixMap: Map[URI, URI], keyList: Seq[URI]) extends Pr
   }
 
   override def getWithoutPrefix(uri: URI): URI = {
-    var result = uri
     val uriStr = uri.toString
-    if (uriStr.startsWith(PrefixAmpersand)) {
+    val result = if (uriStr.startsWith(PrefixAmpersand)) {
       val pos = uriStr.indexOf(PrefixSemicolon, PrefixAmpersand.length())
-      if (pos != -1) {
+      val res = if (pos == -1) {
+        uri
+      } else {
         val prefix = URI.create(uriStr.substring(PrefixAmpersand.length(), pos))
         val optExpansion = prefixMap.get(prefix)
-        if (optExpansion.isDefined) {
-          result = URI.create(optExpansion.get.toString + uriStr.substring(pos + PrefixSemicolon.length))
+        val value = if (optExpansion.isDefined) {
+          URI.create(optExpansion.get.toString + uriStr.substring(pos + PrefixSemicolon.length))
+        } else {
+          uri
         }
+        value
       }
+      res
+    } else {
+      uri
     }
     result
   }