This is an automated email from the ASF dual-hosted git repository.
ggregory 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 4fef111fc Tabs -> spaces
4fef111fc is described below
commit 4fef111fc8369c1a7cbff8590c45f2590cb41ed1
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Jun 6 12:39:43 2025 -0400
Tabs -> spaces
---
.../microservice/jetty/JettyMicroservice.java | 92 +++++++++++-----------
1 file changed, 46 insertions(+), 46 deletions(-)
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 261d0bebc..93a4db136 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
@@ -179,58 +179,58 @@ public class JettyMicroservice extends Microservice {
return new Builder(this);
}
- /**
- * Specifies the contents or location of the <c>jetty.xml</c>
file used by the Jetty server.
- *
- * <p>
- * If you do not specify this value, it is pulled from the
following in the specified order:
- * <ul class='spaced-list'>
- * <li>
- * <c>Jetty/config</c> setting in the config file.
- * <c>Jetty-Config</c> setting in the manifest
file.
- * </ul>
- *
- * <p>
- * By default, we look for the <c>jetty.xml</c> file in the
following locations:
- * <ul class='spaced-list'>
- * <li><c>jetty.xml</c> in home directory.
- * <li><c>files/jetty.xml</c> in home directory.
- * <li><c>/jetty.xml</c> in classpath.
- * <li><c>/files/jetty.xml</c> in classpath.
- * </ul>
- *
- * @param jettyXml
- * The contents or location of the file.
- * <br>Can be any of the following:
- * <ul>
- * <li>{@link String} - Relative path to file on
file system or classpath.
+ /**
+ * Specifies the contents or location of the <c>jetty.xml</c> file
used by the Jetty server.
+ *
+ * <p>
+ * If you do not specify this value, it is pulled from the following
in the specified order:
+ * <ul class='spaced-list'>
+ * <li>
+ * <c>Jetty/config</c> setting in the config file.
+ * <c>Jetty-Config</c> setting in the manifest file.
+ * </ul>
+ *
+ * <p>
+ * By default, we look for the <c>jetty.xml</c> file in the following
locations:
+ * <ul class='spaced-list'>
+ * <li><c>jetty.xml</c> in home directory.
+ * <li><c>files/jetty.xml</c> in home directory.
+ * <li><c>/jetty.xml</c> in classpath.
+ * <li><c>/files/jetty.xml</c> in classpath.
+ * </ul>
+ *
+ * @param jettyXml
+ * The contents or location of the file.
+ * <br>Can be any of the following:
+ * <ul>
+ * <li>{@link String} - Relative path to file on file system or
classpath.
* <li>{@link File} - File on file system.
* <li>{@link Path} - Path on file system.
- * <li>{@link InputStream} - Raw contents as
<c>UTF-8</c> encoded stream.
- * <li>{@link Reader} - Raw contents.
- * </ul>
- *
- * @param resolveVars
- * If <jk>true</jk>, SVL variables in the file will
automatically be resolved.
- * @return This object.
- * @throws IOException Thrown by underlying stream.
- */
- public Builder jettyXml(Object jettyXml, boolean resolveVars)
throws IOException {
- if (jettyXml instanceof String)
- this.jettyXml =
read(resolveFile(jettyXml.toString()));
+ * <li>{@link InputStream} - Raw contents as <c>UTF-8</c> encoded
stream.
+ * <li>{@link Reader} - Raw contents.
+ * </ul>
+ *
+ * @param resolveVars
+ * If <jk>true</jk>, SVL variables in the file will automatically
be resolved.
+ * @return This object.
+ * @throws IOException Thrown by underlying stream.
+ */
+ public Builder jettyXml(Object jettyXml, boolean resolveVars) throws
IOException {
+ if (jettyXml instanceof String)
+ this.jettyXml = read(resolveFile(jettyXml.toString()));
else if (jettyXml instanceof File file)
this.jettyXml = read(file);
else if (jettyXml instanceof Path path)
this.jettyXml = read(path);
- else if (jettyXml instanceof InputStream inputStream)
- this.jettyXml = read(inputStream);
- else if (jettyXml instanceof Reader reader)
- this.jettyXml = read(reader);
- else
- throw new BasicRuntimeException("Invalid object
type passed to jettyXml(Object): {0}", className(jettyXml));
- this.jettyXmlResolveVars = resolveVars;
- return this;
- }
+ else if (jettyXml instanceof InputStream inputStream)
+ this.jettyXml = read(inputStream);
+ else if (jettyXml instanceof Reader reader)
+ this.jettyXml = read(reader);
+ else
+ throw new BasicRuntimeException("Invalid object type passed to
jettyXml(Object): {0}", className(jettyXml));
+ this.jettyXmlResolveVars = resolveVars;
+ return this;
+ }
/**
* Specifies the ports to use for the web server.
