Providing capability to override default strategy in OSGi environment.

Author: jwcarman

errormap/decorator/src/main/java/org/microbule/errormap/decorator/ErrorMapperProxyDecorator.java

@@ -32,20 +32,27 @@
 @Singleton
 @Named("errorMapperProxyDecorator")
 public class ErrorMapperProxyDecorator implements JaxrsProxyDecorator {
-    //----------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------
 // Fields
 //----------------------------------------------------------------------------------------------------------------------
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ErrorMapperProxyDecorator.class);
     private static final String STRATEGY = "strategy";
     private final ErrorMapperService errorMapperService;
+    private final String defaultStrategy;
 
 //----------------------------------------------------------------------------------------------------------------------
 // Constructors
 //----------------------------------------------------------------------------------------------------------------------
 
     @Inject
     public ErrorMapperProxyDecorator(ErrorMapperService errorMapperService) {
+        this(errorMapperService, ErrorMapperUtils.DEFAULT_STRATEGY);
+    }
+
+    public ErrorMapperProxyDecorator(ErrorMapperService errorMapperService, String defaultStrategy) {
         this.errorMapperService = errorMapperService;
+        this.defaultStrategy = defaultStrategy;
     }
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -54,7 +61,7 @@ public ErrorMapperProxyDecorator(ErrorMapperService errorMapperService) {
 
     @Override
     public void decorate(JaxrsServiceDescriptor descriptor, Config config) {
-        final String strategy = config.value(STRATEGY).orElse(ErrorMapperUtils.DEFAULT_STRATEGY);
+        final String strategy = config.value(STRATEGY).orElse(defaultStrategy);
         LOGGER.debug("Using \"{}\" error response strategy for {} JAX-RS proxy.", strategy, descriptor.serviceInterface().getSimpleName());
         descriptor.addProvider(new ErrorMapperResponseExceptionMapper(errorMapperService, strategy));
     }

errormap/decorator/src/main/java/org/microbule/errormap/decorator/ErrorMapperServerDecorator.java

@@ -40,14 +40,20 @@ public class ErrorMapperServerDecorator implements JaxrsServerDecorator {
     private static final String STRATEGY = "strategy";
 
     private final ErrorMapperService errorMapperService;
+    private final String defaultStrategy;
 
 //----------------------------------------------------------------------------------------------------------------------
 // Constructors
 //----------------------------------------------------------------------------------------------------------------------
 
     @Inject
     public ErrorMapperServerDecorator(ErrorMapperService errorMapperService) {
+        this(errorMapperService, ErrorMapperUtils.DEFAULT_STRATEGY);
+    }
+
+    public ErrorMapperServerDecorator(ErrorMapperService errorMapperService, String defaultStrategy) {
         this.errorMapperService = errorMapperService;
+        this.defaultStrategy = defaultStrategy;
     }
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -56,7 +62,7 @@ public ErrorMapperServerDecorator(ErrorMapperService errorMapperService) {
 
     @Override
     public void decorate(JaxrsServiceDescriptor descriptor, Config config) {
-        final String strategy = config.value(STRATEGY).orElse(ErrorMapperUtils.DEFAULT_STRATEGY);
+        final String strategy = config.value(STRATEGY).orElse(defaultStrategy);
         LOGGER.debug("Using \"{}\" error response strategy for {} JAX-RS server.", strategy, descriptor.serviceInterface().getSimpleName());
         descriptor.addProvider(new WebApplicationExceptionMapper(errorMapperService, strategy));
         descriptor.addProvider(new RootExceptionMapper(errorMapperService, strategy));

errormap/decorator/src/main/resources/OSGI-INF/blueprint/microbule-errormap-decorator.xml

@@ -17,18 +17,27 @@
   ~
   -->
 
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
+
+    <cm:property-placeholder persistent-id="org.microbule.errormap.decorator" update-strategy="reload">
+        <cm:default-properties>
+            <cm:property name="defaultStrategy" value="text"/>
+        </cm:default-properties>
+    </cm:property-placeholder>
 
     <reference id="errorMapperService" interface="org.microbule.errormap.api.ErrorMapperService"/>
 
     <bean id="serverDecorator" class="org.microbule.errormap.decorator.ErrorMapperServerDecorator">
         <argument ref="errorMapperService"/>
+        <argument value="${defaultStrategy}" />
     </bean>
 
     <service ref="serverDecorator" interface="org.microbule.spi.JaxrsServerDecorator"/>
 
     <bean id="proxyDecorator" class="org.microbule.errormap.decorator.ErrorMapperProxyDecorator">
         <argument ref="errorMapperService"/>
+        <argument value="${defaultStrategy}" />
     </bean>
 
     <service ref="proxyDecorator" interface="org.microbule.spi.JaxrsProxyDecorator"/>