From 3bbd89506ef62ae572f5363354b73bc1f2ea5e5e Mon Sep 17 00:00:00 2001
From: Eric Bottard <ebottard@gopivotal.com>
Date: Wed, 1 Jul 2015 11:37:44 +0200
Subject: [PATCH] SHL-158: Don't aggressively remove spaces

---
 .../shell/core/SimpleParser.java              | 12 +---
 .../shell/core/SimpleParserTest.java          | 68 -------------------
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 src/test/java/org/springframework/shell/core/SimpleParserTest.java

diff --git a/src/main/java/org/springframework/shell/core/SimpleParser.java b/src/main/java/org/springframework/shell/core/SimpleParser.java
index a28a5120..bdb5b76c 100644
--- a/src/main/java/org/springframework/shell/core/SimpleParser.java
+++ b/src/main/java/org/springframework/shell/core/SimpleParser.java
@@ -114,7 +114,7 @@ public class SimpleParser implements Parser {
 	public ParseResult parse(final String rawInput) {
 		synchronized (mutex) {
 			Assert.notNull(rawInput, "Raw input required");
-			final String input = normalise(rawInput);
+			final String input = rawInput.trim();
 
 			resetCompletionInvocations();
 
@@ -415,16 +415,6 @@ public class SimpleParser implements Parser {
 
 	}
 
-	/**
-	 * Normalises the given raw user input string ready for parsing
-	 * @param rawInput the string to normalise; can't be <code>null</code>
-	 * @return a non-<code>null</code> string
-	 */
-	String normalise(final String rawInput) {
-		// Replace all multiple spaces with a single space and then trim
-		return rawInput.replaceAll(" +", " ").trim();
-	}
-
 	private Set<String> getSpecifiedUnavailableOptions(final Set<CliOption> cliOptions,
 	                                                   final Map<String, String> options) {
 		Set<String> cliOptionKeySet = new LinkedHashSet<String>();
diff --git a/src/test/java/org/springframework/shell/core/SimpleParserTest.java b/src/test/java/org/springframework/shell/core/SimpleParserTest.java
deleted file mode 100644
index db0a8f51..00000000
--- a/src/test/java/org/springframework/shell/core/SimpleParserTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011-2012 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
- * 
- *      http://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.shell.core;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.shell.core.SimpleParser;
-
-/**
- * Unit test of {@link SimpleParser}
- *
- * @author Andrew Swan
- * @since 1.2.0
- */
-public class SimpleParserTest {
-
-	// Fixture
-	private SimpleParser simpleParser;
-
-	@Before
-	public void setUp() {
-		this.simpleParser = new SimpleParser();
-	}
-
-	@Test
-	public void testNormaliseEmptyString() {
-		assertNormalised("", "");
-	}
-
-	@Test
-	public void testNormaliseSpaces() {
-		assertNormalised("    ", "");
-	}
-
-	@Test
-	public void testNormaliseSingleWord() {
-		assertNormalised("hint", "hint");
-	}
-
-	@Test
-	public void testNormaliseMultipleWords() {
-		assertNormalised(" security   setup ", "security setup");
-	}
-
-	/**
-	 * Asserts that normalising the given input produces the given output
-	 *
-	 * @param input can't be <code>null</code>
-	 * @param output
-	 */
-	private void assertNormalised(final String input, final String output) {
-		Assert.assertEquals(output, simpleParser.normalise(input));
-	}
-}