Commit 91fff910 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #19540 from jason-liu475

* pr/19540:
  Polish "Make equality checks defensive to null reference"
  Make equality checks defensive to null reference

Closes gh-19540
parents e87ed08e 8b8a4ee6
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -102,7 +102,7 @@ public abstract class ResourceUtils { ...@@ -102,7 +102,7 @@ public abstract class ResourceUtils {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
for (Resource resource : resources) { for (Resource resource : resources) {
if (resource.exists()) { if (resource.exists()) {
if (resource.getURI().getScheme().equals("file") && resource.getFile().isDirectory()) { if ("file".equals(resource.getURI().getScheme()) && resource.getFile().isDirectory()) {
result.addAll(getChildFiles(resource)); result.addAll(getChildFiles(resource));
continue; continue;
} }
...@@ -124,7 +124,7 @@ public abstract class ResourceUtils { ...@@ -124,7 +124,7 @@ public abstract class ResourceUtils {
} }
private static String absolutePath(Resource resource) throws IOException { private static String absolutePath(Resource resource) throws IOException {
if (!resource.getURI().getScheme().equals("file")) { if (!"file".equals(resource.getURI().getScheme())) {
return resource.getURL().toExternalForm(); return resource.getURL().toExternalForm();
} }
return resource.getFile().getAbsoluteFile().toURI().toString(); return resource.getFile().getAbsoluteFile().toURI().toString();
......
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -61,7 +61,7 @@ class RestDocsWebTestClientBuilderCustomizer implements WebTestClientBuilderCust ...@@ -61,7 +61,7 @@ class RestDocsWebTestClientBuilderCustomizer implements WebTestClientBuilderCust
if (port == null) { if (port == null) {
return true; return true;
} }
return (scheme.equals("http") && port == 80) || (scheme.equals("https") && port == 443); return ("http".equals(scheme) && port == 80) || ("https".equals(scheme) && port == 443);
} }
} }
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