Merge branch 'lugaru1234-issue1225' into develop_2.0

Author: fehguy

modules/swagger-jaxrs/src/test/java/io/swagger/SimpleScannerTest.java

@@ -0,0 +1,4 @@
+package io.swagger.models;
+
+public class EmptyModel {
+}

modules/swagger-jaxrs/src/test/java/io/swagger/models/EmptyModel.java

@@ -1,4 +1,4 @@
-package models;
+package io.swagger.models;
 
 public class EnumHolder {
     private TestEnum value;

…rs/src/test/scala/models/EnumHolder.java …t/java/io/swagger/models/EnumHolder.javamodules/swagger-jaxrs/src/test/scala/models/EnumHolder.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/models/EnumHolder.java modules/swagger-jaxrs/src/test/scala/models/EnumHolder.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/models/EnumHolder.java

@@ -1,4 +1,4 @@
-package models;
+package io.swagger.models;
 
 public class Namespace {
 

…xrs/src/test/scala/models/Namespace.java …st/java/io/swagger/models/Namespace.javamodules/swagger-jaxrs/src/test/scala/models/Namespace.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/models/Namespace.java modules/swagger-jaxrs/src/test/scala/models/Namespace.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/models/Namespace.java

@@ -0,0 +1,30 @@
+package io.swagger.models;
+
+public class NotFoundModel {
+    int code;
+    String message;
+
+    public NotFoundModel() {
+    }
+
+    public NotFoundModel(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

modules/swagger-jaxrs/src/test/java/io/swagger/models/NotFoundModel.java

@@ -19,4 +19,4 @@ public String getValue() {
     public void setValue(String value) {
         this.value = value;
     }
-}
+}

modules/swagger-jaxrs/src/test/java/io/swagger/models/Sample.java

@@ -25,4 +25,4 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
-}
+}

modules/swagger-jaxrs/src/test/java/io/swagger/models/duplicated/Tag.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

…test/scala/resources/HiddenResource.java …io/swagger/resources/HiddenResource.javamodules/swagger-jaxrs/src/test/scala/resources/HiddenResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/HiddenResource.java modules/swagger-jaxrs/src/test/scala/resources/HiddenResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/HiddenResource.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

…c/test/scala/resources/Resource1041.java …a/io/swagger/resources/Resource1041.javamodules/swagger-jaxrs/src/test/scala/resources/Resource1041.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/Resource1041.java modules/swagger-jaxrs/src/test/scala/resources/Resource1041.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/Resource1041.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;