Polish 'Add ANSI 8-bit color support'

See gh-18264

Author: philwebb

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java

@@ -28,7 +28,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.boot.ansi.Ansi256PropertySource;
 import org.springframework.boot.ansi.AnsiPropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
@@ -82,7 +81,6 @@ protected List<PropertyResolver> getPropertyResolvers(Environment environment, C
 		resolvers.add(environment);
 		resolvers.add(getVersionResolver(sourceClass));
 		resolvers.add(getAnsiResolver());
-		resolvers.add(getAnsi256Resolver());
 		resolvers.add(getTitleResolver(sourceClass));
 		return resolvers;
 	}
@@ -126,12 +124,6 @@ private PropertyResolver getAnsiResolver() {
 		return new PropertySourcesPropertyResolver(sources);
 	}
 
-	private PropertyResolver getAnsi256Resolver() {
-		MutablePropertySources sources = new MutablePropertySources();
-		sources.addFirst(new Ansi256PropertySource("ansi256"));
-		return new PropertySourcesPropertyResolver(sources);
-	}
-
 	private PropertyResolver getTitleResolver(Class<?> sourceClass) {
 		MutablePropertySources sources = new MutablePropertySources();
 		String applicationTitle = getApplicationTitle(sourceClass);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/Ansi256Color.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.ansi;
+
+import org.springframework.util.Assert;
+
+/**
+ * {@link AnsiElement} implementation for ANSI 8-bit foreground or background color codes.
+ *
+ * @author Toshiaki Maki
+ * @author Phillip Webb
+ * @since 2.2.0
+ * @see #foreground(int)
+ * @see #background(int)
+ */
+public final class Ansi8BitColor implements AnsiElement {
+
+	private final String prefix;
+
+	private final int code;
+
+	/**
+	 * Create a new {@link Ansi8BitColor} instance.
+	 * @param prefix the prefix escape chars
+	 * @param code color code (must be 0-255)
+	 * @throws IllegalArgumentException if color code is not between 0 and 255.
+	 */
+	private Ansi8BitColor(String prefix, int code) {
+		Assert.isTrue(code >= 0 && code <= 255, "Code must be between 0 and 255");
+		this.prefix = prefix;
+		this.code = code;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null || getClass() != obj.getClass()) {
+			return false;
+		}
+		Ansi8BitColor other = (Ansi8BitColor) obj;
+		return this.prefix.equals(other.prefix) && this.code == other.code;
+	}
+
+	@Override
+	public int hashCode() {
+		return this.prefix.hashCode() * 31 + this.code;
+	}
+
+	@Override
+	public String toString() {
+		return this.prefix + this.code;
+	}
+
+	/**
+	 * Return a foreground ANSI color code instance for the given code.
+	 * @param code the color code
+	 * @return an ANSI color code instance
+	 */
+	public static Ansi8BitColor foreground(int code) {
+		return new Ansi8BitColor("38;5;", code);
+	}
+
+	/**
+	 * Return a background ANSI color code instance for the given code.
+	 * @param code the color code
+	 * @return an ANSI color code instance
+	 */
+	public static Ansi8BitColor background(int code) {
+		return new Ansi8BitColor("48;5;", code);
+	}
+
+}