Less guava usage

Easily replaced with standard Java API
eclipse-mylyn · Jan 17, 2023 · 4fd84e3 · 4fd84e3
1 parent 409a08f
commit 4fd84e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/...wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java b/...wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2021 Tasktop Technologies and others.
+ * Copyright (c) 2013, 2023 Tasktop Technologies and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -24,8 +24,6 @@
 
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
 
-import com.google.common.collect.ImmutableList;
-
 class BlockStrategies extends ElementStrategies<BlockType, BlockStrategy, HtmlElementStrategy<BlockType>> {
 
 	private static final Map<BlockType, List<BlockType>> blockTypeToAlternatives = createBlockTypeToAlternatives();
@@ -58,7 +56,7 @@ private static void addAlternatives(Map<BlockType, List<BlockType>> alternatives
 			BlockType... blockTypes) {
 		checkState(!alternatives.containsKey(blockType), "Duplicate %s", blockType); //$NON-NLS-1$
 		checkArgument(blockTypes.length > 0);
-		alternatives.put(blockType, ImmutableList.copyOf(blockTypes));
+		alternatives.put(blockType, List.of(blockTypes));
 	}
 
 	BlockStrategies(Set<BlockType> blockTypes) {

diff --git a/....wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java b/....wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2021 Tasktop Technologies and others.
+ * Copyright (c) 2013, 2023 Tasktop Technologies and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -32,7 +32,6 @@
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 
 public class SpanStrategies extends ElementStrategies<SpanType, SpanStrategy, SpanHtmlElementStrategy> {
 
@@ -54,7 +53,7 @@ private static void addAlternatives(Map<SpanType, List<SpanType>> alternatives,
 			SpanType... spanTypes) {
 		checkState(!alternatives.containsKey(spanType), "Duplicate %s", spanType); //$NON-NLS-1$
 		checkArgument(spanTypes.length > 0);
-		alternatives.put(spanType, ImmutableList.copyOf(spanTypes));
+		alternatives.put(spanType, List.of(spanTypes));
 	}
 
 	SpanStrategies(Set<SpanType> elementTypes, List<SpanHtmlElementStrategy> spanElementStrategies) {

diff --git a/...ava/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java b/...ava/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 David Green and others.
+ * Copyright (c) 2007, 2023 David Green and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -20,8 +20,6 @@
 import org.eclipse.mylyn.wikitext.parser.markup.PatternBasedElement;
 import org.eclipse.mylyn.wikitext.parser.markup.PatternBasedElementProcessor;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * @author David Green
  */
@@ -35,7 +33,7 @@ private static class SimplePhraseModifierProcessor extends PatternBasedElementPr
 		private final boolean nesting;
 
 		public SimplePhraseModifierProcessor(SpanType[] spanType, boolean nesting) {
-			this.spanType = ImmutableList.copyOf(spanType);
+			this.spanType = List.of(spanType);
 			this.nesting = nesting;
 		}
 

diff --git a/...ikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java b/...ikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2014 David Green and others.
+ * Copyright (c) 2007, 2023 David Green and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -32,8 +32,6 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.google.common.collect.ImmutableList;
-
 public class HtmlParserTest {
 	static class EndEvent {
 
@@ -239,7 +237,7 @@ public void endSpan() {
 			}
 		};
 		parse(content, builder);
-		assertEquals(ImmutableList.copyOf(expectedEventTypes), actualEventTypes);
+		assertEquals(List.of(expectedEventTypes), actualEventTypes);
 	}
 
 	@Test