[holgerfriedrich]

BlueprintPlugin rebuilt Import-Service / Export-Service with felix-utils Clause.toString(), which only quotes values containing ','. Filters like (ns=http://...) were written unquoted, and bnd >= 7.2, which parses the header again, truncated them at the first '='.

Quote every directive and attribute value that is not a plain OSGi "extended" value. Extend BlueprintComponentTest to parse Import-Service with bnd's OSGiHeader and check the complete namespace filters.

https://issues.apache.org/jira/browse/FELIX-6877

[paulrutter]

Thanks for the fix. One blocker:

Backslashes are doubled on round trip. appendValue writes \ as \\, but bnd (checked with bndlib 7.4.0) only unescapes \" when it parses a quoted value. It does not turn \\ back into \.

A filter such as (pid=a\(b) is therefore written and read back like this:

written:    filter="(pid=a\\(b)"
read back:  (pid=a\\(b)

That is a different and invalid filter. Before this PR, backslashes passed through unchanged, so this is a regression for any value with an LDAP-escaped character (\(, \), \*, \\).

Suggested fix: in appendValue, escape only " and leave \ as is:

if ( c == '"' )
{
    sb.append( '\\' );
}
sb.append( c );

Please also add a test with a backslash in a filter.

Minor, not blocking: the new assertions only run for mode == "service", so the generic mode is not covered.

[holgerfriedrich]

Thanks, you were right about the backslashes. Fixed in the new commit: values are now quoted with bnd's OSGiHeader.quote, so bnd reads them back unchanged.

Tests: the new BlueprintPluginTest covers backslashes, quotes and generic mode, and BlueprintComponentTest now checks the namespace filters in generic mode too.

[paulrutter]

Lgtm