chore: remove blank spaces and fix format

Signed-off-by: Ruben Romero Montes <rromerom@redhat.com>

Author: ruromero

.github/workflows/release.yml

@@ -24,39 +24,39 @@ jobs:
     permissions:
       contents: read
       packages: write
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-      
+
     - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         java-version: '21'
         distribution: 'temurin'
-        
+
     - name: Set up Node.js
       uses: actions/setup-node@v4
       with:
         node-version: '20'
         registry-url: 'https://npm.pkg.github.com'
         scope: '@trustification'
-        
+
     - name: Cache Maven packages
       uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-        
+
     - name: Cache npm dependencies
       uses: actions/cache@v4
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
           ${{ runner.os }}-node-
-          
+
     - name: Get API version
       id: api-version
       run: |
@@ -65,40 +65,43 @@ jobs:
         else
           echo "version=v1" >> $GITHUB_OUTPUT
         fi
-        
+
     - name: Build and Release Java Models
       if: ${{ github.event.inputs.release_java != 'false' }}
       run: |
-          echo "📦 Building and releasing Java models..."
-          cd api-models/java
-          # Set the release version
-          mvn versions:set -DnewVersion=${{ steps.api-version.outputs.version }} -DgenerateBackupPoms=false
-          mvn clean generate-sources compile -Dapi.version=${{ steps.api-version.outputs.version }}
-          mvn deploy -Dapi.version=${{ steps.api-version.outputs.version }}
-          # Reset to SNAPSHOT version
-          mvn versions:set -DnewVersion=1.0.0-SNAPSHOT -DgenerateBackupPoms=false
-          echo "✅ Java models released successfully"
-        env:
-          GITHUB_ACTOR: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+        echo "📦 Building and releasing Java models..."
+        cd api-models/java
+        # Set the release version (convert v1 to 1.0.0 format)
+        RELEASE_VERSION="1.0.0-${{ steps.api-version.outputs.version }}"
+        mvn versions:set -DnewVersion=$RELEASE_VERSION -DgenerateBackupPoms=false
+        mvn clean generate-sources compile -Dapi.version=${{ steps.api-version.outputs.version }}
+        mvn deploy -Dapi.version=${{ steps.api-version.outputs.version }}
+        # Reset to SNAPSHOT version
+        mvn versions:set -DnewVersion=1.0.0-SNAPSHOT -DgenerateBackupPoms=false
+        echo "✅ Java models released successfully"
+      env:
+        GITHUB_ACTOR: ${{ github.actor }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Build and Release TypeScript Models
       if: ${{ github.event.inputs.release_typescript != 'false' }}
       run: |
-          echo "📦 Building and releasing TypeScript models..."
-          cd api-models/typescript
-          # Set the release version
-          npm version ${{ steps.api-version.outputs.version }} --no-git-tag-version
-          npm ci
-          npm run generate --version ${{ steps.api-version.outputs.version }}
-          npm run build
-          npm publish
-          # Reset to SNAPSHOT version
-          npm version 1.0.0-SNAPSHOT --no-git-tag-version
-          echo "✅ TypeScript models released successfully"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+        echo "📦 Building and releasing TypeScript models..."
+        cd api-models/typescript
+        # Set the release version (convert v1 to 1.0.0 format)
+        RELEASE_VERSION="1.0.0-${{ steps.api-version.outputs.version }}"
+        npm version $RELEASE_VERSION --no-git-tag-version
+        npm ci
+        npm run generate --version=${{ steps.api-version.outputs.version }}
+        npm run build
+        npm publish
+        # Reset to SNAPSHOT version
+        npm version 1.0.0-SNAPSHOT --no-git-tag-version
+        echo "✅ TypeScript models released successfully"
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        npm_config_version: ${{ steps.api-version.outputs.version }}
+
     - name: Summary
       run: |
         echo "🎉 API Models release completed!"

.github/workflows/validate-api.yml

@@ -17,37 +17,37 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-      
+
     - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         java-version: '21'
         distribution: 'temurin'
-        
+
     - name: Set up Node.js
       uses: actions/setup-node@v4
       with:
         node-version: '20'
-        
+
     - name: Cache Maven packages
       uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-        
+
     - name: Cache npm dependencies
       uses: actions/cache@v4
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
           ${{ runner.os }}-node-
-          
+
     - name: Get API version
       id: api-version
       run: |
@@ -56,7 +56,7 @@ jobs:
         else
           echo "version=v1" >> $GITHUB_OUTPUT
         fi
-        
+
     - name: Check Git repository state
       run: |
         echo "🔍 Checking Git repository state..."
@@ -82,7 +82,7 @@ jobs:
         cd api-models/java
         mvn clean generate-sources compile -Dapi.version=${{ steps.api-version.outputs.version }} -q
         echo "✅ Java models generated successfully"
-        
+
     - name: Test TypeScript model generation
       run: |
         echo "🔨 Testing TypeScript model generation..."
@@ -91,7 +91,7 @@ jobs:
         npm run generate --version=${{ steps.api-version.outputs.version }}
         npm run build --silent
         echo "✅ TypeScript models generated successfully"
-        
+
     - name: Validate tools configuration
       run: |
         echo "🔍 Validating tools configuration..."
@@ -100,35 +100,35 @@ jobs:
         npm run build --silent
         node dist/index.js config validate --root ../
         echo "✅ Tools configuration validated"
-        
+
     - name: Test API model generation (no unintended file changes)
       run: |
         echo "🔍 Testing API generation doesn't create/modify unintended files..."
-        
+
         # Store current Git state
         echo "📸 Storing current Git state..."
         git status --porcelain > /tmp/before_generate.txt
         git diff --name-only > /tmp/before_generate_diff.txt
-        
+
         # Clean generated files to start fresh
         echo "🧹 Cleaning previously generated files..."
         cd tools
         node dist/index.js api clean --type both
         cd ..
-        
+
         # Run API model validation
         echo "🔨 Running API model validation..."
         cd tools
         node dist/index.js api validate --spec-version=${{ steps.api-version.outputs.version }}
         cd ..
-        
+
         # The API model validation handles all the validation logic
         echo "✅ API model validation completed successfully"
-        
+
     - name: Validate generated files
       run: |
         echo "🔍 Validating generated files..."
-        
+
         # Check Java generated files
         if [ -d "api-models/java/target/generated-sources/openapi" ]; then
           echo "✅ Java models generated in target/generated-sources/openapi"
@@ -137,7 +137,7 @@ jobs:
           echo "❌ Java models not generated"
           exit 1
         fi
-        
+
         # Check TypeScript generated files
         if [ -d "api-models/typescript/src/generated" ]; then
           echo "✅ TypeScript models generated in src/generated"
@@ -146,9 +146,9 @@ jobs:
           echo "❌ TypeScript models not generated"
           exit 1
         fi
-        
+
         echo "✅ All generated files validated"
-        
+
     - name: Summary
       run: |
         echo "🎉 API Models validation completed successfully!"