Skip to content

Refactor: Modularize ApiResponseHelper#createUsageResponse #13490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PrashantBhanage wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Refactor: Modularize ApiResponseHelper#createUsageResponse #13490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61cb4ea
Refactor: Modularize ApiResponseHelper#createUsageResponse
PrashantBhanage Jun 25, 2026
b99f888
test: Add unit tests for 18 extracted UsageType helper methods
PrashantBhanage Jun 26, 2026
9838eb7
Merge branch 'main' into fix-11635-refactor-usage
PrashantBhanage Jun 27, 2026
c6225bd
fix: Apply Copilot null-check suggestions and remove unused variable
PrashantBhanage Jul 4, 2026
c407a0c
Fix: Replace internal X509CertImpl with standard Java API and remove …
PrashantBhanage Jul 4, 2026
6c3b597
test: Fix populateIpAddressUsageResponseTest after Copilot refactor
PrashantBhanage Jul 5, 2026
a54428b
Fix: Add missing EOF newline to ApiResponseHelperTest
PrashantBhanage Jul 6, 2026
b082934
fix: pre-commit end-of-file fixes
PrashantBhanage Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions .github/workflows/sonar-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
- name: Install Non-OSS
uses: ./.github/actions/install-nonoss
- name: Run Build and Tests with Coverage
env:
NODE_OPTIONS: "--max-old-space-size=4096"
run: mvn -B -T$(nproc) -P developer,systemvm,quality -Dsimulator -Dnoredist clean install
- name: Upload to SonarQube
if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository
Expand All @@ -56,7 +58,15 @@ jobs:
PR_ID: ${{ github.event.pull_request.number }}
HEADREF: ${{ github.event.pull_request.head.ref }}
run: |
mvn -B -P quality org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack -Dsonar.pullrequest.key="$PR_ID" -Dsonar.pullrequest.branch="$HEADREF" -Dsonar.pullrequest.github.repository=apache/cloudstack -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.summary_comment=true
mvn -B -P quality org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Dsonar.projectKey=apache_cloudstack \
-Dsonar.pullrequest.key="$PR_ID" \
-Dsonar.pullrequest.branch="$HEADREF" \
-Dsonar.pullrequest.base=main \
-Dsonar.sources=. \
-Dsonar.projectBaseDir=/home/runner/work/cloudstack/cloudstack \
-Dsonar.java.binaries=/home/runner/work/cloudstack/cloudstack/target/classes \
-Dsonar.exclusions=**/*.js
- uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
with:
files: ./client/target/site/jacoco-aggregate/jacoco.xml
Expand All @@ -69,18 +79,24 @@ jobs:
id: grade
run: bash scripts/coverage-grade.sh client/target/site/jacoco-aggregate/jacoco.xml
- name: Post Coverage Grade Comment on PR
if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository && steps.grade.outputs.coverage_grade != ''
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const grade = '${{ steps.grade.outputs.coverage_grade }}';
const label = '${{ steps.grade.outputs.coverage_grade_label }}';
const linePct = '${{ steps.grade.outputs.line_coverage }}';
const branchPct = '${{ steps.grade.outputs.branch_coverage }}';
const grade = '${{ steps.grade.outputs.coverage_grade || 'N/A' }}';
const label = '${{ steps.grade.outputs.coverage_grade_label || 'Unknown' }}';
const linePct = '${{ steps.grade.outputs.line_coverage || 'N/A' }}';
const branchPct = '${{ steps.grade.outputs.branch_coverage || 'N/A' }}';
const emojiMap = { A: '🟢', B: '🟡', C: '🟠', D: '🔴', F: '⛔' };
const emoji = emojiMap[grade] ?? '❓';
const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;

if (!grade || grade === 'N/A') {
console.log('Coverage grade not available, skipping comment');
return;
}

const branchRow = branchPct !== 'N/A'
? `| Branch coverage | **${branchPct}%** |`
: '';
Expand Down
18 changes: 18 additions & 0 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,24 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${cs.junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${cs.junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${cs.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
Expand Down
Loading