cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing 3.0.x build failure
Date Mon, 12 Oct 2015 14:18:14 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 27feb0916 -> 9f8ed96ae


Fixing 3.0.x build failure


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

Branch: refs/heads/3.0.x-fixes
Commit: 9f8ed96ae3a393434b2854a0fb0b8396b4c9fd41
Parents: 27feb09
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Oct 12 15:17:56 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Oct 12 15:17:56 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java     | 6 +++---
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9f8ed96a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index f335eec..0824fa8 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -72,7 +72,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
     protected void addSwaggerResource(Server server) {
         List<ClassResourceInfo> cris = Collections.emptyList();
         if (!runAsFilter) {
-            List<Object> serviceBeans = new ArrayList<>();
+            List<Object> serviceBeans = new ArrayList<Object>();
             ApiListingResource apiListingResource = new ApiListingResource();
             serviceBeans.add(apiListingResource);
             JAXRSServiceFactoryBean sfb =
@@ -85,7 +85,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
                 }
             }
         }
-        List<Object> providers = new ArrayList<>();
+        List<Object> providers = new ArrayList<Object>();
         if (runAsFilter) {
             providers.add(new SwaggerContainerRequestFilter());
         }
@@ -220,7 +220,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
             DefaultReaderConfig rc = new DefaultReaderConfig();
             rc.setScanAllResources(true);
             if (ignoreRoutesParam != null) {
-                Set<String> routes = new LinkedHashSet<>();
+                Set<String> routes = new LinkedHashSet<String>();
                 for (String route : StringUtils.split(ignoreRoutesParam, ",")) {
                     routes.add(route.trim());
                 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/9f8ed96a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
index 83ef3dc..c67ce85 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
@@ -88,8 +88,9 @@ public class Swagger2Serializers extends SwaggerSerializers {
         }
 
         if (replaceTags || javadocProvider != null) {
-            Map<String, ClassResourceInfo> operations = new HashMap<>();
-            Map<Pair<String, String>, OperationResourceInfo> methods = new HashMap<>();
+            Map<String, ClassResourceInfo> operations = new HashMap<String, ClassResourceInfo>();
+            Map<Pair<String, String>, OperationResourceInfo> methods = 
+                new HashMap<Pair<String, String>, OperationResourceInfo>();
             for (ClassResourceInfo cri : cris) {
                 for (OperationResourceInfo ori : cri.getMethodDispatcher().getOperationResourceInfos())
{
                     StringBuilder fullPath = new StringBuilder().


Mime
View raw message