Commit d58f38f6 authored by dreis's avatar dreis Committed by Stephane Nicoll

Use String.replace() with single char if possible

See gh-8089
parent 551bfb2c
...@@ -139,7 +139,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint ...@@ -139,7 +139,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
private HttpStatus getStatus(Health health) { private HttpStatus getStatus(Health health) {
String code = health.getStatus().getCode(); String code = health.getStatus().getCode();
if (code != null) { if (code != null) {
code = code.toLowerCase().replace("_", "-"); code = code.toLowerCase().replace('_', '-');
for (String candidate : RelaxedNames.forCamelCase(code)) { for (String candidate : RelaxedNames.forCamelCase(code)) {
HttpStatus status = this.statusMapping.get(candidate); HttpStatus status = this.statusMapping.get(candidate);
if (status != null) { if (status != null) {
......
...@@ -50,7 +50,7 @@ class CacheCondition extends SpringBootCondition { ...@@ -50,7 +50,7 @@ class CacheCondition extends SpringBootCondition {
} }
CacheType cacheType = CacheConfigurations CacheType cacheType = CacheConfigurations
.getType(((AnnotationMetadata) metadata).getClassName()); .getType(((AnnotationMetadata) metadata).getClassName());
String value = resolver.getProperty("type").replace("-", "_").toUpperCase(); String value = resolver.getProperty("type").replace('-', '_').toUpperCase();
if (value.equals(cacheType.name())) { if (value.equals(cacheType.name())) {
return ConditionOutcome.match(message.because(value + " cache type")); return ConditionOutcome.match(message.because(value + " cache type"));
} }
......
...@@ -45,7 +45,7 @@ class SessionCondition extends SpringBootCondition { ...@@ -45,7 +45,7 @@ class SessionCondition extends SpringBootCondition {
return ConditionOutcome.noMatch( return ConditionOutcome.noMatch(
message.didNotFind("spring.session.store-type property").atAll()); message.didNotFind("spring.session.store-type property").atAll());
} }
String value = resolver.getProperty("store-type").replace("-", "_").toUpperCase(); String value = resolver.getProperty("store-type").replace('-', '_').toUpperCase();
if (value.equals(sessionStoreType.name())) { if (value.equals(sessionStoreType.name())) {
return ConditionOutcome.match(message return ConditionOutcome.match(message
.found("spring.session.store-type property").items(sessionStoreType)); .found("spring.session.store-type property").items(sessionStoreType));
......
...@@ -212,7 +212,7 @@ public class DefaultErrorViewResolverTests { ...@@ -212,7 +212,7 @@ public class DefaultErrorViewResolverTests {
private void setResourceLocation(String path) { private void setResourceLocation(String path) {
String packageName = getClass().getPackage().getName(); String packageName = getClass().getPackage().getName();
this.resourceProperties.setStaticLocations(new String[] { this.resourceProperties.setStaticLocations(new String[] {
"classpath:" + packageName.replace(".", "/") + path + "/" }); "classpath:" + packageName.replace('.', '/') + path + "/" });
} }
private MockHttpServletResponse render(ModelAndView modelAndView) throws Exception { private MockHttpServletResponse render(ModelAndView modelAndView) throws Exception {
......
...@@ -264,7 +264,7 @@ abstract class ArchiveCommand extends OptionParsingCommand { ...@@ -264,7 +264,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
if (classLoader == null) { if (classLoader == null) {
classLoader = Thread.currentThread().getContextClassLoader(); classLoader = Thread.currentThread().getContextClassLoader();
} }
String name = sourceClass.replace(".", "/") + ".class"; String name = sourceClass.replace('.', '/') + ".class";
InputStream stream = classLoader.getResourceAsStream(name); InputStream stream = classLoader.getResourceAsStream(name);
writer.writeEntry(this.layout.getClassesLocation() + name, stream); writer.writeEntry(this.layout.getClassesLocation() + name, stream);
} }
......
...@@ -161,7 +161,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader { ...@@ -161,7 +161,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
protected Class<?> createClass(byte[] code, ClassNode classNode) { protected Class<?> createClass(byte[] code, ClassNode classNode) {
Class<?> createdClass = super.createClass(code, classNode); Class<?> createdClass = super.createClass(code, classNode);
ExtendedGroovyClassLoader.this.classResources ExtendedGroovyClassLoader.this.classResources
.put(classNode.getName().replace(".", "/") + ".class", code); .put(classNode.getName().replace('.', '/') + ".class", code);
return createdClass; return createdClass;
} }
......
...@@ -52,7 +52,7 @@ public class RestartClassLoaderTests { ...@@ -52,7 +52,7 @@ public class RestartClassLoaderTests {
private static final String PACKAGE = RestartClassLoaderTests.class.getPackage() private static final String PACKAGE = RestartClassLoaderTests.class.getPackage()
.getName(); .getName();
private static final String PACKAGE_PATH = PACKAGE.replace(".", "/"); private static final String PACKAGE_PATH = PACKAGE.replace('.', '/');
private static final Charset UTF_8 = Charset.forName("UTF-8"); private static final Charset UTF_8 = Charset.forName("UTF-8");
......
...@@ -37,7 +37,7 @@ public class DevToolsSettingsTests { ...@@ -37,7 +37,7 @@ public class DevToolsSettingsTests {
public TemporaryFolder temporaryFolder = new TemporaryFolder(); public TemporaryFolder temporaryFolder = new TemporaryFolder();
private static final String ROOT = DevToolsSettingsTests.class.getPackage().getName() private static final String ROOT = DevToolsSettingsTests.class.getPackage().getName()
.replace(".", "/") + "/"; .replace('.', '/') + "/";
@Test @Test
public void includePatterns() throws Exception { public void includePatterns() throws Exception {
......
...@@ -99,7 +99,7 @@ public class TestCompiler { ...@@ -99,7 +99,7 @@ public class TestCompiler {
} }
public static String sourcePathFor(Class<?> type) { public static String sourcePathFor(Class<?> type) {
return type.getName().replace(".", "/") + ".java"; return type.getName().replace('.', '/') + ".java";
} }
protected File getSourceFolder() { protected File getSourceFolder() {
......
...@@ -65,7 +65,7 @@ public abstract class AbstractConfigurationClassTests { ...@@ -65,7 +65,7 @@ public abstract class AbstractConfigurationClassTests {
private Set<AnnotationMetadata> findConfigurationClasses() throws IOException { private Set<AnnotationMetadata> findConfigurationClasses() throws IOException {
Set<AnnotationMetadata> configurationClasses = new HashSet<AnnotationMetadata>(); Set<AnnotationMetadata> configurationClasses = new HashSet<AnnotationMetadata>();
Resource[] resources = this.resolver.getResources("classpath*:" Resource[] resources = this.resolver.getResources("classpath*:"
+ getClass().getPackage().getName().replace(".", "/") + "/**/*.class"); + getClass().getPackage().getName().replace('.', '/') + "/**/*.class");
for (Resource resource : resources) { for (Resource resource : resources) {
if (!isTestClass(resource)) { if (!isTestClass(resource)) {
MetadataReader metadataReader = new SimpleMetadataReaderFactory() MetadataReader metadataReader = new SimpleMetadataReaderFactory()
......
...@@ -262,7 +262,7 @@ public abstract class MainClassFinder { ...@@ -262,7 +262,7 @@ public abstract class MainClassFinder {
} }
private static String convertToClassName(String name, String prefix) { private static String convertToClassName(String name, String prefix) {
name = name.replace("/", "."); name = name.replace('/', '.');
name = name.replace('\\', '.'); name = name.replace('\\', '.');
name = name.substring(0, name.length() - DOT_CLASS.length()); name = name.substring(0, name.length() - DOT_CLASS.length());
if (prefix != null) { if (prefix != null) {
......
...@@ -55,7 +55,7 @@ public class TestJarFile { ...@@ -55,7 +55,7 @@ public class TestJarFile {
File file = getFilePath(filename); File file = getFilePath(filename);
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
InputStream inputStream = getClass().getResourceAsStream( InputStream inputStream = getClass().getResourceAsStream(
"/" + classToCopy.getName().replace(".", "/") + ".class"); "/" + classToCopy.getName().replace('.', '/') + ".class");
copyToFile(inputStream, file); copyToFile(inputStream, file);
if (time != null) { if (time != null) {
file.setLastModified(time); file.setLastModified(time);
......
...@@ -132,8 +132,8 @@ public class LaunchedURLClassLoader extends URLClassLoader { ...@@ -132,8 +132,8 @@ public class LaunchedURLClassLoader extends URLClassLoader {
AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
@Override @Override
public Object run() throws ClassNotFoundException { public Object run() throws ClassNotFoundException {
String packageEntryName = packageName.replace(".", "/") + "/"; String packageEntryName = packageName.replace('.', '/') + "/";
String classEntryName = className.replace(".", "/") + ".class"; String classEntryName = className.replace('.', '/') + ".class";
for (URL url : getURLs()) { for (URL url : getURLs()) {
try { try {
URLConnection connection = url.openConnection(); URLConnection connection = url.openConnection();
......
...@@ -359,7 +359,7 @@ public class PropertiesLauncher extends Launcher { ...@@ -359,7 +359,7 @@ public class PropertiesLauncher extends Launcher {
private String getProperty(String propertyKey, String manifestKey) throws Exception { private String getProperty(String propertyKey, String manifestKey) throws Exception {
if (manifestKey == null) { if (manifestKey == null) {
manifestKey = propertyKey.replace(".", "-"); manifestKey = propertyKey.replace('.', '-');
manifestKey = toCamelCase(manifestKey); manifestKey = toCamelCase(manifestKey);
} }
String property = SystemPropertyUtils.getProperty(propertyKey); String property = SystemPropertyUtils.getProperty(propertyKey);
......
...@@ -184,11 +184,11 @@ public abstract class SystemPropertyUtils { ...@@ -184,11 +184,11 @@ public abstract class SystemPropertyUtils {
} }
if (propVal == null) { if (propVal == null) {
// Try with underscores. // Try with underscores.
propVal = System.getenv(key.replace(".", "_")); propVal = System.getenv(key.replace('.', '_'));
} }
if (propVal == null) { if (propVal == null) {
// Try uppercase with underscores as well. // Try uppercase with underscores as well.
propVal = System.getenv(key.toUpperCase().replace(".", "_")); propVal = System.getenv(key.toUpperCase().replace('.', '_'));
} }
if (propVal != null) { if (propVal != null) {
return propVal; return propVal;
......
...@@ -127,7 +127,7 @@ class RelaxedConversionService implements ConversionService { ...@@ -127,7 +127,7 @@ class RelaxedConversionService implements ConversionService {
source = source.trim(); source = source.trim();
for (T candidate : (Set<T>) EnumSet.allOf(this.enumType)) { for (T candidate : (Set<T>) EnumSet.allOf(this.enumType)) {
RelaxedNames names = new RelaxedNames( RelaxedNames names = new RelaxedNames(
candidate.name().replace("_", "-").toLowerCase()); candidate.name().replace('_', '-').toLowerCase());
for (String name : names) { for (String name : names) {
if (name.equals(source)) { if (name.equals(source)) {
return candidate; return candidate;
......
...@@ -127,7 +127,7 @@ public final class RelaxedNames implements Iterable<String> { ...@@ -127,7 +127,7 @@ public final class RelaxedNames implements Iterable<String> {
@Override @Override
public String apply(String value) { public String apply(String value) {
return value.indexOf('-') != -1 ? value.replace("-", "_") : value; return value.indexOf('-') != -1 ? value.replace('-', '_') : value;
} }
}, },
...@@ -136,7 +136,7 @@ public final class RelaxedNames implements Iterable<String> { ...@@ -136,7 +136,7 @@ public final class RelaxedNames implements Iterable<String> {
@Override @Override
public String apply(String value) { public String apply(String value) {
return value.indexOf('_') != -1 ? value.replace("_", ".") : value; return value.indexOf('_') != -1 ? value.replace('_', '.') : value;
} }
}, },
...@@ -145,7 +145,7 @@ public final class RelaxedNames implements Iterable<String> { ...@@ -145,7 +145,7 @@ public final class RelaxedNames implements Iterable<String> {
@Override @Override
public String apply(String value) { public String apply(String value) {
return value.indexOf('.') != -1 ? value.replace(".", "_") : value; return value.indexOf('.') != -1 ? value.replace('.', '_') : value;
} }
}, },
......
...@@ -172,7 +172,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem { ...@@ -172,7 +172,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
protected final String getPackagedConfigFile(String fileName) { protected final String getPackagedConfigFile(String fileName) {
String defaultPath = ClassUtils.getPackageName(getClass()); String defaultPath = ClassUtils.getPackageName(getClass());
defaultPath = defaultPath.replace(".", "/"); defaultPath = defaultPath.replace('.', '/');
defaultPath = defaultPath + "/" + fileName; defaultPath = defaultPath + "/" + fileName;
defaultPath = "classpath:" + defaultPath; defaultPath = "classpath:" + defaultPath;
return defaultPath; return defaultPath;
......
...@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify; ...@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
public class XmlEmbeddedWebApplicationContextTests { public class XmlEmbeddedWebApplicationContextTests {
private static final String PATH = XmlEmbeddedWebApplicationContextTests.class private static final String PATH = XmlEmbeddedWebApplicationContextTests.class
.getPackage().getName().replace(".", "/") + "/"; .getPackage().getName().replace('.', '/') + "/";
private static final String FILE = "exampleEmbeddedWebApplicationConfiguration.xml"; private static final String FILE = "exampleEmbeddedWebApplicationConfiguration.xml";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment