This is an automated email from the ASF dual-hosted git repository. stbischof pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 054b36097d779d8cdf5a266209eae79a0b551814 Author: Stefan Bischof <[email protected]> AuthorDate: Sat Apr 5 09:50:56 2025 +0200 [fw] Use Auto-Boxing Signed-off-by: Stefan Bischof <[email protected]> # Conflicts: # framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java --- .../java/org/apache/felix/framework/BundleWiringImplTest.java | 8 ++++---- .../test/java/org/apache/felix/framework/EventDispatcherTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java b/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java index 4d52bde338..beba3cf35a 100644 --- a/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java +++ b/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java @@ -94,7 +94,7 @@ public class BundleWiringImplTest Map<String, List<BundleRevision>> requiredPkgs = new HashMap<>(); when(mockRevisionImpl.getBundle()).thenReturn(mockBundle); - when(mockBundle.getBundleId()).thenReturn(Long.valueOf(1)); + when(mockBundle.getBundleId()).thenReturn(1L); bundleWiring = new BundleWiringImpl(logger, configMap, mockResolver, mockRevisionImpl, fragments, wires, importedPkgs, requiredPkgs); @@ -414,7 +414,7 @@ public class BundleWiringImplTest List<BundleWire> wires = new ArrayList<>(); when(mockRevisionImpl.getBundle()).thenReturn(mockBundle); - when(mockBundle.getBundleId()).thenReturn(Long.valueOf(1)); + when(mockBundle.getBundleId()).thenReturn((long) 1); bundleWiring = new BundleWiringImpl(logger, configMap, mockResolver, mockRevisionImpl, fragments, wires, importedPkgs, requiredPkgs); @@ -679,7 +679,7 @@ public class BundleWiringImplTest Map<String, List<BundleRevision>> requiredPkgs = new HashMap<>(); when(mockRevisionImpl.getBundle()).thenReturn(mockBundle); - when(mockBundle.getBundleId()).thenReturn(Long.valueOf(1)); + when(mockBundle.getBundleId()).thenReturn((long) 1); bundleWiring = new BundleWiringImpl(logger, configMap, mockResolver, mockRevisionImpl, fragments, wires, importedPkgs, requiredPkgs); @@ -876,7 +876,7 @@ public class BundleWiringImplTest Map<String, List<BundleRevision>> requiredPkgs = new HashMap<>(); when(mockRevisionImpl.getBundle()).thenReturn(mockBundle); - when(mockBundle.getBundleId()).thenReturn(Long.valueOf(1)); + when(mockBundle.getBundleId()).thenReturn((long) 1); bundleWiring = new BundleWiringImpl(logger, configMap, mockResolver, mockRevisionImpl, fragments, wires, importedPkgs, requiredPkgs); diff --git a/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java b/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java index 8c0bc43f4b..bf9bddea70 100644 --- a/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java +++ b/framework/src/test/java/org/apache/felix/framework/EventDispatcherTest.java @@ -138,7 +138,7 @@ class EventDispatcherTest BundleContext bc = Mockito.mock(BundleContext.class); Bundle b = Mockito.mock(Bundle.class); Mockito.when(b.getBundleContext()).thenReturn(bc); - Mockito.when(b.getState()).thenReturn(Integer.valueOf(Bundle.ACTIVE)); + Mockito.when(b.getState()).thenReturn(Bundle.ACTIVE); Mockito.when(bc.getBundle()).thenReturn(b); return b;
