refactor: compare live locations types

Author: BFergerson

src/main/kotlin/spp/protocol/instrument/location/LiveLocation.kt

@@ -26,7 +26,7 @@ interface LiveLocation {
  val service: Service?
  val probeId: String?
 
- fun isSameLocation(other: LiveLocation): Boolean
+ fun isSameLocation(location: LiveLocation): Boolean
  fun toJson(): JsonObject
 
  companion object {

src/main/kotlin/spp/protocol/instrument/location/LiveSourceLocation.kt

@@ -55,12 +55,12 @@ data class LiveSourceLocation @JvmOverloads constructor(
  scope = json.getString("scope")?.let { LocationScope.valueOf(it) } ?: LocationScope.LINE
  )
 
- override fun isSameLocation(other: LiveLocation): Boolean {
- if (other !is LiveSourceLocation) return false
- if (source != other.source) return false
- if (line != other.line && line != -1 && other.line != -1) return false //-1 is wildcard
- if (service != null && (other.service == null || !service.isSameLocation(other.service!!))) return false
- if (probeId != null && probeId != other.probeId) return false
+ override fun isSameLocation(location: LiveLocation): Boolean {
+ if (location !is LiveSourceLocation) return false
+ if (source != location.source) return false
+ if (line != location.line && line != -1 && location.line != -1) return false //-1 is wildcard
+ if (service != null && (location.service == null || !service.isSameLocation(location.service!!))) return false
+ if (probeId != null && probeId != location.probeId) return false
  return true
  }
 

src/main/kotlin/spp/protocol/platform/general/Service.kt

@@ -89,8 +89,8 @@ data class Service(
  /**
  * Ensures all non-null fields are equal.
  */
- override fun isSameLocation(other: LiveLocation): Boolean {
- if (other !is Service) return false //todo: support other types
+ override fun isSameLocation(location: LiveLocation): Boolean {
+ val other = location.service ?: return false
  if (name != other.name) return false
  if (group != null && group != other.group) return false
  if (shortName != null && shortName != other.shortName) return false