Polishing

spring-projects · Jul 12, 2023 · c873a59 · c873a59
1 parent 4dc93bc
commit c873a59
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/...ext/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java b/...ext/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
@@ -371,7 +371,7 @@ protected Object doInvoke(Object... args) {
  * Return the target bean instance to use.
  */
  protected Object getTargetBean() {
- Assert.notNull(this.applicationContext, "ApplicationContext must no be null");
+ Assert.notNull(this.applicationContext, "ApplicationContext must not be null");
  return this.applicationContext.getBean(this.beanName);
  }
 

diff --git a/spring-core/src/main/java/org/springframework/core/env/Environment.java b/spring-core/src/main/java/org/springframework/core/env/Environment.java
@@ -95,6 +95,25 @@ public interface Environment extends PropertyResolver {
  */
  String[] getDefaultProfiles();
 
+ /**
+ * Determine whether one of the given profile expressions matches the
+ * {@linkplain #getActiveProfiles() active profiles} &mdash; or in the case
+ * of no explicit active profiles, whether one of the given profile expressions
+ * matches the {@linkplain #getDefaultProfiles() default profiles}.
+ * <p>Profile expressions allow for complex, boolean profile logic to be
+ * expressed &mdash; for example {@code "p1 & p2"}, {@code "(p1 & p2) | p3"},
+ * etc. See {@link Profiles#of(String...)} for details on the supported
+ * expression syntax.
+ * <p>This method is a convenient shortcut for
+ * {@code env.acceptsProfiles(Profiles.of(profileExpressions))}.
+ * @since 5.3.28
+ * @see Profiles#of(String...)
+ * @see #acceptsProfiles(Profiles)
+ */
+ default boolean matchesProfiles(String... profileExpressions) {
+ return acceptsProfiles(Profiles.of(profileExpressions));
+ }
+
  /**
  * Determine whether one or more of the given profiles is active &mdash; or
  * in the case of no explicit {@linkplain #getActiveProfiles() active profiles},
@@ -117,25 +136,6 @@ public interface Environment extends PropertyResolver {
  @Deprecated
  boolean acceptsProfiles(String... profiles);
 
- /**
- * Determine whether one of the given profile expressions matches the
- * {@linkplain #getActiveProfiles() active profiles} &mdash; or in the case
- * of no explicit active profiles, whether one of the given profile expressions
- * matches the {@linkplain #getDefaultProfiles() default profiles}.
- * <p>Profile expressions allow for complex, boolean profile logic to be
- * expressed &mdash; for example {@code "p1 & p2"}, {@code "(p1 & p2) | p3"},
- * etc. See {@link Profiles#of(String...)} for details on the supported
- * expression syntax.
- * <p>This method is a convenient shortcut for
- * {@code env.acceptsProfiles(Profiles.of(profileExpressions))}.
- * @since 5.3.28
- * @see Profiles#of(String...)
- * @see #acceptsProfiles(Profiles)
- */
- default boolean matchesProfiles(String... profileExpressions) {
- return acceptsProfiles(Profiles.of(profileExpressions));
- }
-
  /**
  * Determine whether the given {@link Profiles} predicate matches the
  * {@linkplain #getActiveProfiles() active profiles} &mdash; or in the case