Merge pull request #44 from boschglobal/fix-43

fix: Fix exception on empty VssDefinition asset file
eclipse-kuksa · Nov 24, 2023 · c0ab1f2 · c0ab1f2
2 parents dbd4e19 + c0b4ebe
commit c0ab1f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/vss-processor/build.gradle.kts b/vss-processor/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     kotlin("jvm")
-    `maven-publish`
     publish
 }
 

diff --git a/vss-processor/src/main/kotlin/org/eclipse/kuksa/vssprocessor/VssDefinitionProcessor.kt b/vss-processor/src/main/kotlin/org/eclipse/kuksa/vssprocessor/VssDefinitionProcessor.kt
@@ -81,12 +81,12 @@ class VssDefinitionProcessor(
                 annotatedProcessorFileName,
             )
 
-            val vssDefinition = classDeclaration.getAnnotationsByType(VssDefinition::class).first()
+            val vssDefinition = classDeclaration.getAnnotationsByType(VssDefinition::class).firstOrNull() ?: return
             val vssDefinitionPath = vssDefinition.vssDefinitionPath
 
             val definitionFile = loadAssetFile(vssDefinitionPath)
-            if (!definitionFile.exists()) {
-                logger.error("No VSS definition file was found!")
+            if (definitionFile == null || !definitionFile.exists()) {
+                logger.info("No VSS definition file was found!")
                 return
             }
 
@@ -97,13 +97,14 @@ class VssDefinitionProcessor(
         }
 
         // Uses the default file path for generated files (from the code generator) and searches for the given file.
-        private fun loadAssetFile(fileName: String): File {
-            val generationPath = codeGenerator.generatedFile.first().absolutePath
+        private fun loadAssetFile(fileName: String): File? {
+            val generatedFile = codeGenerator.generatedFile.firstOrNull() ?: return null
+            val generationPath = generatedFile.absolutePath
             val buildPath = generationPath.replaceAfter(BUILD_FOLDER_NAME, "")
             val assetsFilePath = "$buildPath/$ASSETS_BUILD_DIRECTORY"
             val assetsFolder = File(assetsFilePath)
 
-            return assetsFolder.walk().first { it.name == fileName }
+            return assetsFolder.walk().firstOrNull { it.name == fileName }
         }
 
         private fun generateModelFiles(vssPathToSpecification: Map<VssPath, VssSpecificationSpecModel>) {
@@ -112,7 +113,7 @@ class VssDefinitionProcessor(
                 .filter { it.value.size > 1 }
                 .keys
 
-            logger.logging("Ambiguous specifications - Generate nested classes: $duplicateSpecificationNames")
+            logger.info("Ambiguous specifications - Generate nested classes: $duplicateSpecificationNames")
 
             for ((vssPath, specModel) in vssPathToSpecification) {
                 // Every duplicate is produced as a nested class - No separate file should be generated