Repository navigation
Clean up and simplify GOP dependencies - #582
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The loaded version resource retains a trailing newline, causing an extra blank line in application output.
Pull request overview
This pull request reduces the GOP dependency footprint by replacing external utilities and clients with JDK, project-local, and Fabric8 alternatives.
Changes:
- Removes obsolete test and version-generation dependencies.
- Adds local polling and injectable environment access.
- Consolidates Kubernetes access on Fabric8.
- Moves version metadata to a filtered resource.
File summaries
| File | Summary |
|---|---|
src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Configures Mockito subclass mocking. |
src/test/java/com/cloudogu/gitops/tools/core/scmmanager/ScmManagerSetupTest.java |
Uses concrete Retrofit error responses. |
src/test/java/com/cloudogu/gitops/tools/core/argocd/ArgoCDConfigurationTest.java |
Removes environment stubbing. |
src/test/java/com/cloudogu/gitops/integration/tools/MonitoringTestIT.java |
Migrates Kubernetes checks to Fabric8. |
src/test/java/com/cloudogu/gitops/integration/tools/KubernetesApiTestSetup.java |
Uses local polling support. |
src/test/java/com/cloudogu/gitops/integration/TestK8sHelper.java |
Replaces Awaitility polling. |
src/test/java/com/cloudogu/gitops/integration/profiles/PrefixProfileTestIT.java |
Updates integration timeout handling. |
src/test/java/com/cloudogu/gitops/integration/profiles/PetclinicProfileTestIT.java |
Updates integration timeout handling. |
src/test/java/com/cloudogu/gitops/integration/profiles/MandantProfileTestIT.java |
Replaces Awaitility polling. |
src/test/java/com/cloudogu/gitops/integration/profiles/ArgoCDOperatorProfileTestIT.java |
Replaces Awaitility polling. |
src/test/java/com/cloudogu/gitops/integration/PollingTest.java |
Tests local polling behavior. |
src/test/java/com/cloudogu/gitops/integration/Polling.java |
Adds local polling implementation. |
src/test/java/com/cloudogu/gitops/infrastructure/kubernetes/api/K8sClientTest.java |
Tests generic Fabric8 resources. |
src/test/java/com/cloudogu/gitops/dependencyinjection/okhttp/RetryInterceptorTest.java |
Tests timeout retries with direct mocks. |
src/test/java/com/cloudogu/gitops/cli/VersionTest.java |
Verifies filtered version metadata. |
src/test/java/com/cloudogu/gitops/cli/ApplicationConfiguratorTest.java |
Tests injected environment access and precedence. |
src/test/java/com/cloudogu/gitops/application/content/ContentLoaderTest.java |
Uses a test subclass instead of Jenkins mocking. |
src/main/version/version-name.txt |
Defines the filtered version resource. |
src/main/java/com/cloudogu/gitops/infrastructure/kubernetes/api/K8sClient.java |
Uses generic Fabric8 resources for OpenShift projects. |
src/main/java/com/cloudogu/gitops/cli/Version.java |
Loads version metadata; the trailing resource newline needs trimming. |
src/main/java/com/cloudogu/gitops/cli/package-info.java |
Removes obsolete version metadata. |
src/main/java/com/cloudogu/gitops/cli/ApplicationConfigurator.java |
Adds injectable environment lookup. |
pom.xml |
Removes dependencies and configures resource filtering and Mockito. |
Review details
Suppressed comments (1)
src/main/java/com/cloudogu/gitops/cli/Version.java:22
- The filtered resource is a text file with an end-of-file newline, so this returns
Version.NAMEwith a trailing line break.createVersionOutput()appends that value to the application name and logs it, producing an extra blank line compared with the previous generated constant; trim only the resource terminator when loading it.
return new String(input.readAllBytes(), StandardCharsets.UTF_8);
- Files reviewed: 23/23 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
ThomasMichael1811
approved these changes
Sep 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reduces the GOP dependency footprint and replaces problematic or unnecessary dependencies with approved or project-local alternatives.
Changes
byte-buddy-agentand Hamcrestwiremock-jetty12withwiremock-standaloneversionNameannotation processor and JavaPoetVerification
./mvnw clean verifysucceeds