fixes #17

hoegertn · Aug 26, 2013 · 3ab5709 · 3ab5709
1 parent 281e948
commit 3ab5709
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 56 deletions.
diff --git a/...tdoc/server/impl/annotations/RestDoc.java → ...java/org/restdoc/annotations/RestDoc.java b/...tdoc/server/impl/annotations/RestDoc.java → ...java/org/restdoc/annotations/RestDoc.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...erver/impl/annotations/RestDocAccept.java → ...rg/restdoc/annotations/RestDocAccept.java b/...erver/impl/annotations/RestDocAccept.java → ...rg/restdoc/annotations/RestDocAccept.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...erver/impl/annotations/RestDocHeader.java → ...rg/restdoc/annotations/RestDocHeader.java b/...erver/impl/annotations/RestDocHeader.java → ...rg/restdoc/annotations/RestDocHeader.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...erver/impl/annotations/RestDocIgnore.java → ...rg/restdoc/annotations/RestDocIgnore.java b/...erver/impl/annotations/RestDocIgnore.java → ...rg/restdoc/annotations/RestDocIgnore.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...server/impl/annotations/RestDocParam.java → ...org/restdoc/annotations/RestDocParam.java b/...server/impl/annotations/RestDocParam.java → ...org/restdoc/annotations/RestDocParam.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...ver/impl/annotations/RestDocResponse.java → .../restdoc/annotations/RestDocResponse.java b/...ver/impl/annotations/RestDocResponse.java → .../restdoc/annotations/RestDocResponse.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...r/impl/annotations/RestDocReturnCode.java → ...estdoc/annotations/RestDocReturnCode.java b/...r/impl/annotations/RestDocReturnCode.java → ...estdoc/annotations/RestDocReturnCode.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/.../impl/annotations/RestDocReturnCodes.java → ...stdoc/annotations/RestDocReturnCodes.java b/.../impl/annotations/RestDocReturnCodes.java → ...stdoc/annotations/RestDocReturnCodes.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...erver/impl/annotations/RestDocSchema.java → ...rg/restdoc/annotations/RestDocSchema.java b/...erver/impl/annotations/RestDocSchema.java → ...rg/restdoc/annotations/RestDocSchema.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/.../server/impl/annotations/RestDocType.java → .../org/restdoc/annotations/RestDocType.java b/.../server/impl/annotations/RestDocType.java → .../org/restdoc/annotations/RestDocType.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/...r/impl/annotations/RestDocValidation.java → ...estdoc/annotations/RestDocValidation.java b/...r/impl/annotations/RestDocValidation.java → ...estdoc/annotations/RestDocValidation.java
@@ -1,4 +1,4 @@
-package org.restdoc.server.impl.annotations;
+package org.restdoc.annotations;
 
 /*
  * #%L Java Server implementation %% Copyright (C) 2012 RestDoc org %% Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/main/java/org/restdoc/server/impl/RestDocGenerator.java b/src/main/java/org/restdoc/server/impl/RestDocGenerator.java
@@ -12,12 +12,14 @@
  */
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -28,16 +30,21 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
 import javax.ws.rs.HttpMethod;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 
+import org.restdoc.annotations.RestDocAccept;
+import org.restdoc.annotations.RestDocHeader;
+import org.restdoc.annotations.RestDocIgnore;
+import org.restdoc.annotations.RestDocParam;
+import org.restdoc.annotations.RestDocResponse;
+import org.restdoc.annotations.RestDocReturnCode;
+import org.restdoc.annotations.RestDocReturnCodes;
+import org.restdoc.annotations.RestDocType;
+import org.restdoc.annotations.RestDocValidation;
 import org.restdoc.api.GlobalHeader;
 import org.restdoc.api.HeaderDefinition;
 import org.restdoc.api.MethodDefinition;
@@ -49,15 +56,6 @@
 import org.restdoc.api.RestResource;
 import org.restdoc.api.Schema;
 import org.restdoc.api.util.RestDocParser;
-import org.restdoc.server.impl.annotations.RestDocAccept;
-import org.restdoc.server.impl.annotations.RestDocHeader;
-import org.restdoc.server.impl.annotations.RestDocIgnore;
-import org.restdoc.server.impl.annotations.RestDocParam;
-import org.restdoc.server.impl.annotations.RestDocResponse;
-import org.restdoc.server.impl.annotations.RestDocReturnCode;
-import org.restdoc.server.impl.annotations.RestDocReturnCodes;
-import org.restdoc.server.impl.annotations.RestDocType;
-import org.restdoc.server.impl.annotations.RestDocValidation;
 import org.restdoc.server.impl.util.MediaTypeResolver;
 import org.restdoc.server.impl.util.SchemaResolver;
 import org.slf4j.Logger;
