Remove the link between creators and parent handlers

src/main/kotlin/org/axonframework/intellij/ide/plugin/api/AxonAnnotation.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ enum class AxonAnnotation(val annotationName: String) {
     AGGREGATE_MEMBER("org.axonframework.modelling.command.AggregateMember"),
     ROUTING_KEY("org.axonframework.commandhandling.RoutingKey"),
     ENTITY_ID("org.axonframework.modelling.command.EntityId"),
-    PROCESSING_GROUP("org.axonframework.config.ProcessingGroup")
+    PROCESSING_GROUP("org.axonframework.config.ProcessingGroup"),
+    SAGA("org.axonframework.config.ProcessingGroup")
     ;
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/api/MessageCreator.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,12 +27,5 @@ interface MessageCreator : PsiElementWrapper {
      * it's the payload type.
      */
     val payload: String
-
-    /**
-     * The parent handler that published the message. For example, if this MessageCreator represents an event
-     * created by a CommandHandler, the parentHandler will be that CommandHandler.
-     * The same applied for commands created by a SagaEventHandler, among others.
-     */
-    val parentHandler: Handler?
 }
 

src/main/kotlin/org/axonframework/intellij/ide/plugin/api/PsiElementWrapper.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.axonframework.intellij.ide.plugin.api
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
-import org.axonframework.intellij.ide.plugin.util.containingClassname
+import org.axonframework.intellij.ide.plugin.util.toViewText
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.getParentOfType
 import org.jetbrains.uast.toUElement
@@ -40,7 +40,7 @@ interface PsiElementWrapper {
     fun renderText(): String {
         val methodParent = element.toUElement()?.getParentOfType<UMethod>()
         if (methodParent != null) {
-            return methodParent.containingClassname() + "." + methodParent.name
+            return methodParent.toViewText()
         }
 
         if (element is PsiClass) {

src/main/kotlin/org/axonframework/intellij/ide/plugin/markers/ClassLineMarkerProvider.kt

@@ -49,7 +49,7 @@ class ClassLineMarkerProvider : LineMarkerProvider {
             if (handlers.isNotEmpty()) {
                 return AxonNavigationGutterIconRenderer(
                     icon = AxonIcons.Axon,
-                    popupTitle = "Axon References To This Class",
+                    popupTitle = "Axon References To $qualifiedName",
                     tooltipText = "Navigate to message handlers and creations",
                     emptyText = "No references were found",
                     elements = NotNullLazyValue.createValue {

src/main/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/CommandHandlerMethodLineMarkerProvider.kt

@@ -50,7 +50,6 @@ class CommandHandlerMethodLineMarkerProvider : AbstractHandlerLineMarkerProvider
             emptyText = "No creators of this message payload were found",
             elements = ValidatingLazyValue(element) {
                 val creatingElements = element.creatorResolver().getCreatorsForPayload(payload)
-                    .distinctBy { it.parentHandler }
                 interceptingElements + creatingElements
             })
             .createLineMarkerInfo(element)

src/main/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/CommonHandlerMethodLineMarkerProvider.kt

@@ -44,7 +44,6 @@ class CommonHandlerMethodLineMarkerProvider : AbstractHandlerLineMarkerProvider(
             emptyText = "No creators of this message payload were found",
             elements = ValidatingLazyValue(element) {
                 element.creatorResolver().getCreatorsForPayload(payload)
-                    .distinctBy { it.parentHandler }
             }).createLineMarkerInfo(element)
     }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/DeadlineHandlerMethodLineMarkerProvider.kt

@@ -54,7 +54,6 @@ class DeadlineHandlerMethodLineMarkerProvider : AbstractHandlerLineMarkerProvide
             emptyText = "No deadline schedule invocations could be found",
             elements = ValidatingLazyValue(element) {
                 element.deadlineReferenceResolver().findByDeadlineName(deadlineName)
-                    .distinctBy { it.parentHandler }
             }).createLineMarkerInfo(element)
     }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/DeadlineManagerReferenceResolver.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import org.axonframework.intellij.ide.plugin.resolving.creators.DefaultMessageCr
 import org.axonframework.intellij.ide.plugin.util.axonScope
 import org.axonframework.intellij.ide.plugin.util.createCachedValue
 import org.axonframework.intellij.ide.plugin.util.deadlineMethodResolver
-import org.axonframework.intellij.ide.plugin.util.findParentHandlers
 import org.axonframework.intellij.ide.plugin.util.toQualifiedName
 import org.jetbrains.uast.UCallExpression
 import org.jetbrains.uast.evaluateString
@@ -117,10 +116,6 @@ class DeadlineManagerReferenceResolver(val project: Project) {
     }
 
     private fun createCreators(payload: String, element: PsiElement): List<MessageCreator> {
-        val parentHandlers = element.findParentHandlers()
-        if (parentHandlers.isEmpty()) {
-            return listOf(DefaultMessageCreator(element, payload, null))
-        }
-        return parentHandlers.map { DefaultMessageCreator(element, payload, it) }
+        return listOf(DefaultMessageCreator(element, payload, true))
     }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/MessageCreationResolver.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,15 +17,13 @@
 package org.axonframework.intellij.ide.plugin.resolving
 
 import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiElement
 import com.intellij.psi.search.searches.MethodReferencesSearch
 import com.intellij.psi.util.CachedValue
 import org.axonframework.intellij.ide.plugin.api.MessageCreator
 import org.axonframework.intellij.ide.plugin.resolving.creators.DefaultMessageCreator
 import org.axonframework.intellij.ide.plugin.util.areAssignable
 import org.axonframework.intellij.ide.plugin.util.axonScope
 import org.axonframework.intellij.ide.plugin.util.createCachedValue
-import org.axonframework.intellij.ide.plugin.util.findParentHandlers
 import org.axonframework.intellij.ide.plugin.util.handlerResolver
 import org.axonframework.intellij.ide.plugin.util.javaFacade
 import java.util.concurrent.ConcurrentHashMap
@@ -74,17 +72,9 @@ class MessageCreationResolver(private val project: Project) {
                 val methods = clazz.constructors + clazz.methods.filter { it.name.contains("build", ignoreCase = true) }
                 methods
                     .flatMap { MethodReferencesSearch.search(it, project.axonScope(), true) }
-                    .flatMap { ref -> createCreators(typeFqn, ref.element) }
+                    .map { ref -> DefaultMessageCreator(ref.element, typeFqn, false) }
                     .distinct()
             }
         }
     }
-
-    private fun createCreators(payload: String, element: PsiElement): List<MessageCreator> {
-        val parentHandlers = element.findParentHandlers()
-        if (parentHandlers.isEmpty()) {
-            return listOf(DefaultMessageCreator(element, payload, null))
-        }
-        return parentHandlers.map { DefaultMessageCreator(element, payload, it) }
-    }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/creators/DefaultMessageCreator.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package org.axonframework.intellij.ide.plugin.resolving.creators
 
 import com.intellij.psi.PsiElement
 import org.axonframework.intellij.ide.plugin.AxonIcons
-import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageCreator
+import org.jetbrains.kotlin.idea.core.util.getLineNumber
 import javax.swing.Icon
 
 /**
@@ -34,7 +34,7 @@ import javax.swing.Icon
 data class DefaultMessageCreator(
     override val element: PsiElement,
     override val payload: String,
-    override val parentHandler: Handler?,
+    val isDeadline: Boolean = false,
 ) : MessageCreator {
 
     /**
@@ -45,9 +45,13 @@ data class DefaultMessageCreator(
     }
 
     override fun renderText(): String {
-        if (parentHandler != null) {
-            return parentHandler.renderText()
+        return super.renderText() + ":" + element.getLineNumber()
+    }
+
+    override fun renderContainerText(): String? {
+        if (isDeadline) {
+            return payload
         }
-        return super.renderText()
+        return null
     }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/searchers/EventHandlerSearcher.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.axonframework.intellij.ide.plugin.util.toQualifiedName
 /**
  * Searches for any event handlers that are not part of the aggregate model.
  *
- * @see org.axonframework.intellij.ide.plugin.handlers.types.EventHandler
+ * @see org.axonframework.intellij.ide.plugin.resolving.handlers.types.EventHandler
  */
 class EventHandlerSearcher : AbstractHandlerSearcher(MessageHandlerType.EVENT) {
     override fun createMessageHandler(method: PsiMethod, annotation: PsiClass?): Handler? {

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/CommandHandler.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiMethod
 import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageHandlerType
 import org.axonframework.intellij.ide.plugin.util.toShortName
+import org.axonframework.intellij.ide.plugin.util.toViewText
 
 /**
  * Represents a method being able to handle a command.
@@ -34,6 +35,10 @@ data class CommandHandler(
 ) : Handler {
     override val handlerType: MessageHandlerType = MessageHandlerType.COMMAND
 
+    override fun renderText(): String {
+        return element.toViewText()
+    }
+
     override fun renderContainerText(): String {
         return componentName.toShortName()
     }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/CommandHandlerInterceptor.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiMethod
 import org.axonframework.intellij.ide.plugin.AxonIcons
 import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageHandlerType
-import org.axonframework.intellij.ide.plugin.util.toShortName
+import org.axonframework.intellij.ide.plugin.util.toViewText
 import javax.swing.Icon
 
 /**
@@ -37,11 +37,11 @@ data class CommandHandlerInterceptor(
     override val handlerType: MessageHandlerType = MessageHandlerType.COMMAND_INTERCEPTOR
 
     override fun renderText(): String {
-        return "Command Interceptor of ${componentName.toShortName()}"
+        return element.toViewText()
     }
 
     override fun renderContainerText(): String {
-        return element.name
+        return "Command interceptor"
     }
 
     override fun getIcon(): Icon {

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/DeadlineHandler.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.axonframework.intellij.ide.plugin.resolving.handlers.types
 import com.intellij.psi.PsiMethod
 import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageHandlerType
+import org.axonframework.intellij.ide.plugin.util.toViewText
 
 /**
  * Represents a method being able to a deadline message. Invoked when a deadline expires.
@@ -33,6 +34,6 @@ data class DeadlineHandler(
     override val handlerType: MessageHandlerType = MessageHandlerType.DEADLINE
 
     override fun renderText(): String {
-        return "Deadline $deadlineName"
+        return element.toViewText()
     }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/EventHandler.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.axonframework.intellij.ide.plugin.resolving.handlers.types
 import com.intellij.psi.PsiMethod
 import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageHandlerType
-import org.axonframework.intellij.ide.plugin.util.containingClassname
+import org.axonframework.intellij.ide.plugin.util.toViewText
 
 /**
  * Represents a method being able to handle an event. There are more specific event handlers (`EventSourcingHandler` and
@@ -40,7 +40,7 @@ data class EventHandler(
     override val handlerType: MessageHandlerType = MessageHandlerType.EVENT
 
     override fun renderText(): String {
-        return element.containingClassname().ifEmpty { "Event Processor" }
+        return element.toViewText()
     }
 
     override fun renderContainerText(): String {

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/EventSourcingHandler.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.axonframework.intellij.ide.plugin.resolving.handlers.types
 import com.intellij.psi.PsiMethod
 import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageHandlerType
-import org.axonframework.intellij.ide.plugin.util.toShortName
+import org.axonframework.intellij.ide.plugin.util.toViewText
 
 /**
  * Represents a method being able to handle an event for sourcing an aggregate.
@@ -35,6 +35,10 @@ data class EventSourcingHandler(
     override val handlerType: MessageHandlerType = MessageHandlerType.EVENT_SOURCING
 
     override fun renderText(): String {
-        return "EventSourcingHandler " + entity.toShortName()
+        return element.toViewText()
+    }
+
+    override fun renderContainerText(): String {
+        return "EventSourcingHandler"
     }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/QueryHandler.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022. Axon Framework
+ *  Copyright (c) (2010-2022). Axon Framework
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.axonframework.intellij.ide.plugin.resolving.handlers.types
 import com.intellij.psi.PsiMethod
 import org.axonframework.intellij.ide.plugin.api.Handler
 import org.axonframework.intellij.ide.plugin.api.MessageHandlerType
-import org.axonframework.intellij.ide.plugin.util.containingClassname
+import org.axonframework.intellij.ide.plugin.util.toViewText
 
 /**
  * Represents a method being able to handle a query.
@@ -35,7 +35,7 @@ data class QueryHandler(
     override val handlerType: MessageHandlerType = MessageHandlerType.QUERY
 
     override fun renderText(): String {
-        return "${element.containingClassname()}.${element.name}"
+        return element.toViewText()
     }
 
     override fun renderContainerText(): String {