[22/30] cxf git commit: [CXF-6836] More SwaggerUtils work

2016-12-03 Thread reta 
[CXF-6836] More SwaggerUtils work


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/847216a3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/847216a3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/847216a3

Branch: refs/heads/CXF-6882.nio
Commit: 847216a39ba3639f3170b8ad939548788fff4eb6
Parents: 1d09de7
Author: Sergey Beryozkin 
Authored: Thu Dec 1 13:56:14 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Dec 1 13:56:14 2016 +

--
 .../apache/cxf/jaxrs/model/UserApplication.java |   9 ++
 .../apache/cxf/jaxrs/swagger/SwaggerUtils.java  | 135 +++
 .../cxf/jaxrs/swagger/SwaggerUtilsTest.java |  67 -
 .../src/test/resources/swagger12.json   |  27 
 .../src/test/resources/swagger20.json   |  90 +++--
 .../AbstractSwagger2ServiceDescriptionTest.java |  16 ++-
 .../jaxrs/description/group1/BookStore.java |   5 +-
 .../systest/jaxrs/description/swagger2-json.txt |   1 -
 .../jaxrs/description/swagger2-noano-json.txt   |   1 -
 9 files changed, 153 insertions(+), 198 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/847216a3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
index 404416d..eec7e83 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
@@ -25,6 +25,7 @@ import java.util.Map;
 public class UserApplication {
 
 private String name;
+private String basePath;
 private List resources; 
 
 public UserApplication() {
@@ -62,4 +63,12 @@ public class UserApplication {
 }
 return map;
 }
+
+public String getBasePath() {
+return basePath;
+}
+
+public void setBasePath(String basePath) {
+this.basePath = basePath;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/847216a3/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
index c0d7c6b..477fc59 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
@@ -20,22 +20,26 @@ package org.apache.cxf.jaxrs.swagger;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
 import org.apache.cxf.jaxrs.model.Parameter;
 import org.apache.cxf.jaxrs.model.ParameterType;
+import org.apache.cxf.jaxrs.model.UserApplication;
 import org.apache.cxf.jaxrs.model.UserOperation;
 import org.apache.cxf.jaxrs.model.UserResource;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
@@ -61,66 +65,64 @@ public final class SwaggerUtils {
 private SwaggerUtils() {
 
 }
-public static UserResource getUserResource(String loc) {
-return getUserResource(loc, BusFactory.getThreadDefaultBus());
+public static UserApplication getUserApplication(String loc) {
+return getUserApplication(loc, BusFactory.getThreadDefaultBus());
 }
-public static UserResource getUserResource(String loc, Bus bus) {
+public static UserApplication getUserApplication(String loc, Bus bus) {
 try {
 InputStream is = ResourceUtils.getResourceStream(loc, bus);
 if (is == null) {
 return null;
 }
-return getUserResourceFromStream(is);
+return getUserApplicationFromStream(is);
 } catch (Exception ex) {
 LOG.warning("Problem with processing a user model at " + loc);
 }
 return null;
 }
-public static

cxf git commit: [CXF-6836] More SwaggerUtils work

2016-12-01 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 871df8c66 -> bdc67fbc2


[CXF-6836] More SwaggerUtils work


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

Branch: refs/heads/3.1.x-fixes
Commit: bdc67fbc286a3c8c84e3d4b044801ae6366e005d
Parents: 871df8c
Author: Sergey Beryozkin 
Authored: Thu Dec 1 13:56:14 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Dec 1 13:58:20 2016 +

--
 .../apache/cxf/jaxrs/model/UserApplication.java |   9 ++
 .../apache/cxf/jaxrs/swagger/SwaggerUtils.java  | 135 +++
 .../cxf/jaxrs/swagger/SwaggerUtilsTest.java |  67 -
 .../src/test/resources/swagger12.json   |  27 
 .../src/test/resources/swagger20.json   |  90 +++--
 .../AbstractSwagger2ServiceDescriptionTest.java |  16 ++-
 .../jaxrs/description/group1/BookStore.java |   5 +-
 .../systest/jaxrs/description/swagger2-json.txt |   1 -
 .../jaxrs/description/swagger2-noano-json.txt   |   1 -
 9 files changed, 153 insertions(+), 198 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bdc67fbc/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
index 404416d..eec7e83 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
@@ -25,6 +25,7 @@ import java.util.Map;
 public class UserApplication {
 
 private String name;
+private String basePath;
 private List resources; 
 
 public UserApplication() {
@@ -62,4 +63,12 @@ public class UserApplication {
 }
 return map;
 }
+
+public String getBasePath() {
+return basePath;
+}
+
+public void setBasePath(String basePath) {
+this.basePath = basePath;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bdc67fbc/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
index c0d7c6b..477fc59 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
@@ -20,22 +20,26 @@ package org.apache.cxf.jaxrs.swagger;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
 import org.apache.cxf.jaxrs.model.Parameter;
 import org.apache.cxf.jaxrs.model.ParameterType;
+import org.apache.cxf.jaxrs.model.UserApplication;
 import org.apache.cxf.jaxrs.model.UserOperation;
 import org.apache.cxf.jaxrs.model.UserResource;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
@@ -61,66 +65,64 @@ public final class SwaggerUtils {
 private SwaggerUtils() {
 
 }
-public static UserResource getUserResource(String loc) {
-return getUserResource(loc, BusFactory.getThreadDefaultBus());
+public static UserApplication getUserApplication(String loc) {
+return getUserApplication(loc, BusFactory.getThreadDefaultBus());
 }
-public static UserResource getUserResource(String loc, Bus bus) {
+public static UserApplication getUserApplication(String loc, Bus bus) {
 try {
 InputStream is = ResourceUtils.getResourceStream(loc, bus);
 if (is == null) {
 return null;
 }
-return getUserResourceFromStream(is);
+return getUserApplicationFromStream(is);
 } catch (Exception ex) {
 LOG.warning("Problem with processing a

cxf git commit: [CXF-6836] More SwaggerUtils work

2016-12-01 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 1d09de7af -> 847216a39


[CXF-6836] More SwaggerUtils work


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/847216a3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/847216a3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/847216a3

Branch: refs/heads/master
Commit: 847216a39ba3639f3170b8ad939548788fff4eb6
Parents: 1d09de7
Author: Sergey Beryozkin 
Authored: Thu Dec 1 13:56:14 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Dec 1 13:56:14 2016 +

--
 .../apache/cxf/jaxrs/model/UserApplication.java |   9 ++
 .../apache/cxf/jaxrs/swagger/SwaggerUtils.java  | 135 +++
 .../cxf/jaxrs/swagger/SwaggerUtilsTest.java |  67 -
 .../src/test/resources/swagger12.json   |  27 
 .../src/test/resources/swagger20.json   |  90 +++--
 .../AbstractSwagger2ServiceDescriptionTest.java |  16 ++-
 .../jaxrs/description/group1/BookStore.java |   5 +-
 .../systest/jaxrs/description/swagger2-json.txt |   1 -
 .../jaxrs/description/swagger2-noano-json.txt   |   1 -
 9 files changed, 153 insertions(+), 198 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/847216a3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
index 404416d..eec7e83 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java
@@ -25,6 +25,7 @@ import java.util.Map;
 public class UserApplication {
 
 private String name;
+private String basePath;
 private List resources; 
 
 public UserApplication() {
@@ -62,4 +63,12 @@ public class UserApplication {
 }
 return map;
 }
+
+public String getBasePath() {
+return basePath;
+}
+
+public void setBasePath(String basePath) {
+this.basePath = basePath;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/847216a3/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
index c0d7c6b..477fc59 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
@@ -20,22 +20,26 @@ package org.apache.cxf.jaxrs.swagger;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
 import org.apache.cxf.jaxrs.model.Parameter;
 import org.apache.cxf.jaxrs.model.ParameterType;
+import org.apache.cxf.jaxrs.model.UserApplication;
 import org.apache.cxf.jaxrs.model.UserOperation;
 import org.apache.cxf.jaxrs.model.UserResource;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
@@ -61,66 +65,64 @@ public final class SwaggerUtils {
 private SwaggerUtils() {
 
 }
-public static UserResource getUserResource(String loc) {
-return getUserResource(loc, BusFactory.getThreadDefaultBus());
+public static UserApplication getUserApplication(String loc) {
+return getUserApplication(loc, BusFactory.getThreadDefaultBus());
 }
-public static UserResource getUserResource(String loc, Bus bus) {
+public static UserApplication getUserApplication(String loc, Bus bus) {
 try {
 InputStream is = ResourceUtils.getResourceStream(loc, bus);
 if (is == null) {
 return null;
 }
-return getUserResourceFromStream(is);
+return getUserApplicationFromStream(is);
 } catch (Exception ex) {
 LOG.warning("Problem with processing a user model