Skip to content

Commit

Permalink
Merge pull request spring-projects#4493 from izeye/typo-20151115
Browse files Browse the repository at this point in the history
* pr/4493:
  Polish
  • Loading branch information
philwebb committed Nov 15, 2015
2 parents 5c19d3b + 4369493 commit 3a34e88
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ protected CacheStatistics getCacheStatistics(ObjectName objectName) {
statistics.setSize((long) size);
if (size > 0) {
// Let's initialize the stats if we have some data
initalizeStats(objectName, statistics);
initializeStats(objectName, statistics);
}
}
return statistics;
}

private void initalizeStats(ObjectName objectName,
private void initializeStats(ObjectName objectName,
DefaultCacheStatistics statistics) {
Double hitRatio = getAttribute(objectName, "hitRatio", Double.class);
if ((hitRatio != null)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public abstract class AbstractEndpoint<T> implements Endpoint<T>, EnvironmentAwa
private Boolean enabled;

/**
* Create a new sensitive endpoint instance. The enpoint will enabled flag will be
* Create a new sensitive endpoint instance. The endpoint will enabled flag will be
* based on the spring {@link Environment} unless explicitly set.
* @param id the endpoint ID
*/
Expand All @@ -63,7 +63,7 @@ public AbstractEndpoint(String id) {
}

/**
* Create a new endpoint instance. The enpoint will enabled flag will be based on the
* Create a new endpoint instance. The endpoint will enabled flag will be based on the
* spring {@link Environment} unless explicitly set.
* @param id the endpoint ID
* @param sensitive if the endpoint is sensitive by default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public interface Endpoint<T> {

/**
* The logical ID of the endpoint. Must only contain simple letters, numbers and '_'
* characters (ie a {@literal "\w"} regex).
* characters (i.e. a {@literal "\w"} regex).
* @return the endpoint ID
*/
String getId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

/**
* Annotation to indicate that an {@link MvcEndpoint} class or {@link RequestMapping}
* method should't generate a hypermedia response.
* method shouldn't generate a hypermedia response.
*
* @author Dave Syer
* @since 1.3.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,18 +270,18 @@ static class MultipleDataSourcesConfig {

@Bean
public DataSource tomcatDataSource() {
return InitalizedBuilder.create()
return InitializedBuilder.create()
.type(org.apache.tomcat.jdbc.pool.DataSource.class).build();
}

@Bean
public DataSource hikariDS() {
return InitalizedBuilder.create().type(HikariDataSource.class).build();
return InitializedBuilder.create().type(HikariDataSource.class).build();
}

@Bean
public DataSource commonsDbcpDataSource() {
return InitalizedBuilder.create().type(BasicDataSource.class).build();
return InitializedBuilder.create().type(BasicDataSource.class).build();
}
}

Expand All @@ -291,13 +291,13 @@ static class MultipleDataSourcesWithPrimaryConfig {
@Bean
@Primary
public DataSource myDataSource() {
return InitalizedBuilder.create()
return InitializedBuilder.create()
.type(org.apache.tomcat.jdbc.pool.DataSource.class).build();
}

@Bean
public DataSource commonsDbcpDataSource() {
return InitalizedBuilder.create().type(BasicDataSource.class).build();
return InitializedBuilder.create().type(BasicDataSource.class).build();
}
}

Expand All @@ -307,13 +307,13 @@ static class MultipleDataSourcesWithCustomPrimaryConfig {
@Bean
@Primary
public DataSource myDataSource() {
return InitalizedBuilder.create()
return InitializedBuilder.create()
.type(org.apache.tomcat.jdbc.pool.DataSource.class).build();
}

@Bean
public DataSource dataSource() {
return InitalizedBuilder.create().type(BasicDataSource.class).build();
return InitializedBuilder.create().type(BasicDataSource.class).build();
}
}

Expand Down Expand Up @@ -381,7 +381,7 @@ public CacheManager second() {

}

private static class InitalizedBuilder {
private static class InitializedBuilder {

public static DataSourceBuilder create() {
return DataSourceBuilder.create()
Expand Down

0 comments on commit 3a34e88

Please sign in to comment.