Merge pull request #26 from AxonFramework/fix/18

CodeDrivenMitch · web-flow · commit 2fd0bbf370a3 · 2022-02-25T13:39:10.000+01:00
Fix wrong icon being shown for Publishers in popup
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@
 ### Fixed
 
 - Fix popup on deadline manager methods when there are qualified references as arguments. Fixes #16
+- The correct icon is now shown for publishers in line marker popup. Fixes #18
+
+### Changed
+
+- Query handlers are more easily identifiable in line marker popup
 
 ## [0.5.0]
 
diff --git a/src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/creators/DefaultMessageCreator.kt b/src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/creators/DefaultMessageCreator.kt
@@ -41,9 +41,6 @@ data class DefaultMessageCreator(
      * Returns the correct icon for the creator
      */
     override fun getIcon(): Icon {
-        if (parentHandler != null) {
-            return parentHandler.getIcon()
-        }
         return AxonIcons.Publisher
     }
 
diff --git a/src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/QueryHandler.kt b/src/main/kotlin/org/axonframework/intellij/ide/plugin/resolving/handlers/types/QueryHandler.kt
@@ -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.containingClassname
 
 /**
  * Represents a method being able to handle a query.
@@ -34,6 +35,10 @@ data class QueryHandler(
     override val handlerType: MessageHandlerType = MessageHandlerType.QUERY
 
     override fun renderText(): String {
+        return "${element.containingClassname()}.${element.name}"
+    }
+
+    override fun renderContainerText(): String {
         return componentName
     }
 }
diff --git a/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/CommandHandlerMethodLineMarkerProviderTest.kt b/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/CommandHandlerMethodLineMarkerProviderTest.kt
@@ -140,7 +140,7 @@ class CommandHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommandHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommandHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("Saga: test", null, AxonIcons.Handler)
+            OptionSummary("Saga: test", null, AxonIcons.Publisher)
         )
     }
 
@@ -175,7 +175,7 @@ class CommandHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommandHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommandHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("Saga: test", null, AxonIcons.Handler)
+            OptionSummary("Saga: test", null, AxonIcons.Publisher)
         )
     }
 }
diff --git a/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/CommonHandlerMethodLineMarkerProviderTest.kt b/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/CommonHandlerMethodLineMarkerProviderTest.kt
@@ -52,7 +52,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("MyCommand", null, AxonIcons.Handler)
+            OptionSummary("MyCommand", null, AxonIcons.Publisher)
         )
     }
 
@@ -81,7 +81,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("MyCommand", null, AxonIcons.Handler)
+            OptionSummary("MyCommand", null, AxonIcons.Publisher)
         )
     }
 
@@ -109,7 +109,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Handler)
+            OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Publisher)
         )
     }
 
@@ -142,7 +142,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Handler)
+            OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Publisher)
         )
     }
 
@@ -170,7 +170,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("MyCommand", null, AxonIcons.Handler)
+            OptionSummary("MyCommand", null, AxonIcons.Publisher)
         )
     }
 
@@ -210,7 +210,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("MyCommand", null, AxonIcons.Handler)
+            OptionSummary("MyCommand", null, AxonIcons.Publisher)
         )
     }
 
@@ -239,7 +239,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()
 
         assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("MyCommand", null, AxonIcons.Handler)
+            OptionSummary("MyCommand", null, AxonIcons.Publisher)
         )
     }
 }
diff --git a/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/DeadlineHandlerMethodLineMarkerProviderTest.kt b/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/handlers/DeadlineHandlerMethodLineMarkerProviderTest.kt
@@ -43,7 +43,7 @@ class DeadlineHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase(
         )
         assertThat(hasLineMarker(DeadlineHandlerMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(DeadlineHandlerMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("MyCommand", null, AxonIcons.Handler)
+            OptionSummary("MyCommand", null, AxonIcons.Publisher)
         )
     }
 }
diff --git a/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/publishers/PublishMethodLineMarkerProviderTest.kt b/src/test/kotlin/org/axonframework/intellij/ide/plugin/markers/publishers/PublishMethodLineMarkerProviderTest.kt
@@ -152,7 +152,7 @@ class PublishMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase() {
 
         assertThat(hasLineMarker(PublishMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(PublishMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("some-group", null, AxonIcons.Handler)
+            OptionSummary("MyProcessingGroup.handle", "some-group", AxonIcons.Handler)
         )
     }
 
@@ -175,7 +175,7 @@ class PublishMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase() {
 
         assertThat(hasLineMarker(PublishMethodLineMarkerProvider::class.java)).isTrue
         assertThat(getLineMarkerOptions(PublishMethodLineMarkerProvider::class.java)).containsExactly(
-            OptionSummary("test", null, AxonIcons.Handler)
+            OptionSummary("MyProcessingGroup.handle", "test", AxonIcons.Handler)
         )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,6 @@ data class DefaultMessageCreator(`
`41`	`41`	`* Returns the correct icon for the creator`
`42`	`42`	`*/`
`43`	`43`	`override fun getIcon(): Icon {`
`44`		`- if (parentHandler != null) {`
`45`		`- return parentHandler.getIcon()`
`46`		`- }`
`47`	`44`	`return AxonIcons.Publisher`
`48`	`45`	`}`
`49`	`46`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class CommandHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`140`	`140`
`141`	`141`	`assertThat(hasLineMarker(CommandHandlerMethodLineMarkerProvider::class.java)).isTrue`
`142`	`142`	`assertThat(getLineMarkerOptions(CommandHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`143`		`- OptionSummary("Saga: test", null, AxonIcons.Handler)`
	`143`	`+ OptionSummary("Saga: test", null, AxonIcons.Publisher)`
`144`	`144`	`)`
`145`	`145`	`}`
`146`	`146`
`@@ -175,7 +175,7 @@ class CommandHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`175`	`175`
`176`	`176`	`assertThat(hasLineMarker(CommandHandlerMethodLineMarkerProvider::class.java)).isTrue`
`177`	`177`	`assertThat(getLineMarkerOptions(CommandHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`178`		`- OptionSummary("Saga: test", null, AxonIcons.Handler)`
	`178`	`+ OptionSummary("Saga: test", null, AxonIcons.Publisher)`
`179`	`179`	`)`
`180`	`180`	`}`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`52`	`52`
`53`	`53`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`54`	`54`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`55`		`- OptionSummary("MyCommand", null, AxonIcons.Handler)`
	`55`	`+ OptionSummary("MyCommand", null, AxonIcons.Publisher)`
`56`	`56`	`)`
`57`	`57`	`}`
`58`	`58`
`@@ -81,7 +81,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`81`	`81`
`82`	`82`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`83`	`83`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`84`		`- OptionSummary("MyCommand", null, AxonIcons.Handler)`
	`84`	`+ OptionSummary("MyCommand", null, AxonIcons.Publisher)`
`85`	`85`	`)`
`86`	`86`	`}`
`87`	`87`
`@@ -109,7 +109,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`109`	`109`
`110`	`110`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`111`	`111`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`112`		`- OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Handler)`
	`112`	`+ OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Publisher)`
`113`	`113`	`)`
`114`	`114`	`}`
`115`	`115`
`@@ -142,7 +142,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`142`	`142`
`143`	`143`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`144`	`144`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`145`		`- OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Handler)`
	`145`	`+ OptionSummary("EventSourcingHandler MyAggregate", null, AxonIcons.Publisher)`
`146`	`146`	`)`
`147`	`147`	`}`
`148`	`148`
`@@ -170,7 +170,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`170`	`170`
`171`	`171`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`172`	`172`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`173`		`- OptionSummary("MyCommand", null, AxonIcons.Handler)`
	`173`	`+ OptionSummary("MyCommand", null, AxonIcons.Publisher)`