@@ -157,11 +155,7 @@ private void addResourcesOfClass(final Class<?> apiClass, final String baseURI)
 		// find methods
 		final Method[] methods = apiClass.getMethods();
 		for (final Method method : methods) {
-			if (method.isAnnotationPresent(Path.class) || //
-			method.isAnnotationPresent(GET.class) || //
-			method.isAnnotationPresent(POST.class) || //
-			method.isAnnotationPresent(PUT.class) || //
-			method.isAnnotationPresent(DELETE.class)) {
+			if (method.isAnnotationPresent(Path.class) || (RestDocGenerator.getHTTPVerb(method) != null)) {
 				this.logger.debug("Generating RestDoc of method: " + method.toString());
 				this.addResourceMethod(basepath, method);
 			}
@@ -176,7 +170,7 @@ private void addResourceMethod(final String basepath, final Method method) {
 
 		// get needed annotations from method
 		final String methodType = RestDocGenerator.getHTTPVerb(method);
-		final org.restdoc.server.impl.annotations.RestDoc docAnnotation = method.getAnnotation(org.restdoc.server.impl.annotations.RestDoc.class);
+		final org.restdoc.annotations.RestDoc docAnnotation = method.getAnnotation(org.restdoc.annotations.RestDoc.class);
 		final Path pathAnnotation = method.getAnnotation(Path.class);
 
 		String path = basepath;
@@ -205,24 +199,11 @@ private void addResourceMethod(final String basepath, final Method method) {
 			path += "{?" + string + "}";
 		}
 
-		String id;
+		final String id;
 		if ((docAnnotation != null) && (docAnnotation.id() != null) && !docAnnotation.id().isEmpty()) {
 			id = docAnnotation.id();
 		} else {
-			try {
-				MessageDigest md = MessageDigest.getInstance("MD5");
-				byte[] digest = md.digest(path.getBytes("UTF-8"));
-				BigInteger bigInt = new BigInteger(1, digest);
-				String hashtext = bigInt.toString(16);
-				// Now we need to zero pad it if you actually want the full 32 chars.
-				while (hashtext.length() < 32) {
-					hashtext = "0" + hashtext;
-				}
-				id = hashtext;
-			} catch (Exception e) {
-				this.logger.warn("Failed to generate MD5 sum", e);
-				id = method.getName();
-			}
+			id = this.getDefaultResourceId(method, path);
 		}
 		final String resourceDescription = (docAnnotation != null) ? docAnnotation.resourceDescription() : null;
 
@@ -261,6 +242,25 @@ private void addResourceMethod(final String basepath, final Method method) {
 		this.ext.newMethod(restResource, def, method);
 	}
 
+	private String getDefaultResourceId(final Method method, String path) {
+		try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			byte[] digest = md.digest(path.getBytes("UTF-8"));
+			BigInteger bigInt = new BigInteger(1, digest);
+			String hashtext = bigInt.toString(16);
+			// Now we need to zero pad it if you actually want the full 32 chars.
+			while (hashtext.length() < 32) {
+				hashtext = "0" + hashtext;
+			}
+			return hashtext;
+		} catch (NoSuchAlgorithmException e) {
+			this.logger.warn("Failed to generate MD5 sum", e);
+		} catch (UnsupportedEncodingException e) {
+			this.logger.warn("Failed to generate MD5 sum", e);
+		}
+		return method.getName();
+	}
+
 	/**
 	 * @param queryParams
 	 * @param methodRequestHeader

diff --git a/src/main/java/org/restdoc/server/impl/util/SchemaResolver.java b/src/main/java/org/restdoc/server/impl/util/SchemaResolver.java
@@ -6,11 +6,11 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.restdoc.annotations.RestDocSchema;
 import org.restdoc.api.Schema;
 import org.restdoc.api.util.RestDocParser;
 import org.restdoc.server.impl.IRestDocGeneratorExtension;
 import org.restdoc.server.impl.RestDocException;
-import org.restdoc.server.impl.annotations.RestDocSchema;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/src/test/java/org/restdoc/server/impl/Msg.java b/src/test/java/org/restdoc/server/impl/Msg.java
@@ -11,7 +11,7 @@
  * and limitations under the License. #L%
  */
 
-import org.restdoc.server.impl.annotations.RestDocSchema;
+import org.restdoc.annotations.RestDocSchema;
 
 /**
  * 

diff --git a/src/test/java/org/restdoc/server/impl/MyDeepRes.java b/src/test/java/org/restdoc/server/impl/MyDeepRes.java
@@ -7,9 +7,9 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
-import org.restdoc.server.impl.annotations.RestDocIgnore;
-import org.restdoc.server.impl.annotations.RestDocReturnCode;
-import org.restdoc.server.impl.annotations.RestDocReturnCodes;
+import org.restdoc.annotations.RestDocIgnore;
+import org.restdoc.annotations.RestDocReturnCode;
+import org.restdoc.annotations.RestDocReturnCodes;
 
 @Produces("text/plain")
 @Consumes("text/plain")

diff --git a/src/test/java/org/restdoc/server/impl/MyRSBean.java b/src/test/java/org/restdoc/server/impl/MyRSBean.java
@@ -26,13 +26,13 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response.Status;
 
+import org.restdoc.annotations.RestDoc;
+import org.restdoc.annotations.RestDocHeader;
+import org.restdoc.annotations.RestDocParam;
+import org.restdoc.annotations.RestDocResponse;
+import org.restdoc.annotations.RestDocReturnCode;
+import org.restdoc.annotations.RestDocReturnCodes;
 import org.restdoc.server.ext.oauth2.Scopes;
-import org.restdoc.server.impl.annotations.RestDoc;
-import org.restdoc.server.impl.annotations.RestDocHeader;
-import org.restdoc.server.impl.annotations.RestDocParam;
-import org.restdoc.server.impl.annotations.RestDocResponse;
-import org.restdoc.server.impl.annotations.RestDocReturnCode;
-import org.restdoc.server.impl.annotations.RestDocReturnCodes;
 
 import com.google.common.collect.Maps;
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
      * and limitations under the License. #L%
      */
-    import org.restdoc.server.impl.annotations.RestDocSchema;
+    import org.restdoc.annotations.RestDocSchema;
     /**
      *
@@ Expand Down @@