Keep ordering of classes and instances retrieved from ComponentBag

Signed-off-by: Jan Supol <[email protected]>

Author: jansupol

core-common/src/main/java/org/glassfish/jersey/model/internal/ComponentBag.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -588,7 +588,7 @@ public Set<Class<?>> getClasses(final Predicate<ContractProvider> filter) {
                               final ContractProvider model = getModel(input);
                               return filter.test(model);
                           })
-                          .collect(Collectors.toSet());
+                          .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     /**
@@ -607,7 +607,7 @@ public Set<Object> getInstances(final Predicate<ContractProvider> filter) {
                                 final ContractProvider model = getModel(input.getClass());
                                 return filter.test(model);
                             })
-                            .collect(Collectors.toSet());
+                            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     /**

tests/e2e-core-common/src/test/java/org/glassfish/jersey/tests/e2e/common/model/internal/CommonConfigTest.java

@@ -52,6 +52,7 @@
 import org.glassfish.jersey.model.internal.ManagedObjectsFinalizer;
 import org.glassfish.jersey.model.internal.RankedComparator;
 
+import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -1066,4 +1067,40 @@ private PriorityFeature3() {
         }
     }
 
+    // Binder ordering -------------------------------------------------------------------------
+
+    @Test
+    public void testBinderOrderingInGetClasses() {
+        config.register(ContractBinderOne.class).register(ContractBinderTwo.class).register(ContractBinder.class);
+
+        InjectionManager injectionManager = Injections.createInjectionManager();
+        ManagedObjectsFinalizer finalizer = new ManagedObjectsFinalizer(injectionManager);
+        config.configureMetaProviders(injectionManager, finalizer);
+
+        Object[] classes = config.getComponentBag().getClasses(contractProvider -> true).toArray();
+        Assert.assertEquals(classes[0], ContractBinderOne.class);
+        Assert.assertEquals(classes[1], ContractBinderTwo.class);
+        Assert.assertEquals(classes[2], ContractBinder.class);
+    }
+
+    @Test
+    public void testBinderOrderingInGetInstances() {
+        ContractBinder[] binders = {new ContractBinderOne(), new ContractBinderTwo(), new ContractBinder()};
+        config.register(binders[2]).register(binders[1]).register(binders[0]);
+
+        InjectionManager injectionManager = Injections.createInjectionManager();
+        ManagedObjectsFinalizer finalizer = new ManagedObjectsFinalizer(injectionManager);
+        config.configureMetaProviders(injectionManager, finalizer);
+
+        Object[] instances = config.getComponentBag().getInstances(contractProvider -> true).toArray();
+        Assert.assertEquals(instances[0], binders[2]);
+        Assert.assertEquals(instances[1], binders[1]);
+        Assert.assertEquals(instances[2], binders[0]);
+    }
+
+    public static class ContractBinderOne extends ContractBinder {
+    }
+
+    public static class ContractBinderTwo extends ContractBinder {
+    }
 }