syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [syncope] branch master updated: Upgrading to CXF 3.3.1
Date Tue, 05 Mar 2019 14:10:41 GMT
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new b31e471  Upgrading to CXF 3.3.1
b31e471 is described below

commit b31e471101b9188757e2bc3cc7ea7fc6f192922e
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
AuthorDate: Tue Mar 5 15:10:33 2019 +0100

    Upgrading to CXF 3.3.1
---
 .../core/rest/cxf/SyncopeJavaDocProvider.java      | 46 ----------------------
 .../core/rest/cxf/SyncopeOpenApiCustomizer.java    |  7 ++--
 pom.xml                                            |  2 +-
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeJavaDocProvider.java
b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeJavaDocProvider.java
deleted file mode 100644
index 2ee7b51..0000000
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeJavaDocProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.core.rest.cxf;
-
-import java.net.URL;
-import org.apache.cxf.jaxrs.model.doc.JavaDocProvider;
-
-/**
- * Keep this class until CXF 3.3.1 is released, then use its parent class.
- */
-public class SyncopeJavaDocProvider extends JavaDocProvider {
-
-    public SyncopeJavaDocProvider(final URL... javaDocUrls) {
-        super(javaDocUrls);
-    }
-
-    public SyncopeJavaDocProvider(final String... paths) throws Exception {
-        super(paths);
-    }
-
-    @Override
-    protected String getOperLink() {
-        String operLink = "<A NAME=\"";
-        return JAVA_VERSION == JAVA_VERSION_16
-                ? operLink
-                : JAVA_VERSION <= JAVA_VERSION_18
-                        ? operLink.toLowerCase()
-                        : "<a id=\"";
-    }
-}
diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiCustomizer.java
b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiCustomizer.java
index d37de12..10ec42f 100644
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiCustomizer.java
+++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiCustomizer.java
@@ -40,6 +40,7 @@ import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.jaxrs.model.OperationResourceInfo;
+import org.apache.cxf.jaxrs.model.doc.JavaDocProvider;
 import org.apache.cxf.jaxrs.openapi.OpenApiCustomizer;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.syncope.common.lib.SyncopeConstants;
@@ -68,20 +69,20 @@ public class SyncopeOpenApiCustomizer extends OpenApiCustomizer {
     private void init() {
         synchronized (this) {
             if (!inited) {
-                SyncopeJavaDocProvider javaDocProvider = null;
+                JavaDocProvider javaDocProvider = null;
 
                 URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
                 if (javaDocURLs == null) {
                     String[] javaDocPaths = JavaDocUtils.getJavaDocPaths(env);
                     if (javaDocPaths != null) {
                         try {
-                            javaDocProvider = new SyncopeJavaDocProvider(javaDocPaths);
+                            javaDocProvider = new JavaDocProvider(javaDocPaths);
                         } catch (Exception e) {
                             LOG.error("Could not set javadoc paths from {}", Arrays.asList(javaDocPaths),
e);
                         }
                     }
                 } else {
-                    javaDocProvider = new SyncopeJavaDocProvider(javaDocURLs);
+                    javaDocProvider = new JavaDocProvider(javaDocURLs);
                 }
                 super.setJavadocProvider(javaDocProvider);
 
diff --git a/pom.xml b/pom.xml
index e616ee8..5cd2d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,7 +389,7 @@ under the License.
     <connid.scimv11.version>1.0.1</connid.scimv11.version>
     <connid.servicenow.version>1.0.0</connid.servicenow.version>
 
-    <cxf.version>3.3.0</cxf.version>
+    <cxf.version>3.3.1</cxf.version>
 
     <jackson.version>2.9.8</jackson.version>
 


Mime
View raw message