`174`	`174`	`)`
`175`	`175`	`}`
`176`	`176`
`@@ -210,7 +210,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`210`	`210`
`211`	`211`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`212`	`212`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`213`		`- OptionSummary("MyCommand", null, AxonIcons.Handler)`
	`213`	`+ OptionSummary("MyCommand", null, AxonIcons.Publisher)`
`214`	`214`	`)`
`215`	`215`	`}`
`216`	`216`
`@@ -239,7 +239,7 @@ class CommonHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase()`
`239`	`239`
`240`	`240`	`assertThat(hasLineMarker(CommonHandlerMethodLineMarkerProvider::class.java)).isTrue`
`241`	`241`	`assertThat(getLineMarkerOptions(CommonHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`242`		`- OptionSummary("MyCommand", null, AxonIcons.Handler)`
	`242`	`+ OptionSummary("MyCommand", null, AxonIcons.Publisher)`
`243`	`243`	`)`
`244`	`244`	`}`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class DeadlineHandlerMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase(`
`43`	`43`	`)`
`44`	`44`	`assertThat(hasLineMarker(DeadlineHandlerMethodLineMarkerProvider::class.java)).isTrue`
`45`	`45`	`assertThat(getLineMarkerOptions(DeadlineHandlerMethodLineMarkerProvider::class.java)).containsExactly(`
`46`		`- OptionSummary("MyCommand", null, AxonIcons.Handler)`
	`46`	`+ OptionSummary("MyCommand", null, AxonIcons.Publisher)`
`47`	`47`	`)`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class PublishMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase() {`
`152`	`152`
`153`	`153`	`assertThat(hasLineMarker(PublishMethodLineMarkerProvider::class.java)).isTrue`
`154`	`154`	`assertThat(getLineMarkerOptions(PublishMethodLineMarkerProvider::class.java)).containsExactly(`
`155`		`- OptionSummary("some-group", null, AxonIcons.Handler)`
	`155`	`+ OptionSummary("MyProcessingGroup.handle", "some-group", AxonIcons.Handler)`
`156`	`156`	`)`
`157`	`157`	`}`
`158`	`158`
`@@ -175,7 +175,7 @@ class PublishMethodLineMarkerProviderTest : AbstractAxonFixtureTestCase() {`
`175`	`175`
`176`	`176`	`assertThat(hasLineMarker(PublishMethodLineMarkerProvider::class.java)).isTrue`
`177`	`177`	`assertThat(getLineMarkerOptions(PublishMethodLineMarkerProvider::class.java)).containsExactly(`
`178`		`- OptionSummary("test", null, AxonIcons.Handler)`
	`178`	`+ OptionSummary("MyProcessingGroup.handle", "test", AxonIcons.Handler)`
`179`	`179`	`)`
`180`	`180`	`}`
`181`	`181`