This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 22013
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 67bfc4cfcd9f9b3bdede1bb28a448e042a9cfe20
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 8 15:48:46 2025 +0200
CAMEL-22013 - camel-api - Remove all usage of component.extension and the
component.extension package content itself - Google Mail
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../component/google/mail/GoogleMailComponent.java | 2 -
.../mail/GoogleMailComponentVerifierExtension.java | 86 ----------------------
.../mail/stream/GoogleMailStreamComponent.java | 1 -
...GoogleMailStreamComponentVerifierExtension.java | 83 ---------------------
.../GoogleMailComponentVerifierExtensionTest.java | 71 ------------------
...leMailStreamComponentVerifierExtensionTest.java | 71 ------------------
6 files changed, 314 deletions(-)
diff --git
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index e50a44e74ca..efb13d7101c 100644
---
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -38,12 +38,10 @@ public class GoogleMailComponent
public GoogleMailComponent() {
super(GoogleMailApiName.class,
GoogleMailApiCollection.getCollection());
- registerExtension(new GoogleMailComponentVerifierExtension());
}
public GoogleMailComponent(CamelContext context) {
super(context, GoogleMailApiName.class,
GoogleMailApiCollection.getCollection());
- registerExtension(new GoogleMailComponentVerifierExtension());
}
@Override
diff --git
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
deleted file mode 100644
index 2c6117fde1f..00000000000
---
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
+++ /dev/null
@@ -1,86 +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.camel.component.google.mail;
-
-import java.util.Map;
-
-import com.google.api.services.gmail.Gmail;
-import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
-import org.apache.camel.component.extension.verifier.ResultBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
-public class GoogleMailComponentVerifierExtension extends
DefaultComponentVerifierExtension {
-
- public GoogleMailComponentVerifierExtension() {
- this("google-mail");
- }
-
- public GoogleMailComponentVerifierExtension(String scheme) {
- super(scheme);
- }
-
- // *********************************
- // Parameters validation
- // *********************************
-
- @Override
- protected Result verifyParameters(Map<String, Object> parameters) {
-
- ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS)
- .error(ResultErrorHelper.requiresOption(parameters,
"applicationName"))
- .error(ResultErrorHelper.requiresOption(parameters,
"clientId"))
- .error(ResultErrorHelper.requiresOption(parameters,
"clientSecret"));
-
- return builder.build();
- }
-
- // *********************************
- // Connectivity validation
- // *********************************
-
- @Override
- @SuppressWarnings("PMD.AvoidCatchingGenericException")
- protected Result verifyConnectivity(Map<String, Object> parameters) {
- ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
-
- try {
- GoogleMailConfiguration configuration = setProperties(new
GoogleMailConfiguration(), parameters);
- GoogleMailClientFactory clientFactory = new
BatchGoogleMailClientFactory();
- Gmail client = null;
- if (configuration.getClientSecret() != null) {
- client = clientFactory.makeClient(configuration.getClientId(),
configuration.getClientSecret(),
- configuration.getScopes(),
configuration.getApplicationName(),
- configuration.getRefreshToken(),
configuration.getAccessToken());
- } else if (configuration.getServiceAccountKey() != null) {
- client = clientFactory.makeClient(getCamelContext(),
configuration.getServiceAccountKey(),
- configuration.getScopes(),
configuration.getApplicationName(), configuration.getDelegate());
- }
- client.users().getProfile((String)
parameters.get("userId")).execute();
- } catch (Exception e) {
- ResultErrorBuilder errorBuilder
- =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
- .detail("gmail_exception_message", e.getMessage())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS,
e.getClass().getName())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
-
- builder.error(errorBuilder.build());
- }
-
- return builder.build();
- }
-}
diff --git
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
index 16b99e50557..92500ec2bed 100644
---
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
+++
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
@@ -46,7 +46,6 @@ public class GoogleMailStreamComponent extends
HealthCheckComponent {
public GoogleMailStreamComponent(CamelContext context) {
super(context);
- registerExtension(new GoogleMailStreamComponentVerifierExtension());
this.configuration = new GoogleMailStreamConfiguration();
}
diff --git
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtension.java
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtension.java
deleted file mode 100644
index 0c3e6bf9856..00000000000
---
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtension.java
+++ /dev/null
@@ -1,83 +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.camel.component.google.mail.stream;
-
-import java.util.Map;
-
-import com.google.api.services.gmail.Gmail;
-import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
-import org.apache.camel.component.extension.verifier.ResultBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-import org.apache.camel.component.google.mail.BatchGoogleMailClientFactory;
-import org.apache.camel.component.google.mail.GoogleMailClientFactory;
-import org.apache.camel.component.google.mail.GoogleMailConfiguration;
-
-public class GoogleMailStreamComponentVerifierExtension extends
DefaultComponentVerifierExtension {
-
- public GoogleMailStreamComponentVerifierExtension() {
- this("google-mail-stream");
- }
-
- public GoogleMailStreamComponentVerifierExtension(String scheme) {
- super(scheme);
- }
-
- // *********************************
- // Parameters validation
- // *********************************
-
- @Override
- protected Result verifyParameters(Map<String, Object> parameters) {
-
- ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS)
- .error(ResultErrorHelper.requiresOption(parameters,
"applicationName"))
- .error(ResultErrorHelper.requiresOption(parameters,
"clientId"))
- .error(ResultErrorHelper.requiresOption(parameters,
"clientSecret"));
-
- return builder.build();
- }
-
- // *********************************
- // Connectivity validation
- // *********************************
-
- @Override
- @SuppressWarnings("PMD.AvoidCatchingGenericException")
- protected Result verifyConnectivity(Map<String, Object> parameters) {
- ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
-
- try {
- GoogleMailConfiguration configuration = setProperties(new
GoogleMailConfiguration(), parameters);
- GoogleMailClientFactory clientFactory = new
BatchGoogleMailClientFactory();
- Gmail client =
clientFactory.makeClient(configuration.getClientId(),
configuration.getClientSecret(),
- configuration.getScopes(),
configuration.getApplicationName(),
- configuration.getRefreshToken(),
configuration.getAccessToken());
- client.users().getProfile((String)
parameters.get("userId")).execute();
- } catch (Exception e) {
- ResultErrorBuilder errorBuilder
- =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
- .detail("gmail_exception_message", e.getMessage())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS,
e.getClass().getName())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
-
- builder.error(errorBuilder.build());
- }
-
- return builder.build();
- }
-}
diff --git
a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java
b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java
deleted file mode 100644
index 0000afcc2a9..00000000000
---
a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,71 +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.camel.component.google.mail;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.Component;
-import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GoogleMailComponentVerifierExtensionTest extends CamelTestSupport
{
-
- // *************************************************
- // Tests (parameters)
- // *************************************************
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Test
- public void testParameters() {
- Component component = context().getComponent("google-mail");
-
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("clientId", "l");
- parameters.put("clientSecret", "k");
- parameters.put("applicationName", "test");
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
- }
-
- @Test
- public void testConnectivity() {
- Component component = context().getComponent("google-mail");
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("clientId", "l");
- parameters.put("clientSecret", "k");
- parameters.put("userId", "t...@gmail.com");
- parameters.put("applicationName", "test");
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- }
-
-}
diff --git
a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java
b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java
deleted file mode 100644
index 25e5f02dcfe..00000000000
---
a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,71 +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.camel.component.google.mail.stream;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.Component;
-import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GoogleMailStreamComponentVerifierExtensionTest extends
CamelTestSupport {
-
- // *************************************************
- // Tests (parameters)
- // *************************************************
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Test
- public void testParameters() {
- Component component = context().getComponent("google-mail-stream");
-
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("clientId", "l");
- parameters.put("clientSecret", "k");
- parameters.put("applicationName", "test");
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
- }
-
- @Test
- public void testConnectivity() {
- Component component = context().getComponent("google-mail-stream");
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("clientId", "l");
- parameters.put("clientSecret", "k");
- parameters.put("userId", "t...@gmail.com");
- parameters.put("applicationName", "test");
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- }
-
-}
