Skip to content

Commit

Permalink
Modify Comments: Configuration.StrictMap<V> put(String key, V value) … (
Browse files Browse the repository at this point in the history
#2854)

* Modify Comments: Configuration.StrictMap<V> put(String key, V value) comments update.

* Modify Comments: Configuration.StrictMap<V> put(String key, V value) comments update.

* Modify Comments: Configuration.StrictMap<V> put(String key, V value) comments update.
  • Loading branch information
wayn111 committed Mar 20, 2023
1 parent 9e43552 commit c9137b0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/session/Configuration.java
Expand Up @@ -1067,7 +1067,7 @@ public StrictMap<V> conflictMessageProducer(BiFunction<V, V, String> conflictMes
@SuppressWarnings("unchecked")
public V put(String key, V value) {
if (containsKey(key)) {
throw new IllegalArgumentException(name + " already contains value for " + key
throw new IllegalArgumentException(name + " already contains key " + key
+ (conflictMessageProducer == null ? "" : conflictMessageProducer.apply(super.get(key), value)));
}
if (key.contains(".")) {
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/apache/ibatis/session/SqlSessionTest.java
Expand Up @@ -127,7 +127,7 @@ void shouldFailToAddDueToNameConflict() {
c.addCache(cache);
fail("Exception expected.");
} catch (Exception e) {
assertTrue(e.getMessage().contains("already contains value"));
assertTrue(e.getMessage().contains("already contains key"));
}
}

Expand Down Expand Up @@ -441,7 +441,7 @@ void shouldThrowExceptionIfTryingToAddStatementWithSameNameInXml() {
fail("Expected exception to be thrown due to statement that already exists.");
} catch (Exception e) {
assertTrue(e.getMessage().contains(
"already contains value for org.apache.ibatis.domain.blog.mappers.BlogMapper.selectBlogWithPostsUsingSubSelect. please check org/apache/ibatis/builder/BlogMapper.xml and org/mybatis/TestMapper.xml"));
"already contains key org.apache.ibatis.domain.blog.mappers.BlogMapper.selectBlogWithPostsUsingSubSelect. please check org/apache/ibatis/builder/BlogMapper.xml and org/mybatis/TestMapper.xml"));
}
}

Expand All @@ -456,7 +456,7 @@ void shouldThrowExceptionIfTryingToAddStatementWithSameNameInAnnotation() {
fail("Expected exception to be thrown due to statement that already exists.");
} catch (Exception e) {
assertTrue(e.getMessage().contains(
"already contains value for org.apache.ibatis.domain.blog.mappers.AuthorMapper.selectAuthor2. please check org/apache/ibatis/domain/blog/mappers/AuthorMapper.java (best guess) and org/mybatis/TestMapper.xml"));
"already contains key org.apache.ibatis.domain.blog.mappers.AuthorMapper.selectAuthor2. please check org/apache/ibatis/domain/blog/mappers/AuthorMapper.java (best guess) and org/mybatis/TestMapper.xml"));
}
}

Expand Down
Expand Up @@ -29,7 +29,7 @@ void shouldFailOnDuplicatedId() {
Configuration configuration = new Configuration();
when(() -> configuration.addMapper(IdConflictMapper.class));
then(caughtException()).isInstanceOf(RuntimeException.class).hasMessage(
"Result Maps collection already contains value for org.apache.ibatis.submitted.results_id.IdConflictMapper.userResult");
"Result Maps collection already contains key org.apache.ibatis.submitted.results_id.IdConflictMapper.userResult");
}

}

0 comments on commit c9137b0

Please sign in to comment.