This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 14fd50d Collections usage optimizations
14fd50d is described below
commit 14fd50d7c0d5e2ed050806fe634f4103409693a6
Author: JamesBognar <[email protected]>
AuthorDate: Thu Mar 17 13:24:46 2022 -0400
Collections usage optimizations
---
.../juneau/microservice/console/HelpCommand.java | 3 +--
.../juneau/microservice/resources/LogParser.java | 8 ++++----
.../juneau/microservice/jetty/JettyMicroservice.java | 20 +++++++++-----------
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
index 57b447c..46a51ca 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
@@ -61,8 +61,7 @@ public class HelpCommand extends ConsoleCommand {
Map<String,ConsoleCommand> commands =
Microservice.getInstance().getConsoleCommands();
if (args.size() == 1) {
out.println(mb.getString("ListOfAvailableCommands"));
- for (ConsoleCommand cc : commands.values())
- out.append("\t").append(cc.getName()).append("
-- ").append(indent(cc.getInfo())).println();
+ commands.forEach((k,v) ->
out.append("\t").append(v.getName()).append(" --
").append(indent(v.getInfo())).println());
out.println();
} else {
ConsoleCommand cc = commands.get(args.getArg(1));
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
index 0f440cf..7e1b310 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
@@ -127,8 +127,9 @@ public final class LogParser implements
Iterable<LogParser.Entry>, Iterator<LogP
try {
if (! hasNext())
w.append("[EMPTY]");
- else for (LogParser.Entry le : this)
- le.append(w);
+ else {
+ forEach(le -> safeRun(()->le.append(w)));
+ }
} finally {
close();
}
@@ -183,8 +184,7 @@ public final class LogParser implements
Iterable<LogParser.Entry>, Iterator<LogP
i += s.length() + 1;
StringBuilder sb = new StringBuilder(i);
sb.append(text);
- for (String s : additionalText)
- sb.append('\n').append(s);
+ additionalText.forEach(s -> sb.append('\n').append(s));
return sb.toString();
}
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 62c0d90..9c1f861 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.IOUtils.read;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.collections.JsonMap.*;
import java.io.*;
import java.net.*;
@@ -711,28 +712,25 @@ public class JettyMicroservice extends Microservice {
}
}
- for (Map.Entry<String,Object> e :
cf.get("Jetty/servletMap").asMap().orElse(JsonMap.EMPTY_MAP).entrySet()) {
+
cf.get("Jetty/servletMap").asMap().orElse(EMPTY_MAP).forEach((k,v) -> {
try {
- ClassInfo c =
ClassInfo.of(Class.forName(e.getValue().toString()));
+ ClassInfo c =
ClassInfo.of(Class.forName(v.toString()));
if (c.isChildOf(Servlet.class)) {
Servlet rs = (Servlet)c.newInstance();
- addServlet(rs, e.getKey());
+ addServlet(rs, k);
} else {
- throw runtimeException("Invalid servlet
specified in Jetty/servletMap. Must be a subclass of Servlet.", e.getValue());
+ throw runtimeException("Invalid servlet
specified in Jetty/servletMap. Must be a subclass of Servlet.", v);
}
} catch (ClassNotFoundException e1) {
throw new ExecutableException(e1);
}
- }
+ });
- for (Map.Entry<String,Object> e :
cf.get("Jetty/servletAttributes").asMap().orElse(JsonMap.EMPTY_MAP).entrySet())
- addServletAttribute(e.getKey(), e.getValue());
+
cf.get("Jetty/servletAttributes").asMap().orElse(EMPTY_MAP).forEach((k,v) ->
addServletAttribute(k, v));
- for (Map.Entry<String,Servlet> e : builder.servlets.entrySet())
- addServlet(e.getValue(), e.getKey());
+ builder.servlets.forEach((k,v) -> addServlet(v, k));
- for (Map.Entry<String,Object> e :
builder.servletAttributes.entrySet())
- addServletAttribute(e.getKey(), e.getValue());
+ builder.servletAttributes.forEach((k,v) ->
addServletAttribute(k, v));
if (System.getProperty("juneau.serverPort") == null)
System.setProperty("juneau.serverPort",
String.valueOf(availablePort));
