#19 Give the report service access to the graphical asset service

acropolis-persistence/src/main/kotlin/org/ephyra/acropolis/persistence/api/persistence/GraphicalAssetPersistence.kt

@@ -30,4 +30,9 @@ class GraphicalAssetPersistence {
     fun findAll(): MutableIterable<GraphicalAssetEntity> {
         return repo.findAll()
     }
+
+    fun find(name: String): GraphicalAssetEntity? {
+        val asset = repo.findByName(name)
+        return if (asset.isPresent) asset.get() else null
+    }
 }

acropolis-persistence/src/main/kotlin/org/ephyra/acropolis/persistence/impl/GraphicalAssetRepository.kt

@@ -2,8 +2,11 @@ package org.ephyra.acropolis.persistence.impl
 
 import org.ephyra.acropolis.persistence.api.entity.GraphicalAssetEntity
 import org.springframework.data.repository.CrudRepository
+import java.util.Optional
 
 /**
  * Repository for storing graphical assets
  */
-interface GraphicalAssetRepository : CrudRepository<GraphicalAssetEntity, Long>
+interface GraphicalAssetRepository : CrudRepository<GraphicalAssetEntity, Long> {
+    fun findByName(name: String): Optional<GraphicalAssetEntity>
+}

acropolis-report/src/main/kotlin/org/ephyra/acropolis/report/api/IImageSource.kt

@@ -0,0 +1,7 @@
+package org.ephyra.acropolis.report.api
+
+import java.io.InputStream
+
+interface IImageSource {
+    fun get(resourceName: String): InputStream
+}

acropolis-report/src/main/kotlin/org/ephyra/acropolis/report/api/IReportRunner.kt

@@ -3,5 +3,5 @@ package org.ephyra.acropolis.report.api
 import org.ephyra.acropolis.report.api.model.GraphContainer
 
 interface IReportRunner {
-    fun run(graphContainer: GraphContainer)
+    fun run(graphContainer: GraphContainer, imageSource: IImageSource)
 }

acropolis-report/src/main/kotlin/org/ephyra/acropolis/report/impl/ReportRunner.kt

@@ -1,5 +1,6 @@
 package org.ephyra.acropolis.report.impl
 
+import org.ephyra.acropolis.report.api.IImageSource
 import org.ephyra.acropolis.report.api.IReportRunner
 import org.ephyra.acropolis.report.api.model.Graph
 import org.ephyra.acropolis.report.api.model.GraphContainer
@@ -10,7 +11,7 @@ import java.lang.IllegalStateException
 
 @Component
 private class ReportRunner : IReportRunner {
-    override fun run(graphContainer: GraphContainer) {
+    override fun run(graphContainer: GraphContainer, imageSource: IImageSource) {
         println("Running report")
         val depthMap = buildNodeDepth(graphContainer.graph)
         val depthCounts = countDepths(depthMap)
@@ -53,7 +54,7 @@ private class ReportRunner : IReportRunner {
         }
 
         DiagramRenderer(diagramWidth, diagramHeight).use { renderer ->
-            
+
         }
     }
 

acropolis-service/src/main/kotlin/org/ephyra/acropolis/service/api/IGraphicalAssetService.kt

@@ -1,6 +1,7 @@
 package org.ephyra.acropolis.service.api
 
 import org.ephyra.acropolis.persistence.api.GraphicalAssetType
+import org.ephyra.acropolis.persistence.api.entity.GraphicalAssetEntity
 import org.ephyra.acropolis.service.api.model.GraphicalAsset
 
 /**
@@ -22,4 +23,6 @@ interface IGraphicalAssetService {
      * @return list of graphical assets
      */
     fun findAll(): List<GraphicalAsset>
+
+    fun find(name: String): GraphicalAssetEntity?
 }

acropolis-service/src/main/kotlin/org/ephyra/acropolis/service/impl/GraphicalAssetImageSource.kt

@@ -0,0 +1,21 @@
+package org.ephyra.acropolis.service.impl
+
+import org.ephyra.acropolis.report.api.IImageSource
+import org.ephyra.acropolis.service.api.IGraphicalAssetService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Component
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.lang.IllegalStateException
+
+@Component
+class GraphicalAssetImageSource : IImageSource {
+    @Autowired
+    private lateinit var graphicalAssetService: IGraphicalAssetService
+
+    override fun get(resourceName: String): InputStream {
+        val asset = graphicalAssetService.find(resourceName)
+                ?: throw IllegalStateException("Missing resource [$resourceName]")
+        return ByteArrayInputStream(asset.source)
+    }
+}

acropolis-service/src/main/kotlin/org/ephyra/acropolis/service/impl/GraphicalAssetService.kt

@@ -32,4 +32,8 @@ class GraphicalAssetService : IGraphicalAssetService {
             GraphicalAsset(type, assetEntity.source)
         }
     }
+
+    override fun find(name: String): GraphicalAssetEntity? {
+        return persistence.find(name)
+    }
 }

acropolis-service/src/main/kotlin/org/ephyra/acropolis/service/impl/ReportService.kt

@@ -37,6 +37,9 @@ class ReportService : IReportService {
     @Autowired
     private lateinit var reportRunner: IReportRunner
 
+    @Autowired
+    private lateinit var graphicalAssetImageSource: GraphicalAssetImageSource
+
     override fun runSoftwareReport(projectName: String) {
         logger.trace("Starting to run software report for project [$projectName]")
 
@@ -74,6 +77,6 @@ class ReportService : IReportService {
         }
 
         val graphContainer = GraphContainer(graph)
-        reportRunner.run(graphContainer)
+        reportRunner.run(graphContainer, graphicalAssetImageSource)
     }
 }