diff --git a/src/main/java/org/springframework/hateoas/client/JsonPathLinkDiscoverer.java b/src/main/java/org/springframework/hateoas/client/JsonPathLinkDiscoverer.java
index 56d6502e..5fcdca34 100644
--- a/src/main/java/org/springframework/hateoas/client/JsonPathLinkDiscoverer.java
+++ b/src/main/java/org/springframework/hateoas/client/JsonPathLinkDiscoverer.java
@@ -166,7 +166,7 @@ public class JsonPathLinkDiscoverer implements LinkDiscoverer {
 			JSONArray jsonArray = (JSONArray) parseResult;
 
 			return jsonArray.stream() //
-					.flatMap(it -> JSONArray.class.isInstance(it) ? ((JSONArray) it).stream() : Stream.of(it)) //
+					.flatMap(it -> it instanceof JSONArray ? ((JSONArray) it).stream() : Stream.of(it)) //
 					.map(it -> extractLink(it, rel)) //
 					.collect(Collectors.collectingAndThen(Collectors.toList(), Links::of));
 		}
diff --git a/src/main/java/org/springframework/hateoas/client/Traverson.java b/src/main/java/org/springframework/hateoas/client/Traverson.java
index db8cb907..d9011982 100644
--- a/src/main/java/org/springframework/hateoas/client/Traverson.java
+++ b/src/main/java/org/springframework/hateoas/client/Traverson.java
@@ -70,7 +70,7 @@ public class Traverson {
 				Traverson.class.getClassLoader());
 
 		Assert.isTrue(ALL_DEFAULTS.size() == 1,
-				() -> String.format("Expected to find only one TraversonDefaults instance, but found: ", //
+				() -> String.format("Expected to find only one TraversonDefaults instance, but found: %s", //
 						ALL_DEFAULTS.stream() //
 								.map(Object::getClass) //
 								.map(Class::getName) //
diff --git a/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java b/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java
index 259eb887..41d5b56e 100644
--- a/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java
+++ b/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java
@@ -54,7 +54,7 @@ class HypermediaConfigurationImportSelector implements ImportSelector {
 
 		// No additional filtering needed.
 		if (types.isEmpty()) {
-			return configurationProviders.toArray(new String[configurationProviders.size()]);
+			return configurationProviders.toArray(new String[0]);
 		}
 
 		// Filter the ones supporting the given media types
diff --git a/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java
index 3bdc985b..fcbe548f 100644
--- a/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java
+++ b/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java
@@ -110,7 +110,7 @@ class WebMvcHateoasConfiguration {
 		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 
-			if (!RestTemplate.class.isInstance(bean)) {
+			if (!(bean instanceof RestTemplate)) {
 				return bean;
 			}
 
diff --git a/src/main/java/org/springframework/hateoas/config/WebStackImportSelector.java b/src/main/java/org/springframework/hateoas/config/WebStackImportSelector.java
index 37b0b3a2..31abfd52 100644
--- a/src/main/java/org/springframework/hateoas/config/WebStackImportSelector.java
+++ b/src/main/java/org/springframework/hateoas/config/WebStackImportSelector.java
@@ -46,6 +46,6 @@ class WebStackImportSelector implements ImportSelector {
 			imports.add("org.springframework.hateoas.config.WebFluxHateoasConfiguration");
 		}
 
-		return imports.toArray(new String[imports.size()]);
+		return imports.toArray(new String[0]);
 	}
 }
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonLinkDiscoverer.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonLinkDiscoverer.java
index 2335a277..3a22c9d7 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonLinkDiscoverer.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonLinkDiscoverer.java
@@ -120,7 +120,7 @@ public class CollectionJsonLinkDiscoverer extends JsonPathLinkDiscoverer {
 		return findSelfLink(representation) //
 				.map(Links::of) //
 				.map(it -> it.and(links)) //
-				.orElseGet(() -> links);
+				.orElse(links);
 	}
 
 	private Links addSelfLink(Links links, InputStream representation) {
@@ -128,7 +128,7 @@ public class CollectionJsonLinkDiscoverer extends JsonPathLinkDiscoverer {
 		return findSelfLink(representation) //
 				.map(Links::of) //
 				.map(it -> it.and(links)) //
-				.orElseGet(() -> links);
+				.orElse(links);
 	}
 
 	/**
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
index 8f864c1a..3af4e1e5 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
@@ -798,7 +798,7 @@ class Jackson2CollectionJsonModule extends SimpleModule {
 
 		return resources.getContent().stream().map(content -> {
 
-			if (!EntityModel.class.isInstance(content)) {
+			if (!(content instanceof EntityModel)) {
 				return new CollectionJsonItem<>().withRawData(content);
 			}
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkDiscoverer.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkDiscoverer.java
index 5dd7ee99..2ae20518 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkDiscoverer.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkDiscoverer.java
@@ -51,7 +51,7 @@ public class HalLinkDiscoverer extends JsonPathLinkDiscoverer {
 	@SuppressWarnings("unchecked")
 	protected Link extractLink(Object element, LinkRelation rel) {
 
-		if (!Map.class.isInstance(element)) {
+		if (!(element instanceof Map)) {
 			return super.extractLink(element, rel);
 		}
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkRelation.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkRelation.java
index fa032df7..2eda4064 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkRelation.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkRelation.java
@@ -58,8 +58,8 @@ public class HalLinkRelation implements LinkRelation, MessageSourceResolvable {
 
 		Assert.notNull(relation, "LinkRelation must not be null!");
 
-		if (HalLinkRelation.class.isInstance(relation)) {
-			return HalLinkRelation.class.cast(relation);
+		if (relation instanceof HalLinkRelation) {
+			return (HalLinkRelation) relation;
 		}
 
 		return of(relation.value());
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java
index 2c730b64..dd1abc6d 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java
@@ -431,12 +431,12 @@ public class Jackson2HalModule extends SimpleModule {
 
 			Object firstElement = list.get(0);
 
-			if (!HalLink.class.isInstance(firstElement)) {
+			if (!(firstElement instanceof HalLink)) {
 				serializeContents(list, jgen, provider);
 				return;
 			}
 
-			HalLink halLink = HalLink.class.cast(firstElement);
+			HalLink halLink = (HalLink) firstElement;
 
 			if (list.size() == 1 && halConfiguration.getSingleLinkRenderModeFor(halLink.getLink().getRel())
 					.equals(RenderSingleLinks.AS_SINGLE)) {
diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java b/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java
index cd7a88af..b5c1d594 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java
@@ -150,7 +150,7 @@ class UberData {
 	/**
 	 * Simple scalar types that can be encoded by value, not type.
 	 */
-	private final static HashSet<Class<?>> PRIMITIVE_TYPES = new HashSet<>(Arrays.asList(String.class));
+	private final static HashSet<Class<?>> PRIMITIVE_TYPES = new HashSet<>(Collections.singletonList(String.class));
 
 	/**
 	 * Set of all Spring HATEOAS resource types.
diff --git a/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java b/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java
index b483b556..4022e199 100644
--- a/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java
+++ b/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java
@@ -38,7 +38,7 @@ public class UriTemplateFactory {
 	 * @param mapping must not be {@literal null} or empty.
 	 * @return
 	 */
-	public static UriTemplate templateFor(@Nullable String mapping) {
+	public static UriTemplate templateFor(String mapping) {
 
 		Assert.hasText(mapping, "Mapping must not be null or empty!");
 
diff --git a/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java b/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java
index 6513aa93..3190f69b 100644
--- a/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java
+++ b/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java
@@ -128,7 +128,7 @@ public class RepresentationModelProcessorInvoker {
 			}
 		}
 
-		return (T) invokeProcessorsFor(Object.class.cast(value), referenceType);
+		return (T) invokeProcessorsFor((Object) value, referenceType);
 	}
 
 	/**