[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/audit-system.xml idp-conf/src/main...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 18 15:56:07 2014
New Revision: 6439

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6439&view=rev
Log:
IDP-375 - AuditExtractor interface -> plain function, optimize extraction by skipping unformatted fields

Modified:
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AuditExtractorFunction.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/AttributesAuditExtractor.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/ConstantAuditExtractor.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/SingletonAuditExtractor.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionIDAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AuthnContextAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AuthnInstantAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/InResponseToAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SAMLBindingAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SAMLMessageIDAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SAMLMessageInstantAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SessionIndexAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusCodeAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusMessageAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SubStatusCodeAuditExtractor.java

Modified: trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/audit-system.xml?rev=6439&r1=6438&r2=6439&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/audit-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/audit-system.xml Mon Aug 18 15:56:07 2014
@@ -23,20 +23,18 @@
                     <key>
                         <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.PROTOCOL"/>
                     </key>
-                    <bean class="net.shibboleth.idp.profile.audit.impl.ConstantAuditExtractor">
-                        <constructor-arg>
-                            <list>
-                                <ref bean="shibboleth.MetadataLookup.Protocol" />
-                            </list>
-                        </constructor-arg>
-                    </bean>
+                    <bean class="com.google.common.base.Functions" factory-method="constant"
+                        c:value-ref="shibboleth.MetadataLookup.Protocol" />
                 </entry>
                 <entry>
                     <key>
                         <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_BINDING"/>
                     </key>
-                    <bean class="net.shibboleth.idp.saml.audit.impl.SAMLBindingAuditExtractor">
-                        <constructor-arg>
+                    <bean class="com.google.common.base.Functions" factory-method="compose">
+                        <constructor-arg name="g">
+                            <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLBindingContextBindingFunction" />
+                        </constructor-arg>
+                        <constructor-arg name="f">
                             <bean class="com.google.common.base.Functions" factory-method="compose"
                                 c:g-ref="shibboleth.ChildLookup.SAMLBindingContext"
                                 c:f-ref="shibboleth.MessageContextLookup.Inbound" />
@@ -47,8 +45,11 @@
                     <key>
                         <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_ID"/>
                     </key>
-                    <bean class="net.shibboleth.idp.saml.audit.impl.SAMLMessageIDAuditExtractor">
-                        <constructor-arg>
+                    <bean class="com.google.common.base.Functions" factory-method="compose">
+                        <constructor-arg name="g">

[... 649 lines stripped ...]