[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct  4 10:17:42 2016
New Revision: 8461

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8461&view=rev
Log:
Add support for counters to context-driven metric feature, adjust names accordingly.

Added:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/MetricContext.java
      - copied, changed from r8460, trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/TimerContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateMetricContext.java
      - copied, changed from r8460, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateTimerContext.java
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/TimerContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateTimerContext.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java?rev=8461&r1=8460&r2=8461&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java	(original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java	Tue Oct  4 10:17:42 2016
@@ -34,7 +34,7 @@
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.TimerContext;
+import net.shibboleth.idp.profile.context.MetricContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -230,7 +230,7 @@
     private boolean startTimer(@Nonnull final AttributeFilterContext filterContext) {
         final ProfileRequestContext prc = profileContextStrategy.apply(filterContext);
         if (prc != null) {
-            final TimerContext timerCtx = prc.getSubcontext(TimerContext.class);
+            final MetricContext timerCtx = prc.getSubcontext(MetricContext.class);
             if (timerCtx != null) {
                 timerCtx.start(getId());
                 return true;
@@ -247,7 +247,7 @@
     private void stopTimer(@Nonnull final AttributeFilterContext filterContext) {
         final ProfileRequestContext prc = profileContextStrategy.apply(filterContext);
         if (prc != null) {
-            final TimerContext timerCtx = prc.getSubcontext(TimerContext.class);
+            final MetricContext timerCtx = prc.getSubcontext(MetricContext.class);
             if (timerCtx != null) {
                 timerCtx.stop(getId());
             }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=8461&r1=8460&r2=8461&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	Tue Oct  4 10:17:42 2016
@@ -44,7 +44,7 @@
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;

[... 474 lines stripped ...]