juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject juneau git commit: Fix javadocs
Date Mon, 01 Jan 2018 19:16:44 GMT
Repository: juneau
Updated Branches:
  refs/heads/master 81b4bba84 -> 3bf325a65


Fix javadocs

Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/3bf325a6
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/3bf325a6
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/3bf325a6

Branch: refs/heads/master
Commit: 3bf325a65bc8ceb03bea44784e9de41229070f9d
Parents: 81b4bba
Author: JamesBognar <jamesbognar@apache.org>
Authored: Mon Jan 1 14:16:41 2018 -0500
Committer: JamesBognar <jamesbognar@apache.org>
Committed: Mon Jan 1 14:16:41 2018 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/juneau/rest/RestServlet.java          | 2 +-
 .../src/main/java/org/apache/juneau/rest/annotation/HookEvent.java | 2 +-
 .../src/main/java/org/apache/juneau/rest/annotation/RestHook.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juneau/blob/3bf325a6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index 0bb51ce..e30ea16 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -154,7 +154,7 @@ public abstract class RestServlet extends HttpServlet {
 				throw new RestException(SC_INTERNAL_SERVER_ERROR, initException);
 			}
 			if (context == null)
-				throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} not initialized.  init(RestConfig)
was not called.  This can occur if you've overridden this method but didn't call super.init(RestConfig).",
getClass().getName());
+				throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} not initialized.  init(ServletConfig)
was not called.  This can occur if you've overridden this method but didn't call super.init(RestConfig).",
getClass().getName());
 			if (! isInitialized)
 				throw new RestException(SC_INTERNAL_SERVER_ERROR, "Servlet {0} has not been initialized",
getClass().getName());
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/3bf325a6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index 0f96080..dd6146e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -314,7 +314,7 @@ public enum HookEvent {
 	 * 		<jk>private</jk> Map<Integer,Pet> <jf>petDB</jf>;
 	 *
 	 * 		<ja>@RestHook</ja>(<jsf>INIT</jsf>)
-	 * 		<jk>public void</jk> onInit(RestConfig config) <jk>throws</jk>
Exception {
+	 * 		<jk>public void</jk> onInit(RestContextBuilder builder) <jk>throws</jk>
Exception {
 	 * 			<jc>// Load our database from a local JSON file.</jc>
 	 * 			<jf>petDB</jf> = JsonParser.<jsf>DEFAULT</jsf>.parse(getClass().getResourceAsStream(<js>"PetStore.json"</js>),
LinkedHashMap.<jk>class</jk>, Integer.<jk>class</jk>, Pet.<jk>class</jk>);
 	 * 		}

http://git-wip-us.apache.org/repos/asf/juneau/blob/3bf325a6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
index 828df43..c3bb713 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
@@ -31,7 +31,7 @@ import java.lang.annotation.*;
  * 		<jk>private</jk> Map&lt;Integer,Object&gt; <jf>myDatabase</jf>;
  *
  * 		<ja>@RestHook</ja>(<jsf>INIT</jsf>)
- * 		<jk>public void</jk> initMyDatabase(RestConfig config) <jk>throws</jk>
Exception {
+ * 		<jk>public void</jk> initMyDatabase(RestContextBuilder builder) <jk>throws</jk>
Exception {
  * 			<jf>myDatabase</jf> = <jk>new</jk> LinkedHashMap&lt;&gt;();
  * 		}
  * 	}


Mime
View raw message