diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Condition.java b/spring-context/src/main/java/org/springframework/context/annotation/Condition.java
index a3cfe9fc80..edc6c05b70 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Condition.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Condition.java
@@ -16,10 +16,8 @@
 
 package org.springframework.context.annotation;
 
-import org.jruby.internal.runtime.methods.MethodMethod;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.core.type.AnnotationMetadata;
 
 /**
  * A single {@code condition} that must be {@linkplain #matches matched} in order
@@ -45,10 +43,10 @@ public interface Condition {
 	/**
 	 * Determine if the condition matches.
 	 * @param context the condition context
-	 * @param metadata meta-data of the {@link AnnotationMetadata class} or
-	 *        {@link MethodMethod method} being checked.
+	 * @param metadata metadata of the {@link org.springframework.core.type.AnnotationMetadata class}
+	 * or {@link org.springframework.core.type.MethodMetadata method} being checked.
 	 * @return {@code true} if the condition matches and the component can be registered
-	 *         or {@code false} to veto registration.
+	 * or {@code false} to veto registration.
 	 */
 	boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata);
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java b/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
index 9c1509f6db..6578d7bd76 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
@@ -41,20 +41,20 @@ import java.lang.annotation.Target;
  * {@code @Bean} methods and {@link Import @Import} annotations associated with that class
  * will be subject to the conditions.
  *
- * <p>NOTE: {@code @Conditional} annotations are not inherited, any conditions from
- * super-classes or from overridden methods are not considered.
+ * <p>NOTE: {@code @Conditional} annotations are not inherited; any conditions from
+ * superclasses or from overridden methods are not being considered.
  *
  * @author Phillip Webb
  * @since 4.0
  * @see Condition
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ElementType.TYPE, ElementType.METHOD})
 public @interface Conditional {
 
 	/**
-	 * All {@link Condition}s that must {@linkplain Condition#matches match} in order for
-	 * the component to be registered.
+	 * All {@link Condition}s that must {@linkplain Condition#matches match}
+	 * in order for the component to be registered.
 	 */
 	Class<? extends Condition>[] value();