Skip to content

Commit 85c466f

Browse files
committed
refactor: move classes back to their previous spot
1 parent 465b53f commit 85c466f

File tree

30 files changed

+31
-36
lines changed

30 files changed

+31
-36
lines changed

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ControllerUtils.java renamed to operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package io.javaoperatorsdk.operator.api;
1+
package io.javaoperatorsdk.operator;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4+
import io.javaoperatorsdk.operator.api.ResourceController;
45
import java.util.Locale;
56

67
public class ControllerUtils {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.javaoperatorsdk.operator;
22

33
import io.fabric8.kubernetes.client.Watcher;
4-
import io.javaoperatorsdk.operator.api.Event;
4+
import io.javaoperatorsdk.operator.processing.event.Event;
55
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
66
import java.util.List;
77

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Context.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4+
import io.javaoperatorsdk.operator.processing.event.EventList;
5+
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
46
import java.util.Optional;
57

68
public interface Context<T extends CustomResource> {

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4+
import io.javaoperatorsdk.operator.processing.event.EventList;
5+
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
46
import java.util.Optional;
57

68
public class DefaultContext<T extends CustomResource> implements Context<T> {

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4+
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
45
import java.util.Locale;
56

67
public interface ResourceController<R extends CustomResource> {

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
66

77
import io.fabric8.kubernetes.client.CustomResource;
8-
import io.javaoperatorsdk.operator.api.Event;
9-
import io.javaoperatorsdk.operator.api.EventHandler;
108
import io.javaoperatorsdk.operator.api.RetryInfo;
119
import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
10+
import io.javaoperatorsdk.operator.processing.event.Event;
11+
import io.javaoperatorsdk.operator.processing.event.EventHandler;
1212
import io.javaoperatorsdk.operator.processing.retry.Retry;
1313
import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
1414
import java.util.HashMap;

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventBuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.javaoperatorsdk.operator.processing;
22

3-
import io.javaoperatorsdk.operator.api.Event;
3+
import io.javaoperatorsdk.operator.processing.event.Event;
44
import java.util.ArrayList;
55
import java.util.Collections;
66
import java.util.HashMap;

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import io.fabric8.kubernetes.client.CustomResource;
99
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1010
import io.fabric8.kubernetes.client.dsl.Resource;
11+
import io.javaoperatorsdk.operator.ControllerUtils;
1112
import io.javaoperatorsdk.operator.api.Context;
12-
import io.javaoperatorsdk.operator.api.ControllerUtils;
1313
import io.javaoperatorsdk.operator.api.DefaultContext;
1414
import io.javaoperatorsdk.operator.api.DeleteControl;
15-
import io.javaoperatorsdk.operator.api.EventList;
16-
import io.javaoperatorsdk.operator.api.EventSourceManager;
1715
import io.javaoperatorsdk.operator.api.ResourceController;
1816
import io.javaoperatorsdk.operator.api.UpdateControl;
17+
import io.javaoperatorsdk.operator.processing.event.EventList;
18+
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
1919
import java.util.ArrayList;
2020
import org.slf4j.Logger;
2121
import org.slf4j.LoggerFactory;

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ExecutionScope.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.javaoperatorsdk.operator.processing;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4-
import io.javaoperatorsdk.operator.api.Event;
54
import io.javaoperatorsdk.operator.api.RetryInfo;
5+
import io.javaoperatorsdk.operator.processing.event.Event;
66
import java.util.List;
77

88
public class ExecutionScope {

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/AbstractEvent.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package io.javaoperatorsdk.operator.processing.event;
22

3-
import io.javaoperatorsdk.operator.api.Event;
4-
import io.javaoperatorsdk.operator.api.EventSource;
5-
63
public abstract class AbstractEvent implements Event {
74

85
private final String relatedCustomResourceUid;

0 commit comments

Comments
 (0)