Skip to content

Commit 69c3332

Browse files
author
Soroosh Sarabadani
committed
format code
1 parent 86cf5fd commit 69c3332

File tree

106 files changed

+4126
-3780
lines changed

Some content is hidden

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

106 files changed

+4126
-3780
lines changed

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

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,61 @@
22

33
import io.fabric8.kubernetes.client.CustomResource;
44
import io.javaoperatorsdk.operator.api.ResourceController;
5-
import org.apache.commons.lang3.ClassUtils;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
8-
95
import java.io.BufferedReader;
106
import java.io.IOException;
117
import java.io.InputStreamReader;
128
import java.net.URL;
139
import java.util.*;
1410
import java.util.stream.Collectors;
15-
11+
import org.apache.commons.lang3.ClassUtils;
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1614

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

52-
private static List<String> retrieveClassNamePairs(URL url) throws IOException {
53-
return new BufferedReader(
54-
new InputStreamReader(url.openStream())
55-
).lines().collect(Collectors.toList());
56-
}
57+
private static List<String> retrieveClassNamePairs(URL url) throws IOException {
58+
return new BufferedReader(new InputStreamReader(url.openStream()))
59+
.lines()
60+
.collect(Collectors.toList());
61+
}
5762
}

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

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,69 @@
44
import io.fabric8.kubernetes.client.CustomResourceDoneable;
55
import io.javaoperatorsdk.operator.api.Controller;
66
import io.javaoperatorsdk.operator.api.ResourceController;
7-
import org.apache.commons.lang3.ClassUtils;
8-
97
import java.util.Map;
10-
8+
import org.apache.commons.lang3.ClassUtils;
119

1210
public class ControllerUtils {
1311

14-
private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
15-
public static final String CONTROLLERS_RESOURCE_PATH = "javaoperatorsdk/controllers";
16-
private static Map<Class<? extends ResourceController>, Class<? extends CustomResource>> controllerToCustomResourceMappings;
12+
private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
13+
public static final String CONTROLLERS_RESOURCE_PATH = "javaoperatorsdk/controllers";
14+
private static Map<Class<? extends ResourceController>, Class<? extends CustomResource>>
15+
controllerToCustomResourceMappings;
1716

18-
static {
19-
controllerToCustomResourceMappings =
20-
ControllerToCustomResourceMappingsProvider
21-
.provide(CONTROLLERS_RESOURCE_PATH);
22-
}
17+
static {
18+
controllerToCustomResourceMappings =
19+
ControllerToCustomResourceMappingsProvider.provide(CONTROLLERS_RESOURCE_PATH);
20+
}
2321

24-
static String getFinalizer(ResourceController controller) {
25-
final String annotationFinalizerName = getAnnotation(controller).finalizerName();
26-
if (!Controller.NULL.equals(annotationFinalizerName)) {
27-
return annotationFinalizerName;
28-
}
29-
return getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
22+
static String getFinalizer(ResourceController controller) {
23+
final String annotationFinalizerName = getAnnotation(controller).finalizerName();
24+
if (!Controller.NULL.equals(annotationFinalizerName)) {
25+
return annotationFinalizerName;
3026
}
27+
return getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
28+
}
3129

32-
static boolean getGenerationEventProcessing(ResourceController<?> controller) {
33-
return getAnnotation(controller).generationAwareEventProcessing();
34-
}
30+
static boolean getGenerationEventProcessing(ResourceController<?> controller) {
31+
return getAnnotation(controller).generationAwareEventProcessing();
32+
}
3533

36-
static <R extends CustomResource> Class<R> getCustomResourceClass(ResourceController<R> controller) {
37-
final Class<? extends CustomResource> customResourceClass = controllerToCustomResourceMappings
38-
.get(controller.getClass());
39-
if (customResourceClass == null) {
40-
throw new IllegalArgumentException(
41-
String.format(
42-
"No custom resource has been found for controller %s",
43-
controller.getClass().getCanonicalName()
44-
)
45-
);
46-
}
47-
return (Class<R>) customResourceClass;
34+
static <R extends CustomResource> Class<R> getCustomResourceClass(
35+
ResourceController<R> controller) {
36+
final Class<? extends CustomResource> customResourceClass =
37+
controllerToCustomResourceMappings.get(controller.getClass());
38+
if (customResourceClass == null) {
39+
throw new IllegalArgumentException(
40+
String.format(
41+
"No custom resource has been found for controller %s",
42+
controller.getClass().getCanonicalName()));
4843
}
44+
return (Class<R>) customResourceClass;
45+
}
4946

50-
static String getCrdName(ResourceController controller) {
51-
return getAnnotation(controller).crdName();
52-
}
47+
static String getCrdName(ResourceController controller) {
48+
return getAnnotation(controller).crdName();
49+
}
5350

54-
public static <T extends CustomResource> Class<? extends CustomResourceDoneable<T>>
55-
getCustomResourceDoneableClass(ResourceController<T> controller) {
56-
try {
57-
final Class<T> customResourceClass = getCustomResourceClass(controller);
58-
return (Class<? extends CustomResourceDoneable<T>>) ClassUtils.getClass(customResourceClass.getCanonicalName() + "Doneable");
59-
} catch (ClassNotFoundException e) {
60-
e.printStackTrace();
61-
return null;
62-
}
51+
public static <T extends CustomResource>
52+
Class<? extends CustomResourceDoneable<T>> getCustomResourceDoneableClass(
53+
ResourceController<T> controller) {
54+
try {
55+
final Class<T> customResourceClass = getCustomResourceClass(controller);
56+
return (Class<? extends CustomResourceDoneable<T>>)
57+
ClassUtils.getClass(customResourceClass.getCanonicalName() + "Doneable");
58+
} catch (ClassNotFoundException e) {
59+
e.printStackTrace();
60+
return null;
6361
}
62+
}
6463

65-
private static Controller getAnnotation(ResourceController<?> controller) {
66-
return controller.getClass().getAnnotation(Controller.class);
67-
}
64+
private static Controller getAnnotation(ResourceController<?> controller) {
65+
return controller.getClass().getAnnotation(Controller.class);
66+
}
6867

69-
public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
70-
return resource.getMetadata().getFinalizers() != null && resource.getMetadata().getFinalizers().contains(finalizer);
71-
}
68+
public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
69+
return resource.getMetadata().getFinalizers() != null
70+
&& resource.getMetadata().getFinalizers().contains(finalizer);
71+
}
7272
}

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

Lines changed: 9 additions & 9 deletions
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)