10000 fix: minor fixes (#802) · Sgitario/java-operator-sdk@59be5c4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 59be5c4

Browse files
metacosmmetacosm
authored
fix: minor fixes (operator-framework#802)
* fix: e2e test name * fix: missing javadoc * fix: typo + javadoc * fix: simplify assertion * fix: avoid type masking
1 parent 6277c1c commit 59be5c4

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎.github/workflows/e2e-test-mysql.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ on:
77
push:
88
branches:
99
- main
10-
jobs:
11-
tomcat_e2e_test:
12-
runs-on: ubuntu-latest
13-
env:
14-
KIND_CL_NAME: e2e-test
15-
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v2
10+
jobs:
11+
mysql_e2e_test:
12+
runs-on: ubuntu-latest
13+
env:
14+
KIND_CL_NAME: e2e-test
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
1818

19-
- name: clean resident local docker
20-
if: ${{ env.ACT }}
21-
continue-on-error: true
19+
- name: clean resident local docker
20+
if: ${{ env.ACT }}
21+
continue-on-error: true
2222
run: |
2323
for DIMG in "$KIND_CL_NAME-control-plane "; do
2424
docker stop $DIMG ; docker rm $DIMG ;

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ default boolean useFinalizer() {
106106
/**
107107
* Allow controllers to filter events before they are provided to the
108108
* {@link io.javaoperatorsdk.operator.processing.event.EventHandler}. Note that the provided
109-
* filter is combined with {@link #isGenerationAware()} to compute the final set of fiolters that
109+
* filter is combined with {@link #isGenerationAware()} to compute the final set of filters that
110110
* should be applied;
111111
*
112112
* @return filter

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ErrorStatusHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public interface ErrorStatusHandler<T extends HasMetadata> {
2121
* should not be updates on custom resource after it is marked for deletion.
2222
*
2323
* @param resource to update the status on
24-
* @param retryInfo
24+
* @param retryInfo the current retry status
2525
* @param e exception thrown from the reconciler
2626
* @return the updated resource
2727
*/

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventSourceManagerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ void retrievingAnEventSourceWhenMultipleAreRegisteredForATypeShouldRequireAQuali
133133
assertTrue(exception.getMessage().contains("name1"));
134134
assertTrue(exception.getMessage().contains("name2"));
135135

136-
assertTrue(manager.getResourceEventSourceFor(TestCustomResource.class, "name2").get()
137-
.equals(eventSource2));
138-
assertTrue(manager.getResourceEventSourceFor(TestCustomResource.class, "name1").get()
139-
.equals(eventSource));
136+
assertEquals(manager.getResourceEventSourceFor(TestCustomResource.class, "name2").get(),
137+
eventSource2);
138+
assertEquals(manager.getResourceEventSourceFor(TestCustomResource.class, "name1").get(),
139+
eventSource);
140140
}
141141

142142
@Test

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private <R extends HasMetadata> ReconciliationDispatcher<R> init(R customResourc
8383
when(configService.getResourceCloner()).thenReturn(new Cloner() {
8484
@Override
8585

86-
public <R extends HasMetadata> R clone(R object) {
86+
public <T extends HasMetadata> T clone(T object) {
8787
return object;
8888
}
8989
});

‎operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/AccumulativeMappingWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public AccumulativeMappingWriter add(String key, String value) {
5555
}
5656

5757
/**
58-
* Generates or overrise the resource file with the given path
59-
* ({@linkAccumulativeMappingWriter#resourcePath})
58+
* Generates or override the resource file with the given path
59+
* ({@link AccumulativeMappingWriter#resourcePath})
6060
*/
6161
public void flush() {
6262
PrintWriter printWriter = null;

0 commit comments

Comments
 (0)
0