CAMEL-22812 - Deprecate Olingo component

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",

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",

components/camel-olingo2/camel-olingo2-api/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>camel-olingo2-api</artifactId>
-    <name>Camel :: Olingo2 :: API</name>
+    <name>Camel :: Olingo2 (Deprecated) :: API</name>
     <description>Camel Olingo2 API</description>
     <packaging>jar</packaging>
 

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

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 {
 
     /**

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<T> {
 
     /**

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;

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<String, String> queryParams;

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;

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;

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"),

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<T> implements FutureCallback<HttpResponse> {
 
     public static final Pattern ODATA_MIME_TYPE = Pattern.compile("application/((atom)|(json)|(xml)).*");

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";

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;

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";

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() {

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,

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;

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

components/camel-olingo2/camel-olingo2-component/pom.xml

@@ -29,7 +29,7 @@
 
     <artifactId>camel-olingo2</artifactId>
     <packaging>jar</packaging>
-    <name>Camel :: Olingo2 :: Component</name>
+    <name>Camel :: Olingo2 (Deprecated) :: Component</name>
     <description>Camel Olingo2 component</description>
 
     <properties>

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",

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

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

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();

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<Olingo2ApiName, Olingo2Configuration, Olingo2ApiCollection>
         implements SSLContextParametersAware {
 

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();

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<Olingo2ApiName, Olingo2Configuration> {
 
     private Olingo2Index resultIndex;

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<Olingo2ApiName, Olingo2Configuration>
         implements EndpointServiceLocation {
 

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<Integer> resultIndex = new HashSet<>();

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<Olingo2ApiName, Olingo2Configuration> {
 
     private static final Logger LOG = LoggerFactory.getLogger(Olingo2Producer.class);

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

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<Olingo2Configuration> {
 
     private static final Lock LOCK = new ReentrantLock();

components/camel-olingo2/pom.xml

@@ -29,7 +29,7 @@
 
     <artifactId>camel-olingo2-parent</artifactId>
     <packaging>pom</packaging>
-    <name>Camel :: Olingo2 :: Parent</name>
+    <name>Camel :: Olingo2 (Deprecated) :: Parent</name>
     <description>Camel Olingo2 parent</description>
 
     <modules>

components/camel-olingo4/camel-olingo4-api/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>camel-olingo4-api</artifactId>
-    <name>Camel :: Olingo4 :: API</name>
+    <name>Camel :: Olingo4 (Deprecated) :: API</name>
     <description>Camel Olingo4 API</description>
     <packaging>jar</packaging>
 

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

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 {
 
     /**

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<T> {
 
     /**

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;

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<String, String> queryParams;

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;

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;

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"),

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<T> implements FutureCallback<HttpResponse> {
 
     public static final Pattern ODATA_MIME_TYPE_PATTERN = Pattern.compile("application/((atom)|(json)|(xml)).*");

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 = "/";

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() {

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<InputStream> 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<InputStream> responseHandler = new TestOlingo4ResponseHandler<>();