Get rid of unnecessary api package in approval tests for crd-generator

fabric8io · Apr 27, 2024 · 8d98cb8 · 8d98cb8
1 parent b948114
commit 8d98cb8
Show file tree

Hide file tree

Showing 33 changed files with 45 additions and 45 deletions.
diff --git a/...or/api/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java b/...or/api/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java
@@ -17,13 +17,13 @@
 
 import io.fabric8.crd.generator.CRDGenerator;
 import io.fabric8.crd.generator.CRDInfo;
-import io.fabric8.crd.generator.approvaltests.annotated.api.Annotated;
-import io.fabric8.crd.generator.approvaltests.complex.api.Complex;
-import io.fabric8.crd.generator.approvaltests.inherited.api.Child;
-import io.fabric8.crd.generator.approvaltests.json.api.ContainingJson;
-import io.fabric8.crd.generator.approvaltests.k8svalidation.api.K8sValidation;
-import io.fabric8.crd.generator.approvaltests.map.api.ContainingMaps;
-import io.fabric8.crd.generator.approvaltests.nocyclic.api.NoCyclic;
+import io.fabric8.crd.generator.approvaltests.annotated.Annotated;
+import io.fabric8.crd.generator.approvaltests.complex.Complex;
+import io.fabric8.crd.generator.approvaltests.inherited.Child;
+import io.fabric8.crd.generator.approvaltests.json.ContainingJson;
+import io.fabric8.crd.generator.approvaltests.k8svalidation.K8sValidation;
+import io.fabric8.crd.generator.approvaltests.map.ContainingMaps;
+import io.fabric8.crd.generator.approvaltests.nocyclic.NoCyclic;
 import io.fabric8.kubernetes.client.CustomResource;
 import org.approvaltests.Approvals;
 import org.junit.jupiter.api.io.TempDir;
@@ -83,8 +83,8 @@ static Stream<Arguments> crdApprovalTests() {
         cases.add(new TestCase("k8svalidations.samples.fabric8.io", crdVersion, parallel, K8sValidation.class));
         cases.add(new TestCase("containingmaps.sample.fabric8.io", crdVersion, parallel, ContainingMaps.class));
         cases.add(new TestCase("multiples.sample.fabric8.io", crdVersion, parallel,
-            io.fabric8.crd.generator.approvaltests.multipleversions.api.v1.Multiple.class,
-            io.fabric8.crd.generator.approvaltests.multipleversions.api.v2.Multiple.class));
+            io.fabric8.crd.generator.approvaltests.multipleversions.v1.Multiple.class,
+            io.fabric8.crd.generator.approvaltests.multipleversions.v2.Multiple.class));
         cases.add(new TestCase("nocyclics.sample.fabric8.io", crdVersion, parallel, NoCyclic.class));
       }
     }

diff --git a/...pprovaltests/annotated/api/Annotated.java → ...or/approvaltests/annotated/Annotated.java b/...pprovaltests/annotated/api/Annotated.java → ...or/approvaltests/annotated/Annotated.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.annotated.api;
+package io.fabric8.crd.generator.approvaltests.annotated;
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/...valtests/annotated/api/AnnotatedSpec.java → ...pprovaltests/annotated/AnnotatedSpec.java b/...valtests/annotated/api/AnnotatedSpec.java → ...pprovaltests/annotated/AnnotatedSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.annotated.api;
+package io.fabric8.crd.generator.approvaltests.annotated;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...or/approvaltests/complex/api/Complex.java → ...erator/approvaltests/complex/Complex.java b/...or/approvaltests/complex/api/Complex.java → ...erator/approvaltests/complex/Complex.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api;
+package io.fabric8.crd.generator.approvaltests.complex;
 
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.CustomResource;

diff --git a/...pprovaltests/complex/api/ComplexSpec.java → ...or/approvaltests/complex/ComplexSpec.java b/...pprovaltests/complex/api/ComplexSpec.java → ...or/approvaltests/complex/ComplexSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api;
+package io.fabric8.crd.generator.approvaltests.complex;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...rovaltests/complex/api/ComplexStatus.java → .../approvaltests/complex/ComplexStatus.java b/...rovaltests/complex/api/ComplexStatus.java → .../approvaltests/complex/ComplexStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api;
+package io.fabric8.crd.generator.approvaltests.complex;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.fabric8.crd.generator.annotation.PrinterColumn;

diff --git a/...sts/complex/api/ServiceConfiguration.java → ...altests/complex/ServiceConfiguration.java b/...sts/complex/api/ServiceConfiguration.java → ...altests/complex/ServiceConfiguration.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api;
+package io.fabric8.crd.generator.approvaltests.complex;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import io.fabric8.crd.generator.approvaltests.complex.api.k8s.ObjectMeta;
-import io.fabric8.crd.generator.approvaltests.complex.api.k8s.ServiceSpec;
+import io.fabric8.crd.generator.approvaltests.complex.k8s.ObjectMeta;
+import io.fabric8.crd.generator.approvaltests.complex.k8s.ServiceSpec;
 import io.fabric8.generator.annotation.Nullable;
 
 @SuppressWarnings("LombokGetterMayBeUsed")

