fix #3628 removing sorting from lists and templates

fabric8io · Mar 1, 2022 · 21ee5fb · 21ee5fb
1 parent 3cb52b3
commit 21ee5fb
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 182 deletions.
diff --git a/doc/MIGRATION-v6.md b/doc/MIGRATION-v6.md
@@ -4,6 +4,7 @@
 - [API/Impl split](#api-impl-split)
 - [Deprecation Removals](#deprecation-removals)
 - [IntOrString changes](#intorstring-changes)
+- [Object sorting](#object-sorting)
 
 ## API/Impl split
 
@@ -64,3 +65,7 @@ We've removed setter methods `setIntVal`, `setKind`, `setStrVal` from the class.
   IntOrString i2 = new IntOrString("3000");
   String strValue = i2.getStrVal();
   ```
+
+## Object Sorting
+
+KubernetesList and Template will no longer automatically sort their objects by default.  You may use the HasMetadataComparator to sort the items as needed.
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/DryRunTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/DryRunTest.java
@@ -182,8 +182,8 @@ void testResourceListCreateOrReplace() throws IOException {
 
     // Then
     verify(mockClient, times(2)).send(any(), any());
-    assertRequest("POST", "/api/v1/namespaces/ns1/services", "dryRun=All");
-    assertRequest(1, "POST", "/api/v1/namespaces/ns1/pods", "dryRun=All");
+    assertRequest("POST", "/api/v1/namespaces/ns1/pods", "dryRun=All");
+    assertRequest(1, "POST", "/api/v1/namespaces/ns1/services", "dryRun=All");
   }
 
   @Test
@@ -197,8 +197,8 @@ void testResourceListDelete() throws IOException {
 
     // Then
     verify(mockClient, times(2)).send(any(), any());
-    assertRequest("DELETE", "/api/v1/namespaces/ns1/services/svc1", "dryRun=All");
-    assertRequest(1, "DELETE", "/api/v1/namespaces/ns1/pods/pod1", "dryRun=All");
+    assertRequest("DELETE", "/api/v1/namespaces/ns1/pods/pod1", "dryRun=All");
+    assertRequest(1, "DELETE", "/api/v1/namespaces/ns1/services/svc1", "dryRun=All");
   }
 
   private Pod getPod(String name) {

diff --git a/...r/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/...r/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
@@ -71,8 +71,6 @@ public String getApiVersion() {
 
     @Override
     public List<HasMetadata> getItems() {
-        List<HasMetadata> sortedItems = new ArrayList<>(super.getItems());
-        Collections.sort(sortedItems, new HasMetadataComparator());
-        return sortedItems;
+      return super.getItems();
     }
 }
diff --git a/kubernetes-model-generator/openshift-model/pom.xml b/kubernetes-model-generator/openshift-model/pom.xml
@@ -99,25 +99,6 @@
             <groupId>org.jsonschema2pojo</groupId>
             <artifactId>jsonschema2pojo-maven-plugin</artifactId>
           </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>generate-sources</phase>
-                <configuration>
-                  <target>
-                    <echo>Removing the duplicate generated class</echo>
-                    <delete
-                      file="${generate.targetDirectory}/io/fabric8/openshift/api/model/Template.java"
-                      verbose="true" />
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>