Merge pull request #1025 from lugaru1234/remove_authorization_type_support

@Authorization.type() value support and SecurityDefinition class have be...

Author: fehguy

modules/swagger-annotations/src/main/java/com/wordnik/swagger/annotations/Api.java

@@ -139,7 +139,7 @@
    *
    * @return an array of authorizations required by the server, or a single, empty authorization value if not set
    */
-  Authorization[] authorizations() default @Authorization(value = "", type = "");
+  Authorization[] authorizations() default @Authorization(value = "");
 
   /**
    * Hides the api.

modules/swagger-annotations/src/main/java/com/wordnik/swagger/annotations/ApiOperation.java

@@ -71,7 +71,7 @@
   //String authorizations() default "";
 
   /** authorizations required by this Api */
-  Authorization[] authorizations() default @Authorization(value = "", type = "");
+  Authorization[] authorizations() default @Authorization(value = "");
 
   /**
    * Allows an operation to be marked as hidden

modules/swagger-annotations/src/main/java/com/wordnik/swagger/annotations/Authorization.java

@@ -25,6 +25,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Authorization {
   String value();
-  String type();
   AuthorizationScope[] scopes() default @AuthorizationScope(scope = "", description = "");
 }

modules/swagger-core/src/test/scala/ScalaTest.scala

@@ -9,6 +9,7 @@ import scala.collection.JavaConverters._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
+
 import org.scalatest.Matchers
 
 import matchers.SerializationMatchers._

modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java

@@ -39,7 +39,6 @@
 import com.wordnik.swagger.models.Path;
 import com.wordnik.swagger.models.Response;
 import com.wordnik.swagger.models.Scheme;
-import com.wordnik.swagger.models.SecurityDefinition;
 import com.wordnik.swagger.models.SecurityRequirement;
 import com.wordnik.swagger.models.SecurityScope;
 import com.wordnik.swagger.models.Swagger;
@@ -415,10 +414,8 @@ public Operation parseMethod(Method method) {
             security.setName(auth.value());
             AuthorizationScope[] scopes = auth.scopes();
             for(AuthorizationScope scope : scopes) {
-              SecurityDefinition definition = new SecurityDefinition(auth.type());
               if(scope.scope() != null && !"".equals(scope.scope())) {
                 security.addScope(scope.scope());
-                definition.scope(scope.scope(), scope.description());
               }
             }
             securities.add(security);

modules/swagger-models/src/main/java/com/wordnik/swagger/models/SecurityDefinition.java

@@ -29,7 +29,7 @@
 
 @Path("/pet")
 @Api(value = "/pet", description = "Operations about pets", authorizations = {
-  @Authorization(value = "petstore_auth", type = "oauth2",
+  @Authorization(value = "petstore_auth",
   scopes = {
     @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
     @AuthorizationScope(scope = "read:pets", description = "read your pets")
@@ -45,7 +45,7 @@ public class PetResource {
   @ApiOperation(value = "Find pet by ID", 
     notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", 
     response = Pet.class,
-    authorizations = @Authorization(value = "api_key", type = "api_key")
+    authorizations = @Authorization(value = "api_key")
   )
   @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
       @ApiResponse(code = 404, message = "Pet not found") })

samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/resource/PetResource.java

@@ -40,7 +40,7 @@ public class PetStoreResource {
     notes = "Returns a map of status codes to quantities", 
     response = Integer.class,
     responseContainer = "map",
-    authorizations = @Authorization(value = "api_key", type = "api_key")
+    authorizations = @Authorization(value = "api_key")
   )
   public java.util.Map<String, Integer> getInventory() {
     return petData.getInventoryByStatus();

samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/resource/PetStoreResource.java

@@ -29,7 +29,7 @@
 
 @Path("/pet")
 @Api(value = "/pet", description = "Operations about pets", authorizations = {
-  @Authorization(value = "petstore_auth", type = "oauth2",
+  @Authorization(value = "petstore_auth",
   scopes = {
     @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
     @AuthorizationScope(scope = "read:pets", description = "read your pets")
@@ -45,7 +45,7 @@ public class PetResource {
   @ApiOperation(value = "Find pet by ID", 
     notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", 
     response = Pet.class,
-    authorizations = @Authorization(value = "api_key", type = "api_key")
+    authorizations = @Authorization(value = "api_key")
   )
   @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
       @ApiResponse(code = 404, message = "Pet not found") })

samples/java-jaxrs/src/main/java/com/wordnik/swagger/sample/resource/PetResource.java

@@ -40,7 +40,7 @@ public class PetStoreResource {
     notes = "Returns a map of status codes to quantities", 
     response = Integer.class,
     responseContainer = "map",
-    authorizations = @Authorization(value = "api_key", type = "api_key")
+    authorizations = @Authorization(value = "api_key")
   )
   public java.util.Map<String, Integer> getInventory() {
     return petData.getInventoryByStatus();