don't register sprites at IconRegistry

chriskn · Nov 3, 2024 · 85bd06d · 85bd06d
1 parent 656ea75
commit 85bd06d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/main/kotlin/com/github/chriskn/structurizrextension/api/icons/IconRegistry.kt b/src/main/kotlin/com/github/chriskn/structurizrextension/api/icons/IconRegistry.kt
@@ -29,11 +29,15 @@ object IconRegistry {
      * @throws MalformedURLException if url is invalid
      */
     fun addIcon(name: String, url: String) {
+        validate(name, url)
+        iconNameToIconUrl[name.lowercase()] = URI(url).toURL()
+    }
+
+    internal fun validate(name: String, url: String) {
         require(name.isNotBlank()) { "Icon name cannot be blank" }
         require(url.endsWith(PUML_FILE_EXTENSION)) {
             "Icon URL needs to point to .puml file but was $url"
         }
-        iconNameToIconUrl[name.lowercase()] = URI(url).toURL()
     }
 
     /**

diff --git a/src/main/kotlin/com/github/chriskn/structurizrextension/api/view/style/sprite/PUmlSprite.kt b/src/main/kotlin/com/github/chriskn/structurizrextension/api/view/style/sprite/PUmlSprite.kt
@@ -33,7 +33,6 @@ data class PUmlSprite(
     internal val colorValidated: String? = color?.let { toValidColor(color) }
 
     init {
-        // TODO is the registry still needed?
-        IconRegistry.addIcon(name, url)
+        IconRegistry.validate(name, url)
     }
 }
diff --git a/src/test/kotlin/com/github/chriskn/structurizrextension/view/sprite/SpriteTest.kt b/src/test/kotlin/com/github/chriskn/structurizrextension/view/sprite/SpriteTest.kt
@@ -18,7 +18,7 @@ class SpriteTest {
         @Test
         fun `PumlSprite is serialized and deserialized correctly`() {
             val expectedSprite = PUmlSprite(
-                name = "android",
+                name = "some technology",
                 url = "https://test.com/sprites/android-icon.puml",
             )
             val style = ElementStyle("test", sprite = expectedSprite)
@@ -29,7 +29,7 @@ class SpriteTest {
         @Test
         fun `PumlSprite is serialized and deserialized correctly when color is used`() {
             val expectedSprite = PUmlSprite(
-                name = "android",
+                name = "some technology",
                 url = "https://test.com/sprites/android-icon.puml",
                 color = "green"
             )
@@ -41,7 +41,7 @@ class SpriteTest {
         @Test
         fun `PumlSprite is serialized and deserialized correctly when scale is used`() {
             val expectedSprite = PUmlSprite(
-                name = "android",
+                name = "some technology",
                 url = "https://test.com/sprites/android-icon.puml",
                 scale = 0.4
             )
@@ -53,7 +53,7 @@ class SpriteTest {
         @Test
         fun `PumlSprite is serialized and deserialized correctly when scale and color is used`() {
             val expectedSprite = PUmlSprite(
-                name = "android",
+                name = "some technology",
                 url = "https://test.com/sprites/android-icon.puml",
                 scale = 0.4,
                 color = "green"