diff --git a/...complex/api/StatefulSetConfiguration.java → ...sts/complex/StatefulSetConfiguration.java b/...complex/api/StatefulSetConfiguration.java → ...sts/complex/StatefulSetConfiguration.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api;
+package io.fabric8.crd.generator.approvaltests.complex;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import io.fabric8.crd.generator.approvaltests.complex.api.k8s.ObjectMeta;
-import io.fabric8.crd.generator.approvaltests.complex.api.k8s.StatefulSetSpec;
+import io.fabric8.crd.generator.approvaltests.complex.k8s.ObjectMeta;
+import io.fabric8.crd.generator.approvaltests.complex.k8s.StatefulSetSpec;
 
 @SuppressWarnings("LombokGetterMayBeUsed")
 public class StatefulSetConfiguration {

diff --git a/...ovaltests/complex/api/k8s/ObjectMeta.java → ...approvaltests/complex/k8s/ObjectMeta.java b/...ovaltests/complex/api/k8s/ObjectMeta.java → ...approvaltests/complex/k8s/ObjectMeta.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api.k8s;
+package io.fabric8.crd.generator.approvaltests.complex.k8s;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...valtests/complex/api/k8s/ServiceSpec.java → ...pprovaltests/complex/k8s/ServiceSpec.java b/...valtests/complex/api/k8s/ServiceSpec.java → ...pprovaltests/complex/k8s/ServiceSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api.k8s;
+package io.fabric8.crd.generator.approvaltests.complex.k8s;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...ests/complex/api/k8s/StatefulSetSpec.java → ...valtests/complex/k8s/StatefulSetSpec.java b/...ests/complex/api/k8s/StatefulSetSpec.java → ...valtests/complex/k8s/StatefulSetSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.complex.api.k8s;
+package io.fabric8.crd.generator.approvaltests.complex.k8s;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...tor/approvaltests/inherited/api/Base.java → ...nerator/approvaltests/inherited/Base.java b/...tor/approvaltests/inherited/api/Base.java → ...nerator/approvaltests/inherited/Base.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.inherited.api;
+package io.fabric8.crd.generator.approvaltests.inherited;
 
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.CustomResource;

diff --git a/...approvaltests/inherited/api/BaseSpec.java → ...tor/approvaltests/inherited/BaseSpec.java b/...approvaltests/inherited/api/BaseSpec.java → ...tor/approvaltests/inherited/BaseSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.inherited.api;
+package io.fabric8.crd.generator.approvaltests.inherited;
 
 public class BaseSpec {
   private int baseInt;

diff --git a/...provaltests/inherited/api/BaseStatus.java → ...r/approvaltests/inherited/BaseStatus.java b/...provaltests/inherited/api/BaseStatus.java → ...r/approvaltests/inherited/BaseStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.inherited.api;
+package io.fabric8.crd.generator.approvaltests.inherited;
 
 /**
  * @author <a href="claprun@redhat.com">Christophe Laprun</a>

diff --git a/...or/approvaltests/inherited/api/Child.java → ...erator/approvaltests/inherited/Child.java b/...or/approvaltests/inherited/api/Child.java → ...erator/approvaltests/inherited/Child.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.inherited.api;
+package io.fabric8.crd.generator.approvaltests.inherited;
 
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/...pprovaltests/inherited/api/ChildSpec.java → ...or/approvaltests/inherited/ChildSpec.java b/...pprovaltests/inherited/api/ChildSpec.java → ...or/approvaltests/inherited/ChildSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.inherited.api;
+package io.fabric8.crd.generator.approvaltests.inherited;
 
 import java.util.Map;
 

diff --git a/...rovaltests/inherited/api/ChildStatus.java → .../approvaltests/inherited/ChildStatus.java b/...rovaltests/inherited/api/ChildStatus.java → .../approvaltests/inherited/ChildStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.inherited.api;
+package io.fabric8.crd.generator.approvaltests.inherited;
 
 /**
  * @author <a href="claprun@redhat.com">Christophe Laprun</a>

diff --git a/...pprovaltests/json/api/ContainingJson.java → ...or/approvaltests/json/ContainingJson.java b/...pprovaltests/json/api/ContainingJson.java → ...or/approvaltests/json/ContainingJson.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.json.api;
+package io.fabric8.crd.generator.approvaltests.json;
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/...valtests/json/api/ContainingJsonSpec.java → ...pprovaltests/json/ContainingJsonSpec.java b/...valtests/json/api/ContainingJsonSpec.java → ...pprovaltests/json/ContainingJsonSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.json.api;
+package io.fabric8.crd.generator.approvaltests.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

diff --git a/...generator/approvaltests/json/api/Foo.java → ...crd/generator/approvaltests/json/Foo.java b/...generator/approvaltests/json/api/Foo.java → ...crd/generator/approvaltests/json/Foo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.json.api;
+package io.fabric8.crd.generator.approvaltests.json;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...ests/k8svalidation/api/K8sValidation.java → ...valtests/k8svalidation/K8sValidation.java b/...ests/k8svalidation/api/K8sValidation.java → ...valtests/k8svalidation/K8sValidation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.k8svalidation.api;
+package io.fabric8.crd.generator.approvaltests.k8svalidation;
 
 import io.fabric8.generator.annotation.ValidationRule;
 import io.fabric8.kubernetes.client.CustomResource;

diff --git a/.../k8svalidation/api/K8sValidationSpec.java → ...ests/k8svalidation/K8sValidationSpec.java b/.../k8svalidation/api/K8sValidationSpec.java → ...ests/k8svalidation/K8sValidationSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.k8svalidation.api;
+package io.fabric8.crd.generator.approvaltests.k8svalidation;
 
 import io.fabric8.generator.annotation.Required;
 import io.fabric8.generator.annotation.ValidationRule;

diff --git a/...8svalidation/api/K8sValidationStatus.java → ...ts/k8svalidation/K8sValidationStatus.java b/...8svalidation/api/K8sValidationStatus.java → ...ts/k8svalidation/K8sValidationStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.k8svalidation.api;
+package io.fabric8.crd.generator.approvaltests.k8svalidation;
 
 public class K8sValidationStatus {
   Integer availableReplicas;

diff --git a/...approvaltests/map/api/ContainingMaps.java → ...tor/approvaltests/map/ContainingMaps.java b/...approvaltests/map/api/ContainingMaps.java → ...tor/approvaltests/map/ContainingMaps.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.map.api;
+package io.fabric8.crd.generator.approvaltests.map;
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/...ovaltests/map/api/ContainingMapsSpec.java → ...approvaltests/map/ContainingMapsSpec.java b/...ovaltests/map/api/ContainingMapsSpec.java → ...approvaltests/map/ContainingMapsSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.map.api;
+package io.fabric8.crd.generator.approvaltests.map;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...sts/multipleversions/api/v1/Multiple.java → ...altests/multipleversions/v1/Multiple.java b/...sts/multipleversions/api/v1/Multiple.java → ...altests/multipleversions/v1/Multiple.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.multipleversions.api.v1;
+package io.fabric8.crd.generator.approvaltests.multipleversions.v1;
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/...multipleversions/api/v1/MultipleSpec.java → ...sts/multipleversions/v1/MultipleSpec.java b/...multipleversions/api/v1/MultipleSpec.java → ...sts/multipleversions/v1/MultipleSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.multipleversions.api.v1;
+package io.fabric8.crd.generator.approvaltests.multipleversions.v1;
 
 public class MultipleSpec {
   private String v1;

diff --git a/...sts/multipleversions/api/v2/Multiple.java → ...altests/multipleversions/v2/Multiple.java b/...sts/multipleversions/api/v2/Multiple.java → ...altests/multipleversions/v2/Multiple.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.multipleversions.api.v2;
+package io.fabric8.crd.generator.approvaltests.multipleversions.v2;
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/...multipleversions/api/v2/MultipleSpec.java → ...sts/multipleversions/v2/MultipleSpec.java b/...multipleversions/api/v2/MultipleSpec.java → ...sts/multipleversions/v2/MultipleSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.multipleversions.api.v2;
+package io.fabric8.crd.generator.approvaltests.multipleversions.v2;
 
 public class MultipleSpec {
   private String v2;

diff --git a/.../approvaltests/nocyclic/api/NoCyclic.java → ...ator/approvaltests/nocyclic/NoCyclic.java b/.../approvaltests/nocyclic/api/NoCyclic.java → ...ator/approvaltests/nocyclic/NoCyclic.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.nocyclic.api;
+package io.fabric8.crd.generator.approvaltests.nocyclic;
 
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.CustomResource;

diff --git a/...rovaltests/nocyclic/api/NoCyclicSpec.java → .../approvaltests/nocyclic/NoCyclicSpec.java b/...rovaltests/nocyclic/api/NoCyclicSpec.java → .../approvaltests/nocyclic/NoCyclicSpec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.nocyclic.api;
+package io.fabric8.crd.generator.approvaltests.nocyclic;
 
 public class NoCyclicSpec {
   private Ref ref1;

diff --git a/...valtests/nocyclic/api/NoCyclicStatus.java → ...pprovaltests/nocyclic/NoCyclicStatus.java b/...valtests/nocyclic/api/NoCyclicStatus.java → ...pprovaltests/nocyclic/NoCyclicStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.nocyclic.api;
+package io.fabric8.crd.generator.approvaltests.nocyclic;
 
 public class NoCyclicStatus {
   private String message;

diff --git a/...rator/approvaltests/nocyclic/api/Ref.java → ...generator/approvaltests/nocyclic/Ref.java b/...rator/approvaltests/nocyclic/api/Ref.java → ...generator/approvaltests/nocyclic/Ref.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.crd.generator.approvaltests.nocyclic.api;
+package io.fabric8.crd.generator.approvaltests.nocyclic;
 
 public class Ref {