Adapt to change in esodata

10 files changed, 33 insertions, 34 deletions

diff --git a/base/src/main/java/bjc/utils/cli/GenericCommandMode.java b/base/src/main/java/bjc/utils/cli/GenericCommandMode.java
index 328bbee..a96a8f0 100644
--- a/base/src/main/java/bjc/utils/cli/GenericCommandMode.java
+++ b/base/src/main/java/bjc/utils/cli/GenericCommandMode.java
@@ -102,9 +102,9 @@ public class GenericCommandMode implements CommandMode {
 
 			/* Get the alias. */
 			if (defaultHandlers.containsKey(commandName)) {
-				aliasedCommand = defaultHandlers.get(commandName).aliased();
+				aliasedCommand = defaultHandlers.get(commandName).get().aliased();
 			} else {
-				aliasedCommand = commandHandlers.get(commandName).aliased();
+				aliasedCommand = commandHandlers.get(commandName).get().aliased();
 			}
 
 			commandHandlers.put(aliasName, aliasedCommand);
@@ -262,16 +262,16 @@ public class GenericCommandMode implements CommandMode {
 	private void doHelpCommand(final String commandName) {
 		if (commandHandlers.containsKey(commandName)) {
 			final String desc
-					= commandHandlers.get(commandName).getHelp().getDescription();
+					= commandHandlers.get(commandName).get().getHelp().getDescription();
 
 			normalOutput.accept("\n" + desc);
 		} else if (defaultHandlers.containsKey(commandName)) {
 			final String desc
-					= defaultHandlers.get(commandName).getHelp().getDescription();
+					= defaultHandlers.get(commandName).get().getHelp().getDescription();
 
 			normalOutput.accept("\n" + desc);
 		} else if (helpTopics.containsKey(commandName)) {
-			normalOutput.accept("\n" + helpTopics.get(commandName).getDescription());
+			normalOutput.accept("\n" + helpTopics.get(commandName).get().getDescription());
 		} else {
 			String msg = String.format("ERROR: No help available for '%s'", commandName);
 
@@ -371,9 +371,9 @@ public class GenericCommandMode implements CommandMode {
 		normalOutput.accept("\n");
 
 		if (defaultHandlers.containsKey(command))
-			return defaultHandlers.get(command).getHandler().handle(args);
+			return defaultHandlers.get(command).get().getHandler().handle(args);
 		else if (commandHandlers.containsKey(command))
-			return commandHandlers.get(command).getHandler().handle(args);
+			return commandHandlers.get(command).get().getHandler().handle(args);
 		else {
 			if (args != null) {
 				String argString = String.join(", ", args);
diff --git a/base/src/main/java/bjc/utils/components/FileComponentRepository.java b/base/src/main/java/bjc/utils/components/FileComponentRepository.java
index 82d2770..6e6e604 100644
--- a/base/src/main/java/bjc/utils/components/FileComponentRepository.java
+++ b/base/src/main/java/bjc/utils/components/FileComponentRepository.java
@@ -116,7 +116,7 @@ public class FileComponentRepository<ComponentType extends IDescribedComponent>
 
 	@Override
 	public ComponentType getByName(final String name) {
-		return components.get(name);
+		return components.get(name).get();
 	}
 
 	@Override
diff --git a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
index ec3911e..bba0867 100644
--- a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
+++ b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
@@ -47,7 +47,7 @@ public class MemoryComponentRepository<ComponentType extends IDescribedComponent
 
 	@Override
 	public ComponentType getByName(String name) {
-		return repo.get(name);
+		return repo.get(name).get();
 	}
 
 	@Override
diff --git a/base/src/main/java/bjc/utils/funcutils/TreeUtils.java b/base/src/main/java/bjc/utils/funcutils/TreeUtils.java
index 1b5c821..59f60a2 100644
--- a/base/src/main/java/bjc/utils/funcutils/TreeUtils.java
+++ b/base/src/main/java/bjc/utils/funcutils/TreeUtils.java
@@ -87,6 +87,9 @@ public class TreeUtils {
 	public static <ContainedType> ITree<ContainedType> substitute(
 			ITree<ContainedType> tree,
 			IMap<ContainedType, ITree<ContainedType>> environment) {
-		return substitute(tree, environment::containsKey, environment::get);
+		return substitute(
+				tree,
+				environment::containsKey,
+				(element) -> environment.get(element).get());
 	}
 }
diff --git a/base/src/main/java/bjc/utils/gen/WeightedGrammar.java b/base/src/main/java/bjc/utils/gen/WeightedGrammar.java
index 324a80c..540efbc 100644
--- a/base/src/main/java/bjc/utils/gen/WeightedGrammar.java
+++ b/base/src/main/java/bjc/utils/gen/WeightedGrammar.java
@@ -118,7 +118,7 @@ public class WeightedGrammar<E> {
 			throw new NullPointerException("Case body must not be null");
 		}
 
-		rules.get(ruleName).addProbability(probability, cse);
+		rules.get(ruleName).get().addProbability(probability, cse);
 	}
 
 	/**
@@ -143,7 +143,7 @@ public class WeightedGrammar<E> {
 			return false;
 
 		if (subgrammars.containsKey(name)) {
-			subgrammars.put(alias, subgrammars.get(name));
+			subgrammars.put(alias, subgrammars.get(name).get());
 			return true;
 		}
 
@@ -261,7 +261,7 @@ public class WeightedGrammar<E> {
 
 		final IList<IList<E>> returnedList = new FunctionalList<>();
 
-		final WeightedRandom<IList<E>> ruleGenerator = rules.get(ruleName);
+		final WeightedRandom<IList<E>> ruleGenerator = rules.get(ruleName).get();
 
 		for (int i = 0; i < 10; i++) {
 			returnedList.add(ruleGenerator.generateValue());
@@ -313,7 +313,7 @@ public class WeightedGrammar<E> {
 		 */
 		for (final E initRule : genRules.toIterable()) {
 			if (specialRules.containsKey(initRule)) {
-				for (final E rulePart : specialRules.get(initRule).get().toIterable()) {
+				for (final E rulePart : specialRules.get(initRule).get().get().toIterable()) {
 					final Iterable<T> generatedRuleParts
 							= generateGenericValues(rulePart, tokenTransformer, spacer)
 									.toIterable();
@@ -324,7 +324,7 @@ public class WeightedGrammar<E> {
 					}
 				}
 			} else if (subgrammars.containsKey(initRule)) {
-				final Iterable<T> ruleParts = subgrammars.get(initRule)
+				final Iterable<T> ruleParts = subgrammars.get(initRule).get()
 						.generateGenericValues(initRule, tokenTransformer, spacer)
 						.toIterable();
 
@@ -334,7 +334,7 @@ public class WeightedGrammar<E> {
 				}
 			} else if (rules.containsKey(initRule)) {
 				final Iterable<E> ruleParts
-						= rules.get(initRule).generateValue().toIterable();
+						= rules.get(initRule).get().generateValue().toIterable();
 
 				for (final E rulePart : ruleParts) {
 					final Iterable<T> generatedRuleParts
@@ -422,7 +422,7 @@ public class WeightedGrammar<E> {
 		if (name == null)
 			throw new NullPointerException("Subgrammar name must not be null");
 
-		return subgrammars.get(name);
+		return subgrammars.get(name).get();
 	}
 
 	/**
@@ -471,7 +471,7 @@ public class WeightedGrammar<E> {
 			throw new IllegalArgumentException(
 					"Number of times to prefix must be positive.");
 
-		final WeightedRandom<IList<E>> rule = rules.get(ruleName);
+		final WeightedRandom<IList<E>> rule = rules.get(ruleName).get();
 
 		final IList<IPair<Integer, IList<E>>> newResults = new FunctionalList<>();
 
@@ -534,7 +534,7 @@ public class WeightedGrammar<E> {
 			throw new NullPointerException("Prefix token must not be null");
 		}
 
-		final WeightedRandom<IList<E>> rule = rules.get(ruleName);
+		final WeightedRandom<IList<E>> rule = rules.get(ruleName).get();
 
 		final IList<IPair<Integer, IList<E>>> newResults = new FunctionalList<>();
 
@@ -589,7 +589,7 @@ public class WeightedGrammar<E> {
 			throw new NullPointerException("Prefix token must not be null");
 		}
 
-		final WeightedRandom<IList<E>> rule = rules.get(ruleName);
+		final WeightedRandom<IList<E>> rule = rules.get(ruleName).get();
 
 		final IList<IPair<Integer, IList<E>>> newResults = new FunctionalList<>();
 
diff --git a/base/src/main/java/bjc/utils/graph/AdjacencyMap.java b/base/src/main/java/bjc/utils/graph/AdjacencyMap.java
index 804e232..46d27f5 100644
--- a/base/src/main/java/bjc/utils/graph/AdjacencyMap.java
+++ b/base/src/main/java/bjc/utils/graph/AdjacencyMap.java
@@ -147,7 +147,7 @@ public class AdjacencyMap<T> {
 
 		adjacency.forEach((sourceKey, sourceValue) -> {
 			sourceValue.forEach((targetKey, targetValue) -> {
-				final int inverseValue = adjacency.get(targetKey).get(sourceKey);
+				final int inverseValue = adjacency.get(targetKey).get().get(sourceKey).get();
 
 				if (targetValue != inverseValue) result.replace(false);
 			});
@@ -180,7 +180,7 @@ public class AdjacencyMap<T> {
 			throw new IllegalArgumentException(msg);
 		}
 
-		adjacency.get(source).put(target, weight);
+		adjacency.get(source).get().put(target, weight);
 	}
 
 	/**
diff --git a/base/src/main/java/bjc/utils/graph/Graph.java b/base/src/main/java/bjc/utils/graph/Graph.java
index 1e81fcf..88b0d08 100644
--- a/base/src/main/java/bjc/utils/graph/Graph.java
+++ b/base/src/main/java/bjc/utils/graph/Graph.java
@@ -79,7 +79,7 @@ public class Graph<T> {
 		if (!backing.containsKey(source)) backing.put(source, new FunctionalMap<T, Integer>());
 
 		/* Add the edge to the graph. */
-		backing.get(source).put(target, distance);
+		backing.get(source).get().put(target, distance);
 
 		/* Handle possible directed edges. */
 		if (!directed) {
@@ -87,7 +87,7 @@ public class Graph<T> {
 				backing.put(target, new FunctionalMap<T, Integer>());
 			}
 
-			backing.get(target).put(source, distance);
+			backing.get(target).get().put(source, distance);
 		}
 	}
 
@@ -128,7 +128,7 @@ public class Graph<T> {
 			throw new IllegalArgumentException("Vertex " + source + " is not in graph");
 		}
 
-		return backing.get(source);
+		return backing.get(source).get();
 	}
 
 	/**
@@ -247,7 +247,7 @@ public class Graph<T> {
 			throw new NoSuchElementException(msg);
 		}
 
-		backing.get(source).remove(target);
+		backing.get(source).get().remove(target);
 
 		/*
 		 * Uncomment this to turn the graph undirected
diff --git a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
index 2ce2591..bc19dd9 100644
--- a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
+++ b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java
@@ -270,7 +270,7 @@ public class RuleBasedConfigReader<E> {
 			/*
 			 * Handle pragmas
 			 */
-			pragmas.getOrDefault(token, (tokenzer, stat) -> {
+			pragmas.get(token).orElse((tokenzer, stat) -> {
 				throw new UnknownPragma("Unknown pragma " + token);
 			}).accept(tokenizer, state);
 		} else {
diff --git a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
index 8d61b4a..ac82388 100644
--- a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
+++ b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
@@ -138,8 +138,8 @@ public class ShuntingYard<TokenType> {
 		/*
 		 * Get the precedence of operators
 		 */
-		final int rightPrecedence = operators.get(right).getPrecedence();
-		final int leftPrecedence  = operators.get(left).getPrecedence();
+		final int rightPrecedence = operators.get(right).get().getPrecedence();
+		final int leftPrecedence  = operators.get(left).get().getPrecedence();
 
 		/*
 		 * Evaluate what we were asked
diff --git a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
index 195c1f1..a73ac88 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
@@ -143,11 +143,7 @@ public class SequenceDelimiter<T> {
 				if (isForbidden(groupStack, forbiddenDelimiters, possibleOpen)) {
 					T forbiddenBy;
 
-					if (whoForbid.containsKey(tok)) {
-						forbiddenBy = whoForbid.get(tok);
-					} else {
-						forbiddenBy = groupStack.top().getName();
-					}
+					forbiddenBy = whoForbid.get(tok).orElse(groupStack.top().getName());
 
 					final String ctxList
 							= StringUtils.toEnglishList(groupStack.toArray(), "then");