Skip to content

Commit 39f94ca

Browse files
authored
Merge pull request #227 from halkyonio/fix-spring-package
fix: rename spingboot package to springboot
2 parents 5d732c8 + 13ce667 commit 39f94ca

File tree

10 files changed

+24
-22
lines changed

10 files changed

+24
-22
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter;
1+
package io.javaoperatorsdk.operator.springboot.starter;
2+
3+
import java.util.List;
24

3-
import io.javaoperatorsdk.operator.Operator;
4-
import io.javaoperatorsdk.operator.api.ResourceController;
5-
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
6-
import io.javaoperatorsdk.operator.processing.retry.Retry;
75
import io.fabric8.kubernetes.client.ConfigBuilder;
86
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
97
import io.fabric8.kubernetes.client.KubernetesClient;
108
import io.fabric8.openshift.client.DefaultOpenShiftClient;
9+
import io.javaoperatorsdk.operator.Operator;
10+
import io.javaoperatorsdk.operator.api.ResourceController;
11+
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
12+
import io.javaoperatorsdk.operator.processing.retry.Retry;
1113
import org.apache.commons.lang3.StringUtils;
1214
import org.slf4j.Logger;
1315
import org.slf4j.LoggerFactory;
@@ -16,8 +18,6 @@
1618
import org.springframework.context.annotation.Bean;
1719
import org.springframework.context.annotation.Configuration;
1820

19-
import java.util.List;
20-
2121
@Configuration
2222
@EnableConfigurationProperties({OperatorProperties.class, RetryProperties.class})
2323
public class OperatorAutoConfiguration {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter;
1+
package io.javaoperatorsdk.operator.springboot.starter;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/RetryProperties.java renamed to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/RetryProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter;
1+
package io.javaoperatorsdk.operator.springboot.starter;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2-
io.javaoperatorsdk.operator.spingboot.starter.OperatorAutoConfiguration
2+
io.javaoperatorsdk.operator.springboot.starter.OperatorAutoConfiguration
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter;
1+
package io.javaoperatorsdk.operator.springboot.starter;
22

3+
import java.util.List;
4+
5+
import io.fabric8.kubernetes.client.KubernetesClient;
36
import io.javaoperatorsdk.operator.Operator;
47
import io.javaoperatorsdk.operator.api.ResourceController;
5-
import io.fabric8.kubernetes.client.KubernetesClient;
68
import org.junit.jupiter.api.Test;
79
import org.junit.jupiter.api.extension.ExtendWith;
810
import org.springframework.beans.factory.annotation.Autowired;
911
import org.springframework.boot.test.context.SpringBootTest;
1012
import org.springframework.boot.test.mock.mockito.MockBean;
1113
import org.springframework.test.context.junit.jupiter.SpringExtension;
1214

13-
import java.util.List;
14-
15-
import static org.junit.jupiter.api.Assertions.*;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertNotNull;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
1618

1719
@ExtendWith(SpringExtension.class)
1820
@SpringBootTest

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestApplication.java renamed to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter;
1+
package io.javaoperatorsdk.operator.springboot.starter;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestController.java renamed to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter;
1+
package io.javaoperatorsdk.operator.springboot.starter;
22

3+
import io.fabric8.kubernetes.client.CustomResource;
34
import io.javaoperatorsdk.operator.api.Context;
45
import io.javaoperatorsdk.operator.api.Controller;
56
import io.javaoperatorsdk.operator.api.ResourceController;
67
import io.javaoperatorsdk.operator.api.UpdateControl;
7-
import io.javaoperatorsdk.operator.spingboot.starter.model.TestResource;
8-
import io.fabric8.kubernetes.client.CustomResource;
8+
import io.javaoperatorsdk.operator.springboot.starter.model.TestResource;
99
import org.springframework.stereotype.Component;
1010

1111
@Component
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter.model;
1+
package io.javaoperatorsdk.operator.springboot.starter.model;
22

33
import io.fabric8.kubernetes.client.CustomResource;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter.model;
1+
package io.javaoperatorsdk.operator.springboot.starter.model;
22

33
import io.fabric8.kubernetes.api.builder.Function;
44
import io.fabric8.kubernetes.client.CustomResourceDoneable;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.spingboot.starter.model;
1+
package io.javaoperatorsdk.operator.springboot.starter.model;
22

33
import io.fabric8.kubernetes.client.CustomResourceList;
44

0 commit comments

Comments
 (0)