Skip to content

Commit

Permalink
javadoc; minor
Browse files Browse the repository at this point in the history
  • Loading branch information
mvysny committed Sep 18, 2024
1 parent 2788cde commit 035e6f7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build
out

!**/src/main/dev-bundle/webapp/VAADIN/build
.kotlin
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ public static URL findWebRoot() throws MalformedURLException {
* The `webapp` folder is being served from a resources folder, or from a jar file.
* @param webRoot the `webapp` folder resource as detected by {@link #findWebRoot()}.
* @return the jar file or a directory from which the class files are being served.
* @throws IOException on i/o error
*/
@NotNull
public static File findResourcesJarOrFolder(@NotNull URL webRoot) throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,24 @@ public class TomcatWebServer implements WebServer {
* The outcome of {@link Env#findResourcesJarOrFolder(URL)}.
*/
protected volatile File resourcesJarOrFolder;
/**
* Cached outcome of {@link Env#findWebRoot()}.
*/
protected volatile URL webRoot;

/**
* Returns the Tomcat {@link Context} object. Fails if {@link #configure(VaadinBootBase)} wasn't called yet.
* @return Tomcat {@link Context} object.
*/
@NotNull
public Context getContext() {
return Objects.requireNonNull(context);
}

/**
* Returns the Tomcat embedded server. Fails if {@link #configure(VaadinBootBase)} wasn't called yet.
* @return the Tomcat embedded server.
*/
@NotNull
public Tomcat getServer() {
return Objects.requireNonNull(server);
Expand Down Expand Up @@ -97,6 +108,7 @@ public void await() throws InterruptedException {
/**
* Creates the Tomcat {@link Context}.
* @return the {@link Context}
* @throws IOException on i/o error
*/
@NotNull
protected Context createWebAppContext(@NotNull VaadinBootBase<?> configuration) throws IOException {
Expand Down

0 comments on commit 035e6f7

Please sign in to comment.