### Eclipse Workspace Patch 1.0 #P xwiki-core-parent Index: xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wikibridge/DefaultWikiMacro.java =================================================================== --- xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wikibridge/DefaultWikiMacro.java (revision 27292) +++ xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wikibridge/DefaultWikiMacro.java (working copy) @@ -159,9 +159,15 @@ Map parameterDescriptors = getDescriptor().getParameterDescriptorMap(); for (String parameterName : parameterDescriptors.keySet()) { ParameterDescriptor parameterDescriptor = parameterDescriptors.get(parameterName); - if (parameterDescriptor.isMandatory() && (null == parameters.get(parameterName))) { + Object parameterValue = parameters.get(parameterName); + if (parameterDescriptor.isMandatory() && (null == parameterValue)) { throw new MacroParameterException(String.format("Parameter [%s] is mandatory", parameterName)); } + // set default value as the value, if no value is provided by the user + Object parameterDefaultValue = parameterDescriptor.getDefaultValue(); + if (parameterValue == null && parameterDefaultValue != null) { + parameters.set(parameterName, parameterDefaultValue); + } } // Verify the a macro content is not empty if it was declared mandatory.