diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json index 8c7338c07e0de..76b2861b3d570 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json @@ -4,7 +4,7 @@ "name": "olingo2", "title": "Olingo2", "description": "Communicate with OData 2.0 services using Apache Olingo.", - "deprecated": false, + "deprecated": true, "firstVersion": "2.14.0", "label": "cloud", "javaType": "org.apache.camel.component.olingo2.Olingo2Component", diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json index 99b16a9ad4609..46dc6fbb02cf3 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json @@ -4,7 +4,7 @@ "name": "olingo4", "title": "Olingo4", "description": "Communicate with OData 4.0 services using Apache Olingo OData API.", - "deprecated": false, + "deprecated": true, "firstVersion": "2.19.0", "label": "cloud", "javaType": "org.apache.camel.component.olingo4.Olingo4Component", diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml index 439ae4e388fc2..7bd9fbeb81f2f 100644 --- a/components/camel-olingo2/camel-olingo2-api/pom.xml +++ b/components/camel-olingo2/camel-olingo2-api/pom.xml @@ -28,7 +28,7 @@ camel-olingo2-api - Camel :: Olingo2 :: API + Camel :: Olingo2 (Deprecated) :: API Camel Olingo2 API jar diff --git a/components/camel-olingo2/camel-olingo2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-olingo2/camel-olingo2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 30c0765043ec3..2ca91893a40d0 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-olingo2/camel-olingo2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=olingo2-api groupId=org.apache.camel artifactId=camel-olingo2-api version=4.17.0-SNAPSHOT -projectName=Camel :: Olingo2 :: API +projectName=Camel :: Olingo2 (Deprecated) :: API projectDescription=Camel Olingo2 API diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2App.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2App.java index c132c6ae05dc3..3f29d963624d9 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2App.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2App.java @@ -29,6 +29,7 @@ /** * Olingo2 Client Api Interface. */ +@Deprecated(since = "4.18") public interface Olingo2App { /** diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2ResponseHandler.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2ResponseHandler.java index c7784e246855c..0ae7bb9087637 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2ResponseHandler.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/Olingo2ResponseHandler.java @@ -21,6 +21,7 @@ /** * Callback interface to asynchronously process Olingo2 response. */ +@Deprecated(since = "4.18") public interface Olingo2ResponseHandler { /** diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchChangeRequest.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchChangeRequest.java index be15ebe64bf57..b0fe9ad3ec088 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchChangeRequest.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchChangeRequest.java @@ -21,6 +21,7 @@ /** * Batch Change part. */ +@Deprecated(since = "4.18") public class Olingo2BatchChangeRequest extends Olingo2BatchRequest { protected String contentId; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchQueryRequest.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchQueryRequest.java index d2f89a3e65726..2549c34a19777 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchQueryRequest.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchQueryRequest.java @@ -21,6 +21,7 @@ /** * Batch Query part. */ +@Deprecated(since = "4.18") public class Olingo2BatchQueryRequest extends Olingo2BatchRequest { private Map queryParams; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchRequest.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchRequest.java index aaeef2f13caf2..7a790602e0f0e 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchRequest.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchRequest.java @@ -22,6 +22,7 @@ /** * Base part in a multipart Batch request. */ +@Deprecated(since = "4.18") public abstract class Olingo2BatchRequest { protected String resourcePath; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchResponse.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchResponse.java index a0d6cbcd0e42f..1c703bf63e39e 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchResponse.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Olingo2BatchResponse.java @@ -23,6 +23,7 @@ /** * Batch Response part. */ +@Deprecated(since = "4.18") public class Olingo2BatchResponse { private final int statusCode; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Operation.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Operation.java index 4ba8e26ea7f4f..0c8a6166412ca 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Operation.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/batch/Operation.java @@ -19,6 +19,7 @@ /** * OData operation used by {@link org.apache.camel.component.olingo2.api.batch.Olingo2BatchChangeRequest}. */ +@Deprecated(since = "4.18") public enum Operation { CREATE("POST"), diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/AbstractFutureCallback.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/AbstractFutureCallback.java index 4640bd060ccd9..5c92aa8963ae3 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/AbstractFutureCallback.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/AbstractFutureCallback.java @@ -38,6 +38,7 @@ * Helper implementation of {@link org.apache.http.concurrent.FutureCallback} for * {@link org.apache.camel.component.olingo2.api.impl.Olingo2AppImpl} */ +@Deprecated(since = "4.18") public abstract class AbstractFutureCallback implements FutureCallback { public static final Pattern ODATA_MIME_TYPE = Pattern.compile("application/((atom)|(json)|(xml)).*"); diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/HttpMerge.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/HttpMerge.java index 48b411b3248c4..82f827a798e75 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/HttpMerge.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/HttpMerge.java @@ -23,6 +23,7 @@ /** * HTTP MERGE method. */ +@Deprecated(since = "4.18") public class HttpMerge extends HttpEntityEnclosingRequestBase { public static final String METHOD_NAME = "MERGE"; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/ODataPathSegmentImpl.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/ODataPathSegmentImpl.java index 995a90c95fa7d..9eedc3292f365 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/ODataPathSegmentImpl.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/ODataPathSegmentImpl.java @@ -26,6 +26,7 @@ /** * Copied from Olingo2 library, since URI parsing wasn't made a part of it's public API. */ +@Deprecated(since = "4.18") public class ODataPathSegmentImpl implements PathSegment { private String path; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java index 200e98a662099..2c16e9bb6a650 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java @@ -103,6 +103,7 @@ /** * Application API used by Olingo2 Component. */ +@Deprecated(since = "4.18") public final class Olingo2AppImpl implements Olingo2App { public static final String METADATA = "$metadata"; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2Helper.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2Helper.java index b6e47e063fdda..30e04b5f23429 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2Helper.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2Helper.java @@ -23,6 +23,7 @@ /** * Helper */ +@Deprecated(since = "4.18") public final class Olingo2Helper { private Olingo2Helper() { diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/SystemQueryOption.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/SystemQueryOption.java index 81b707fe84c42..c6d359465ad69 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/SystemQueryOption.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/SystemQueryOption.java @@ -19,6 +19,7 @@ /** * Copied from Olingo2 core package. */ +@Deprecated(since = "4.18") public enum SystemQueryOption { $format, $filter, diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriInfoWithType.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriInfoWithType.java index f4369582b7b9b..dc8e0da82520d 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriInfoWithType.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriInfoWithType.java @@ -43,6 +43,7 @@ /** * UriInfo with UriType information, determined in constructor. */ +@Deprecated(since = "4.18") public class UriInfoWithType implements UriInfo { private final UriInfo uriInfo; diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriType.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriType.java index 8f2bb8dd66d2b..62f4ed92e9305 100644 --- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriType.java +++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/UriType.java @@ -22,6 +22,7 @@ /** * Copied from Olingo2 core package. */ +@Deprecated(since = "4.18") public enum UriType { /** * Service document diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index c4c11cfb55d85..821ef7ad4473c 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -29,7 +29,7 @@ camel-olingo2 jar - Camel :: Olingo2 :: Component + Camel :: Olingo2 (Deprecated) :: Component Camel Olingo2 component diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/org/apache/camel/component/olingo2/olingo2.json b/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/org/apache/camel/component/olingo2/olingo2.json index 8c7338c07e0de..76b2861b3d570 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/org/apache/camel/component/olingo2/olingo2.json +++ b/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/org/apache/camel/component/olingo2/olingo2.json @@ -4,7 +4,7 @@ "name": "olingo2", "title": "Olingo2", "description": "Communicate with OData 2.0 services using Apache Olingo.", - "deprecated": false, + "deprecated": true, "firstVersion": "2.14.0", "label": "cloud", "javaType": "org.apache.camel.component.olingo2.Olingo2Component", diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 1f5d97a991667..9311e751c14fb 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-olingo2/camel-olingo2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=olingo2 groupId=org.apache.camel artifactId=camel-olingo2 version=4.17.0-SNAPSHOT -projectName=Camel :: Olingo2 :: Component +projectName=Camel :: Olingo2 (Deprecated) :: Component projectDescription=Camel Olingo2 component diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc index e6183899a8812..eee39780c0e7d 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc +++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc @@ -1,10 +1,11 @@ -= Olingo2 Component += Olingo2 Component (deprecated) :doctitle: Olingo2 :shortname: olingo2 :artifactid: camel-olingo2 :description: Communicate with OData 2.0 services using Apache Olingo. :since: 2.14 -:supportlevel: Stable +:supportlevel: Stable-deprecated +:deprecated: *deprecated* :tabs-sync-option: :component-header: Both producer and consumer are supported //Manually maintained attributes diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java index 093e78c0750ba..f26af221a11a3 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java @@ -31,6 +31,7 @@ * Holder class for {@link org.apache.camel.component.olingo2.api.Olingo2App} and its lazily read * {@link org.apache.olingo.odata2.api.edm.Edm}. */ +@Deprecated(since = "4.18") public class Olingo2AppWrapper { private final Lock lock = new ReentrantLock(); diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java index 5109c91453303..2b483d6543353 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java @@ -40,6 +40,7 @@ * Represents the component that manages {@link Olingo2Endpoint}. */ @Component("olingo2") +@Deprecated(since = "4.18") public class Olingo2Component extends AbstractApiComponent implements SSLContextParametersAware { diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java index 5811d9b41a14e..c137e9e249d26 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java @@ -38,6 +38,7 @@ */ @UriParams @Configurer(extended = true) +@Deprecated(since = "4.18") public class Olingo2Configuration { private static final String DEFAULT_CONTENT_TYPE = ContentType.APPLICATION_JSON.toString(); diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java index a6e2f191da7c4..fb439a92e8dc4 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java @@ -35,6 +35,7 @@ /** * The Olingo2 consumer. */ +@Deprecated(since = "4.18") public class Olingo2Consumer extends AbstractApiConsumer { private Olingo2Index resultIndex; diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java index b654051af0fe0..5db2b81388b74 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java @@ -48,6 +48,7 @@ @UriEndpoint(firstVersion = "2.14.0", scheme = "olingo2", title = "Olingo2", syntax = "olingo2:apiName/methodName", apiSyntax = "apiName/methodName", category = { Category.CLOUD }, headersClass = Olingo2Constants.class) +@Deprecated(since = "4.18") public class Olingo2Endpoint extends AbstractApiEndpoint implements EndpointServiceLocation { diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java index a291c8054256a..26d54d442c47c 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java @@ -28,6 +28,7 @@ import org.apache.olingo.odata2.api.ep.feed.FeedMetadata; import org.apache.olingo.odata2.api.ep.feed.ODataFeed; +@Deprecated(since = "4.18") public class Olingo2Index { private Set resultIndex = new HashSet<>(); diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java index d0bd321647dc2..b284e71985c4c 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java @@ -34,6 +34,7 @@ /** * The Olingo2 producer. */ +@Deprecated(since = "4.18") public class Olingo2Producer extends AbstractApiProducer { private static final Logger LOG = LoggerFactory.getLogger(Olingo2Producer.class); diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2Constants.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2Constants.java index 61b4342b07e1e..59927153d77b9 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2Constants.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2Constants.java @@ -21,6 +21,7 @@ /** * Constants for Olingo2 component. */ +@Deprecated(since = "4.18") public interface Olingo2Constants { // prefix for parameters when passed as exchange header properties diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2PropertiesHelper.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2PropertiesHelper.java index 62e01ab9fded2..442fd13fa2d68 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2PropertiesHelper.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/internal/Olingo2PropertiesHelper.java @@ -26,6 +26,7 @@ /** * Singleton {@link ApiMethodPropertiesHelper} for Olingo2 component. */ +@Deprecated(since = "4.18") public final class Olingo2PropertiesHelper extends ApiMethodPropertiesHelper { private static final Lock LOCK = new ReentrantLock(); diff --git a/components/camel-olingo2/pom.xml b/components/camel-olingo2/pom.xml index e0b905f8456f6..04fcb30fe9cec 100644 --- a/components/camel-olingo2/pom.xml +++ b/components/camel-olingo2/pom.xml @@ -29,7 +29,7 @@ camel-olingo2-parent pom - Camel :: Olingo2 :: Parent + Camel :: Olingo2 (Deprecated) :: Parent Camel Olingo2 parent diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml index fb60b51d91edd..86bc346b47d2b 100644 --- a/components/camel-olingo4/camel-olingo4-api/pom.xml +++ b/components/camel-olingo4/camel-olingo4-api/pom.xml @@ -28,7 +28,7 @@ camel-olingo4-api - Camel :: Olingo4 :: API + Camel :: Olingo4 (Deprecated) :: API Camel Olingo4 API jar diff --git a/components/camel-olingo4/camel-olingo4-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-olingo4/camel-olingo4-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 83096fc9de59d..f00f4836ec162 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-olingo4/camel-olingo4-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=olingo4-api groupId=org.apache.camel artifactId=camel-olingo4-api version=4.17.0-SNAPSHOT -projectName=Camel :: Olingo4 :: API +projectName=Camel :: Olingo4 (Deprecated) :: API projectDescription=Camel Olingo4 API diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4App.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4App.java index 0f5f63599da0a..c337b28817235 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4App.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4App.java @@ -27,6 +27,7 @@ /** * Olingo4 Client Api Interface. */ +@Deprecated(since = "4.18") public interface Olingo4App { /** diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4ResponseHandler.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4ResponseHandler.java index 74221ccce8eaf..09e22bc4773e2 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4ResponseHandler.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/Olingo4ResponseHandler.java @@ -21,6 +21,7 @@ /** * Callback interface to asynchronously process Olingo4 response. */ +@Deprecated(since = "4.18") public interface Olingo4ResponseHandler { /** diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchChangeRequest.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchChangeRequest.java index 4b8dee601245f..95c6ed15c44c6 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchChangeRequest.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchChangeRequest.java @@ -21,6 +21,7 @@ /** * Batch Change part. */ +@Deprecated(since = "4.18") public class Olingo4BatchChangeRequest extends Olingo4BatchRequest { protected String contentId; diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchQueryRequest.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchQueryRequest.java index 6f819f6356652..eacb4d3efce8c 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchQueryRequest.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchQueryRequest.java @@ -21,6 +21,7 @@ /** * Batch Query part. */ +@Deprecated(since = "4.18") public class Olingo4BatchQueryRequest extends Olingo4BatchRequest { private Map queryParams; diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchRequest.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchRequest.java index 6b050f4e5b35f..95468232fbd84 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchRequest.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchRequest.java @@ -22,6 +22,7 @@ /** * Base part in a multipart Batch request. */ +@Deprecated(since = "4.18") public abstract class Olingo4BatchRequest { protected String resourceUri; diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchResponse.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchResponse.java index e892f04367ad9..b818dfabf49b5 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchResponse.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Olingo4BatchResponse.java @@ -23,6 +23,7 @@ /** * Batch Response part. */ +@Deprecated(since = "4.18") public class Olingo4BatchResponse { private final int statusCode; diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Operation.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Operation.java index 6eda58d7628c0..10aa5374fc14e 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Operation.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/batch/Operation.java @@ -19,6 +19,7 @@ /** * OData operation used by {@link org.apache.camel.component.olingo4.api.batch.Olingo4BatchChangeRequest}. */ +@Deprecated(since = "4.18") public enum Operation { CREATE("POST"), diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/AbstractFutureCallback.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/AbstractFutureCallback.java index e8de1234bf792..b85cb9f7d82bb 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/AbstractFutureCallback.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/AbstractFutureCallback.java @@ -38,6 +38,7 @@ * Helper implementation of {@link org.apache.http.concurrent.FutureCallback} for * {@link org.apache.camel.component.olingo4.api.impl.Olingo4AppImpl} */ +@Deprecated(since = "4.18") public abstract class AbstractFutureCallback implements FutureCallback { public static final Pattern ODATA_MIME_TYPE_PATTERN = Pattern.compile("application/((atom)|(json)|(xml)).*"); diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java index 720997b045ce3..084ae86b9ee10 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java @@ -118,6 +118,7 @@ /** * Application API used by Olingo4 Component. */ +@Deprecated(since = "4.18") public final class Olingo4AppImpl implements Olingo4App { private static final String SEPARATOR = "/"; diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4Helper.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4Helper.java index 50c9fc15d1e12..0282d0c788cc7 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4Helper.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4Helper.java @@ -23,6 +23,7 @@ /** * Helper */ +@Deprecated(since = "4.18") public final class Olingo4Helper { private Olingo4Helper() { diff --git a/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java b/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java index b436ae936149f..5a7b0ed39bcc0 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java +++ b/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java @@ -73,6 +73,7 @@ import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -203,6 +204,7 @@ public void testReadEntitySet() throws Exception { } @Test + @Disabled("CAMEL-22271 - failing since jackson upgrade from 2.19.1 to 2.19.2") public void testReadUnparsedEntitySet() throws Exception { final TestOlingo4ResponseHandler responseHandler = new TestOlingo4ResponseHandler<>(); @@ -241,6 +243,7 @@ public void testReadEntity() throws Exception { } @Test + @Disabled("CAMEL-22271 - failing since jackson upgrade from 2.19.1 to 2.19.2") public void testReadUnparsedEntity() throws Exception { final TestOlingo4ResponseHandler responseHandler = new TestOlingo4ResponseHandler<>(); diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml index 752f54cec9811..a06126dea160b 100644 --- a/components/camel-olingo4/camel-olingo4-component/pom.xml +++ b/components/camel-olingo4/camel-olingo4-component/pom.xml @@ -27,7 +27,7 @@ camel-olingo4 - Camel :: Olingo4 :: Component + Camel :: Olingo4 (Deprecated) :: Component Camel Olingo4 component diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/org/apache/camel/component/olingo4/olingo4.json b/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/org/apache/camel/component/olingo4/olingo4.json index 99b16a9ad4609..46dc6fbb02cf3 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/org/apache/camel/component/olingo4/olingo4.json +++ b/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/org/apache/camel/component/olingo4/olingo4.json @@ -4,7 +4,7 @@ "name": "olingo4", "title": "Olingo4", "description": "Communicate with OData 4.0 services using Apache Olingo OData API.", - "deprecated": false, + "deprecated": true, "firstVersion": "2.19.0", "label": "cloud", "javaType": "org.apache.camel.component.olingo4.Olingo4Component", diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 919adc96fead2..f0be6663ba094 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-olingo4/camel-olingo4-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=olingo4 groupId=org.apache.camel artifactId=camel-olingo4 version=4.17.0-SNAPSHOT -projectName=Camel :: Olingo4 :: Component +projectName=Camel :: Olingo4 (Deprecated) :: Component projectDescription=Camel Olingo4 component diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc index be487ff3cbf9d..9a58615973b31 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc +++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc @@ -1,10 +1,11 @@ -= Olingo4 Component += Olingo4 Component (deprecated) :doctitle: Olingo4 :shortname: olingo4 :artifactid: camel-olingo4 :description: Communicate with OData 4.0 services using Apache Olingo OData API. :since: 2.19 -:supportlevel: Stable +:supportlevel: Stable-deprecated +:deprecated: *deprecated* :tabs-sync-option: :component-header: Both producer and consumer are supported //Manually maintained attributes diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java index d070b951caf0c..b0d55c8f6bbc1 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java @@ -32,6 +32,7 @@ * Holder class for {@link org.apache.camel.component.olingo4.api.Olingo4App} and its lazily read * {@link org.apache.olingo.commons.api.edm.Edm}. */ +@Deprecated(since = "4.18") public class Olingo4AppWrapper { private final Lock lock = new ReentrantLock(); diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java index ffeb4bd234044..3833a8f0e2f92 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java @@ -40,6 +40,7 @@ * Represents the component that manages {@link Olingo4Endpoint}. */ @Component("olingo4") +@Deprecated(since = "4.18") public class Olingo4Component extends AbstractApiComponent implements SSLContextParametersAware { diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java index 1b81373cc7de7..dfa46ba27e231 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java @@ -36,6 +36,7 @@ */ @UriParams @Configurer(extended = true) +@Deprecated(since = "4.18") public class Olingo4Configuration { private static final String DEFAULT_CONTENT_TYPE = ContentType.APPLICATION_JSON.toString(); diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java index 957a155a88202..ee1c1d796ca2c 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java @@ -39,6 +39,7 @@ /** * The Olingo4 consumer. */ +@Deprecated(since = "4.18") public class Olingo4Consumer extends AbstractApiConsumer { private Olingo4Index resultIndex; diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java index fa2a41fb9f80b..22d739b0f6095 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java @@ -48,6 +48,7 @@ @UriEndpoint(firstVersion = "2.19.0", scheme = "olingo4", title = "Olingo4", syntax = "olingo4:apiName/methodName", apiSyntax = "apiName/methodName", category = { Category.CLOUD }, headersClass = Olingo4Constants.class) +@Deprecated(since = "4.18") public class Olingo4Endpoint extends AbstractApiEndpoint implements EndpointServiceLocation { diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java index a91b0b77c7355..a6781ec9e3010 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java @@ -26,6 +26,7 @@ import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.core.domain.ClientEntitySetImpl; +@Deprecated(since = "4.18") public class Olingo4Index { private Set resultIndex = new HashSet<>(); diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java index 569889ec77050..19de5512ab71a 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java @@ -34,6 +34,7 @@ /** * The Olingo4 producer. */ +@Deprecated(since = "4.18") public class Olingo4Producer extends AbstractApiProducer { private static final Logger LOG = LoggerFactory.getLogger(Olingo4Producer.class); diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4Constants.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4Constants.java index 34e552f899eaf..bd8c18a9bf6c5 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4Constants.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4Constants.java @@ -21,6 +21,7 @@ /** * Constants for Olingo4 component. */ +@Deprecated(since = "4.18") public interface Olingo4Constants { // prefix for parameters when passed as exchange header properties diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4PropertiesHelper.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4PropertiesHelper.java index 66464745444ad..169f69cf53cb4 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4PropertiesHelper.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/internal/Olingo4PropertiesHelper.java @@ -26,6 +26,7 @@ /** * Singleton {@link ApiMethodPropertiesHelper} for Olingo4 component. */ +@Deprecated(since = "4.18") public final class Olingo4PropertiesHelper extends ApiMethodPropertiesHelper { private static final Lock LOCK = new ReentrantLock(); diff --git a/components/camel-olingo4/pom.xml b/components/camel-olingo4/pom.xml index fdb368295be45..1e5a9fbb65a24 100644 --- a/components/camel-olingo4/pom.xml +++ b/components/camel-olingo4/pom.xml @@ -29,7 +29,7 @@ camel-olingo4-parent pom - Camel :: Olingo4 :: Parent + Camel :: Olingo4 (Deprecated) :: Parent Camel Olingo4 parent diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc index 7b1a6ce6e3203..8e965d471d866 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc @@ -13,3 +13,6 @@ See the xref:camel-upgrade-recipes-tool.adoc[documentation] page for details. == Upgrading Camel 4.17 to 4.18 +=== Component deprecation + +The `camel-olingo2` and `camel-olingo4` component are deprecated. This is due to the project Apache Olingo that has moved to the Apache Attic and is no more maintained. diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index 019b93c44ca69..b3ca7ed394ebb 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -11764,6 +11764,7 @@ public static OAIPMHEndpointBuilderFactory.OAIPMHEndpointBuilder oaipmh(String c * @param path apiName/methodName * @return the dsl builder */ + @Deprecated public static Olingo2EndpointBuilderFactory.Olingo2EndpointBuilder olingo2(String path) { return olingo2("olingo2", path); } @@ -11789,6 +11790,7 @@ public static Olingo2EndpointBuilderFactory.Olingo2EndpointBuilder olingo2(Strin * @param path apiName/methodName * @return the dsl builder */ + @Deprecated public static Olingo2EndpointBuilderFactory.Olingo2EndpointBuilder olingo2(String componentName, String path) { return Olingo2EndpointBuilderFactory.endpointBuilder(componentName, path); } @@ -11812,6 +11814,7 @@ public static Olingo2EndpointBuilderFactory.Olingo2EndpointBuilder olingo2(Strin * @param path apiName/methodName * @return the dsl builder */ + @Deprecated public static Olingo4EndpointBuilderFactory.Olingo4EndpointBuilder olingo4(String path) { return olingo4("olingo4", path); } @@ -11837,6 +11840,7 @@ public static Olingo4EndpointBuilderFactory.Olingo4EndpointBuilder olingo4(Strin * @param path apiName/methodName * @return the dsl builder */ + @Deprecated public static Olingo4EndpointBuilderFactory.Olingo4EndpointBuilder olingo4(String componentName, String path) { return Olingo4EndpointBuilderFactory.endpointBuilder(componentName, path); } diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java index 257bbfc076da1..86bdfabaa6a59 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java @@ -1980,6 +1980,7 @@ public interface Olingo2Builders { * * @return the dsl builder for the headers' name. */ + @Deprecated default Olingo2HeaderNameBuilder olingo2() { return Olingo2HeaderNameBuilder.INSTANCE; } @@ -2003,6 +2004,7 @@ default Olingo2HeaderNameBuilder olingo2() { * @param path apiName/methodName * @return the dsl builder */ + @Deprecated default Olingo2EndpointBuilder olingo2(String path) { return Olingo2EndpointBuilderFactory.endpointBuilder("olingo2", path); } @@ -2028,6 +2030,7 @@ default Olingo2EndpointBuilder olingo2(String path) { * @param path apiName/methodName * @return the dsl builder */ + @Deprecated default Olingo2EndpointBuilder olingo2(String componentName, String path) { return Olingo2EndpointBuilderFactory.endpointBuilder(componentName, path); } diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java index 1e203be6ec5a7..737bf93bd9d21 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java @@ -1758,6 +1758,7 @@ public interface Olingo4Builders { * * @return the dsl builder for the headers' name. */ + @Deprecated default Olingo4HeaderNameBuilder olingo4() { return Olingo4HeaderNameBuilder.INSTANCE; } @@ -1781,6 +1782,7 @@ default Olingo4HeaderNameBuilder olingo4() { * @param path apiName/methodName * @return the dsl builder */ + @Deprecated default Olingo4EndpointBuilder olingo4(String path) { return Olingo4EndpointBuilderFactory.endpointBuilder("olingo4", path); } @@ -1806,6 +1808,7 @@ default Olingo4EndpointBuilder olingo4(String path) { * @param path apiName/methodName * @return the dsl builder */ + @Deprecated default Olingo4EndpointBuilder olingo4(String componentName, String path) { return Olingo4EndpointBuilderFactory.endpointBuilder(componentName, path); }