From b34102c30cb2561f2590f0fa649dda4b611b0a3a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 27 Jan 2014 10:47:25 -0800 Subject: [PATCH] Polish --- .../orm/jpa/HibernateJpaAutoConfiguration.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index 30daa50ef0..df3f306b8e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -104,16 +104,19 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration implemen return "create-drop"; } - public static class HibernateEntityManagerCondition extends SpringBootCondition { + static class HibernateEntityManagerCondition extends SpringBootCondition { + + private static String[] CLASS_NAMES = { + "org.hibernate.ejb.HibernateEntityManager", + "org.hibernate.jpa.HibernateEntityManager" }; @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { - if (ClassUtils.isPresent("org.hibernate.ejb.HibernateEntityManager", - context.getClassLoader()) - || ClassUtils.isPresent("org.hibernate.jpa.HibernateEntityManager", - context.getClassLoader())) { - return ConditionOutcome.match("found HibernateEntityManager class"); + for (String className : CLASS_NAMES) { + if (ClassUtils.isPresent(className, context.getClassLoader())) { + return ConditionOutcome.match("found HibernateEntityManager class"); + } } return ConditionOutcome.noMatch("did not find HibernateEntityManager class"); }