Skip to content

Commit cfbbac3

Browse files
csviricsviri
authored
Merge pull request #248 from psycho-ir/setup-code-formatter
Setup code formatter
2 parents b2971d6 + ba4a955 commit cfbbac3

File tree

108 files changed

+4170
-3808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+4170
-3808
lines changed

‎.github/workflows/pr.yml

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
uses: actions/setup-java@v1
2222
with:
2323
java-version: ${{ matrix.java }}
24+
- name: Check code format
25+
run: mvn fmt:check --file pom.xml
2426
- name: Run unit tests
2527
run: mvn -B test -P no-integration-tests --file pom.xml
2628
- name: Set up Minikube

‎operator-framework/src/main/java/io/javaoperatorsdk/operator/ClassMappingProvider.java

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
package io.javaoperatorsdk.operator;
22

3-
import org.apache.commons.lang3.ClassUtils;
4-
import org.slf4j.Logger;
5-
import org.slf4j.LoggerFactory;
6-
73
import java.io.BufferedReader;
84
import java.io.IOException;
95
import java.io.InputStreamReader;
106
import java.net.URL;
117
import java.util.*;
128
import java.util.stream.Collectors;
13-
9+
import org.apache.commons.lang3.ClassUtils;
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
1412

1513
class ClassMappingProvider {
16-
private static final Logger log = LoggerFactory.getLogger(ClassMappingProvider.class);
17-
18-
static <T, V> Map<T, V> provide(final String resourcePath, T key, V value) {
19-
Map<T, V> result = new HashMap();
20-
try {
21-
final var classLoader = Thread.currentThread().getContextClassLoader();
22-
final Enumeration<URL> customResourcesMetadataList = classLoader.getResources(resourcePath);
23-
for (Iterator<URL> it = customResourcesMetadataList.asIterator(); it.hasNext(); ) {
24-
URL url = it.next();
25-
26-
List<String> classNamePairs = retrieveClassNamePairs(url);
27-
classNamePairs.forEach(clazzPair -> {
28-
try {
29-
final String[] classNames = clazzPair.split(",");
30-
if (classNames.length != 2) {
31-
throw new IllegalStateException(String.format("%s is not valid Mapping metadata, defined in %s", clazzPair, url.toString()));
32-
}
33-
34-
result.put(
35-
(T) ClassUtils.getClass(classNames[0]),
36-
(V) ClassUtils.getClass(classNames[1])
37-
);
38-
} catch (ClassNotFoundException e) {
39-
throw new RuntimeException(e);
40-
}
41-
});
42-
}
43-
log.debug("Loaded Controller to CustomResource mappings {}", result);
44-
return result;
45-
} catch (IOException e) {
46-
throw new RuntimeException(e);
47-
}
14+
private static final Logger log = LoggerFactory.getLogger(ClassMappingProvider.class);
15+
16+
static <T, V> Map<T, V> provide(final String resourcePath, T key, V value) {
17+
Map<T, V> result = new HashMap();
18+
try {
19+
final var classLoader = Thread.currentThread().getContextClassLoader();
20+
final Enumeration<URL> customResourcesMetadataList = classLoader.getResources(resourcePath);
21+
for (Iterator<URL> it = customResourcesMetadataList.asIterator(); it.hasNext(); ) {
22+
URL url = it.next();
23+
24+
List<String> classNamePairs = retrieveClassNamePairs(url);
25+
classNamePairs.forEach(
26+
clazzPair -> {
27+
try {
28+
final String[] classNames = clazzPair.split(",");
29+
if (classNames.length != 2) {
30+
throw new IllegalStateException(
31+
String.format(
32+
"%s is not valid Mapping metadata, defined in %s",
33+
clazzPair, url.toString()));
34+
}
35+
36+
result.put(
37+
(T) ClassUtils.getClass(classNames[0]), (V) ClassUtils.getClass(classNames[1]));
38+
} catch (ClassNotFoundException e) {
39+
throw new RuntimeException(e);
40+
}
41+
});
42+
}
43+
log.debug("Loaded Controller to CustomResource mappings {}", result);
44+
return result;
45+
} catch (IOException e) {
46+
throw new RuntimeException(e);
4847
}
48+
}
4949

50-
private static List<String> retrieveClassNamePairs(URL url) throws IOException {
51-
return new BufferedReader(
52-
new InputStreamReader(url.openStream())
53-
).lines().collect(Collectors.toList());
54-
}
50+
private static List<String> retrieveClassNamePairs(URL url) throws IOException {
51+
return new BufferedReader(new InputStreamReader(url.openStream()))
52+
.lines()
53+
.collect(Collectors.toList());
54+
}
5555
}

‎operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java

+57-57
Original file line numberDiff line numberDiff line change
@@ -4,76 +4,76 @@
44
import io.fabric8.kubernetes.client.CustomResourceDoneable;
55
import io.javaoperatorsdk.operator.api.Controller;
66
import io.javaoperatorsdk.operator.api.ResourceController;
7-
87
import java.util.Map;
98

10-
119
public class ControllerUtils {
1210

13-
private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
14-
public static final String CONTROLLERS_RESOURCE_PATH = "javaoperatorsdk/controllers";
15-
public static final String DONEABLES_RESOURCE_PATH = "javaoperatorsdk/doneables";
16-
private static Map<Class<? extends ResourceController>, Class<? extends CustomResource>> controllerToCustomResourceMappings;
17-
private static Map<Class<? extends CustomResource>, Class<? extends CustomResourceDoneable>> resourceToDoneableMappings;
11+
private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
12+
public static final String CONTROLLERS_RESOURCE_PATH = "javaoperatorsdk/controllers";
13+
public static final String DONEABLES_RESOURCE_PATH = "javaoperatorsdk/doneables";
14+
private static Map<Class<? extends ResourceController>, Class<? extends CustomResource>>
15+
controllerToCustomResourceMappings;
16+
private static Map<Class<? extends CustomResource>, Class<? extends CustomResourceDoneable>>
17+
resourceToDoneableMappings;
1818

19+
static {
20+
controllerToCustomResourceMappings =
21+
ClassMappingProvider.provide(
22+
CONTROLLERS_RESOURCE_PATH, ResourceController.class, CustomResource.class);
23+
resourceToDoneableMappings =
24+
ClassMappingProvider.provide(
25+
DONEABLES_RESOURCE_PATH, CustomResource.class, CustomResourceDoneable.class);
26+
}
1927

20-
static {
21-
controllerToCustomResourceMappings = ClassMappingProvider
22-
.provide(CONTROLLERS_RESOURCE_PATH,
23-
ResourceController.class,
24-
CustomResource.class);
25-
resourceToDoneableMappings = ClassMappingProvider
26-
.provide(DONEABLES_RESOURCE_PATH,
27-
CustomResource.class,
28-
CustomResourceDoneable.class
29-
);
30-
}
31-
32-
static String getFinalizer(ResourceController controller) {
33-
final String annotationFinalizerName = getAnnotation(controller).finalizerName();
34-
if (!Controller.NULL.equals(annotationFinalizerName)) {
35-
return annotationFinalizerName;
36-
}
37-
return getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
28+
static String getFinalizer(ResourceController controller) {
29+
final String annotationFinalizerName = getAnnotation(controller).finalizerName();
30+
if (!Controller.NULL.equals(annotationFinalizerName)) {
31+
return annotationFinalizerName;
3832
}
33+
return getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
34+
}
3935

40-
static boolean getGenerationEventProcessing(ResourceController<?> controller) {
41-
return getAnnotation(controller).generationAwareEventProcessing();
42-
}
36+
static boolean getGenerationEventProcessing(ResourceController<?> controller) {
37+
return getAnnotation(controller).generationAwareEventProcessing();
38+
}
4339

44-
static <R extends CustomResource> Class<R> getCustomResourceClass(ResourceController<R> controller) {
45-
final Class<? extends CustomResource> customResourceClass = controllerToCustomResourceMappings
46-
.get(controller.getClass());
47-
if (customResourceClass == null) {
48-
throw new IllegalArgumentException(
49-
String.format(
50-
"No custom resource has been found for controller %s",
51-
controller.getClass().getCanonicalName()
52-
)
53-
);
54-
}
55-
return (Class<R>) customResourceClass;
40+
static <R extends CustomResource> Class<R> getCustomResourceClass(
41+
ResourceController<R> controller) {
42+
final Class<? extends CustomResource> customResourceClass =
43+
controllerToCustomResourceMappings.get(controller.getClass());
44+
if (customResourceClass == null) {
45+
throw new IllegalArgumentException(
46+
String.format(
47+
"No custom resource has been found for controller %s",
48+
controller.getClass().getCanonicalName()));
5649
}
50+
return (Class<R>) customResourceClass;
51+
}
5752

58-
static String getCrdName(ResourceController controller) {
59-
return getAnnotation(controller).crdName();
60-
}
53+
static String getCrdName(ResourceController controller) {
54+
return getAnnotation(controller).crdName();
55+
}
6156

62-
public static <T extends CustomResource> Class<? extends CustomResourceDoneable<T>>
63-
getCustomResourceDoneableClass(ResourceController<T> controller) {
64-
final Class<T> customResourceClass = getCustomResourceClass(controller);
65-
final Class<? extends CustomResourceDoneable<T>> doneableClass = (Class<? extends CustomResourceDoneable<T>>) resourceToDoneableMappings.get(customResourceClass);
66-
if (doneableClass == null) {
67-
throw new RuntimeException(String.format("No matching Doneable class found for %s", customResourceClass));
68-
}
69-
return doneableClass;
57+
public static <T extends CustomResource>
58+
Class<? extends CustomResourceDoneable<T>> getCustomResourceDoneableClass(
59+
ResourceController<T> controller) {
60+
final Class<T> customResourceClass = getCustomResourceClass(controller);
61+
final Class<? extends CustomResourceDoneable<T>> doneableClass =
62+
(Class<? extends CustomResourceDoneable<T>>)
63+
resourceToDoneableMappings.get(customResourceClass);
64+
if (doneableClass == null) {
65+
throw new RuntimeException(
66+
String.format("No matching Doneable class found for %s", customResourceClass));
7067
}
68+
return doneableClass;
69+
}
7170

72-
private static Controller getAnnotation(ResourceController<?> controller) {
73-
return controller.getClass().getAnnotation(Controller.class);
74-
}
71+
private static Controller getAnnotation(ResourceController<?> controller) {
72+
return controller.getClass().getAnnotation(Controller.class);
73+
}
7574

76-
public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
77-
return resource.getMetadata().getFinalizers() != null && resource.getMetadata().getFinalizers().contains(finalizer);
78-
}
75+
public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
76+
return resource.getMetadata().getFinalizers() != null
77+
&& resource.getMetadata().getFinalizers().contains(finalizer);
78+
}
7979
}

‎operator-framework/src/main/java/io/javaoperatorsdk/operator/EventListUtils.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package io.javaoperatorsdk.operator;
22

3-
import io.fabric8.kubernetes.api.model.HasMetadata;
43
import io.fabric8.kubernetes.client.Watcher;
54
import io.javaoperatorsdk.operator.processing.event.Event;
65
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
7-
86
import java.util.List;
97

108
public class EventListUtils {
119

12-
public static boolean containsCustomResourceDeletedEvent(List<Event> events) {
13-
return events.stream().anyMatch(e -> {
14-
if (e instanceof CustomResourceEvent) {
10+
public static boolean containsCustomResourceDeletedEvent(List<Event> events) {
11+
return events.stream()
12+
.anyMatch(
13+
e -> {
14+
if (e instanceof CustomResourceEvent) {
1515
return ((CustomResourceEvent) e).getAction() == Watcher.Action.DELETED;
16-
} else {
16+
} else {
1717
return false;
18-
}
19-
});
20-
}
18+
}
19+
});
20+
}
2121
}

0 commit comments

Comments
 (0)