Use AutoClosable for cleanups of PlexusContext

slawekjaranowski · slawekjaranowski · commit f5de5df5af2d · 2025-10-27T22:07:39.000+01:00
diff --git a/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java b/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java
@@ -64,6 +64,23 @@
 */
 public class PlexusExtension implements BeforeEachCallback, AfterEachCallback{
 
+ private static class PlexusClosableWrapper implements AutoCloseable{
+ private final PlexusContainer container;
+
+ PlexusClosableWrapper(PlexusContainer container){
+ this.container = container;
+ }
+
+ @Override
+ public void close(){
+ container.dispose();
+ }
+
+ public PlexusContainer get(){
+ return container;
+ }
+ }
+
 private static final ExtensionContext.Namespace PLEXUS_EXTENSION =
 ExtensionContext.Namespace.create("PlexusExtension");
 
@@ -140,7 +157,7 @@ private PlexusContainer setupContainer(ExtensionContext context){
 throw new IllegalArgumentException("Failed to create plexus container.", e);
 }
 testInstanceCustomizeContainer(container, context);
- context.getStore(PLEXUS_EXTENSION).put(PlexusContainer.class, container);
+ context.getStore(PLEXUS_EXTENSION).put(PlexusClosableWrapper.class, new PlexusClosableWrapper(container));
 
 return container;
 }
@@ -175,11 +192,7 @@ protected void customizeContext(Context context){}
 
 @Override
 public void afterEach(ExtensionContext context) throws Exception{
- PlexusContainer container =
- context.getStore(PLEXUS_EXTENSION).remove(PlexusContainer.class, PlexusContainer.class);
- if (container != null){
- container.dispose();
- }
+ // empty method, not used
 }
 
 /**
@@ -211,12 +224,12 @@ protected void setTestBasedir(String testBasedir, ExtensionContext context){
 }
 
 public PlexusContainer getContainer(ExtensionContext context){
- PlexusContainer container =
- context.getStore(PLEXUS_EXTENSION).get(PlexusContainer.class, PlexusContainer.class);
+ PlexusClosableWrapper container =
+ context.getStore(PLEXUS_EXTENSION).get(PlexusClosableWrapper.class, PlexusClosableWrapper.class);
 if (container == null){
 return setupContainer(context);
 }
- return container;
+ return container.get();
 }
 
 protected String getCustomConfigurationName(){

-Original file line number
+Diff line change
  */
 publicclassPlexusExtensionimplementsBeforeEachCallback, AfterEachCallback{
 +privatestaticclassPlexusClosableWrapperimplementsAutoCloseable{
 +privatefinalPlexusContainercontainer;
++
 +PlexusClosableWrapper(PlexusContainercontainer){
 +this.container = container;
 + }
++
 +@Override
 +publicvoidclose(){
 +container.dispose();
 + }
++
 +publicPlexusContainerget(){
 +returncontainer;
 + }
 + }
++
 privatestaticfinalExtensionContext.NamespacePLEXUS_EXTENSION =
 ExtensionContext.Namespace.create("PlexusExtension");
 thrownewIllegalArgumentException("Failed to create plexus container.", e);
+ }
 testInstanceCustomizeContainer(container, context);
 -context.getStore(PLEXUS_EXTENSION).put(PlexusContainer.class, container);
 +context.getStore(PLEXUS_EXTENSION).put(PlexusClosableWrapper.class, newPlexusClosableWrapper(container));
 returncontainer;
+ }
 @Override
 publicvoidafterEach(ExtensionContextcontext) throwsException{
 -PlexusContainercontainer =
 -context.getStore(PLEXUS_EXTENSION).remove(PlexusContainer.class, PlexusContainer.class);
 -if (container != null){
 -container.dispose();
 - }
 +// empty method, not used
+ }
 /**
+ }
 publicPlexusContainergetContainer(ExtensionContextcontext){
 -PlexusContainercontainer =
 -context.getStore(PLEXUS_EXTENSION).get(PlexusContainer.class, PlexusContainer.class);
 +PlexusClosableWrappercontainer =
 +context.getStore(PLEXUS_EXTENSION).get(PlexusClosableWrapper.class, PlexusClosableWrapper.class);
 if (container == null){
 returnsetupContainer(context);
+ }
 -returncontainer;
 +returncontainer.get();
+ }
 protectedStringgetCustomConfigurationName(){