From ef5cd3f7c74036122e927d2470ae16ffd6343ebb Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Tue, 5 Jan 2021 15:30:09 -0800
Subject: [PATCH 1/2] Fix WebServer Basics example. Remove uneeded guava dep.

---
 examples/webserver/basics/pom.xml                             | 4 ----
 .../main/java/io/helidon/webserver/examples/basics/Main.java  | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/webserver/basics/pom.xml b/examples/webserver/basics/pom.xml
index 13b2e77e4fd..ff0f1af2542 100644
--- a/examples/webserver/basics/pom.xml
+++ b/examples/webserver/basics/pom.xml
@@ -52,10 +52,6 @@
             <groupId>io.helidon.media</groupId>
             <artifactId>helidon-media-jsonp</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java b/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java
index be9f3353718..83adde9dcd5 100644
--- a/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java
+++ b/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java
@@ -107,7 +107,7 @@ protected void startServer(Routing routing, MediaContext mediaContext) {
      * @param routing the routing to drive by WebServer instance
      */
     protected void startServer(Routing routing) {
-        startServer(routing, null);
+        startServer(routing, MediaContext.create());
     }
 
     /**
@@ -328,7 +328,7 @@ public void help() {
         hlp.append("Example method names:\n");
         Method[] methods = Main.class.getDeclaredMethods();
         for (Method method : methods) {
-            if (!Modifier.isPrivate(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())) {
+            if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())) {
                 hlp.append("    ").append(method.getName()).append('\n');
             }
         }

From d451e936341fe2c5ed1649f77bfd18a563e79c11 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Tue, 5 Jan 2021 15:31:56 -0800
Subject: [PATCH 2/2] Fix copyright

---
 examples/webserver/basics/pom.xml                               | 2 +-
 .../main/java/io/helidon/webserver/examples/basics/Main.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/webserver/basics/pom.xml b/examples/webserver/basics/pom.xml
index ff0f1af2542..1e248ebb737 100644
--- a/examples/webserver/basics/pom.xml
+++ b/examples/webserver/basics/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java b/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java
index 83adde9dcd5..5f3a12fa172 100644
--- a/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java
+++ b/examples/webserver/basics/src/main/java/io/helidon/webserver/examples/basics/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.