From 474d624e8e2a8d968a9a77c8f71babe74048d3f7 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 13 Jul 2015 22:51:45 -0500 Subject: [PATCH] SEC-2988: Renamed OnBeanCondition.java to OnMissingBeanCondition.java --- ...BeanCondition.java => OnMissingBeanCondition.java} | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename config/src/main/java/org/springframework/security/config/annotation/web/configuration/{OnBeanCondition.java => OnMissingBeanCondition.java} (90%) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnMissingBeanCondition.java similarity index 90% rename from config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java rename to config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnMissingBeanCondition.java index 924c17ba15..262180c788 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnMissingBeanCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -15,12 +15,11 @@ */ package org.springframework.security.config.annotation.web.configuration; +import java.util.Map; + import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConfigurationCondition; import org.springframework.core.type.AnnotatedTypeMetadata; -import org.springframework.util.ClassUtils; - -import java.util.Map; /** * @author Rob Winch @@ -34,8 +33,8 @@ class OnMissingBeanCondition implements ConfigurationCondition { Map attrs = metadata .getAnnotationAttributes(ConditionalOnMissingBean.class.getName()); - Class type = (Class) attrs.get("value"); + Class type = (Class) attrs.get("value"); final Map beans = context.getBeanFactory().getBeansOfType(type); return beans.isEmpty(); } -} +} \ No newline at end of file