This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b481dd2898b0135e0dcc560f31f5eb1c6bce6f91
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri May 9 09:33:49 2025 +0200
CAMEL-22013 - camel-api - Remove all usage of component.extension and the
component.extension package content itself - Google Sheets
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../google/sheets/GoogleSheetsComponent.java | 2 -
.../sheets/GoogleSheetsVerifierExtension.java | 84 ----------------------
.../sheets/stream/GoogleSheetsStreamComponent.java | 2 -
.../sheets/GoogleSheetsVerifierExtensionTest.java | 69 ------------------
4 files changed, 157 deletions(-)
diff --git
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
index e922da901f4..8e45c4bc517 100644
---
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
+++
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
@@ -39,12 +39,10 @@ public class GoogleSheetsComponent
public GoogleSheetsComponent() {
super(GoogleSheetsApiName.class,
GoogleSheetsApiCollection.getCollection());
- registerExtension(new GoogleSheetsVerifierExtension("google-sheets"));
}
public GoogleSheetsComponent(CamelContext context) {
super(context, GoogleSheetsApiName.class,
GoogleSheetsApiCollection.getCollection());
- registerExtension(new GoogleSheetsVerifierExtension("google-sheets",
context));
}
@Override
diff --git
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
deleted file mode 100644
index 245f6ebfd65..00000000000
---
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
+++ /dev/null
@@ -1,84 +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.sheets;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-import com.google.api.services.sheets.v4.Sheets;
-import org.apache.camel.CamelContext;
-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 GoogleSheetsVerifierExtension extends
DefaultComponentVerifierExtension {
-
- public GoogleSheetsVerifierExtension(String defaultScheme) {
- super(defaultScheme);
- }
-
- public GoogleSheetsVerifierExtension(String defaultScheme, CamelContext
context) {
- super(defaultScheme, context);
- }
-
- // *********************************
- // 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 {
- GoogleSheetsConfiguration configuration = setProperties(new
GoogleSheetsConfiguration(), parameters);
- GoogleSheetsClientFactory clientFactory = new
BatchGoogleSheetsClientFactory();
- Sheets client =
clientFactory.makeClient(configuration.getClientId(),
configuration.getClientSecret(),
- configuration.getScopesAsList(),
configuration.getApplicationName(),
- configuration.getRefreshToken(),
configuration.getAccessToken());
-
client.spreadsheets().get(Optional.ofNullable(parameters.get("spreadsheetId"))
- .map(Object::toString)
- .orElse(UUID.randomUUID().toString())).execute();
- } catch (Exception e) {
- ResultErrorBuilder errorBuilder
- =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
- .detail("google_sheets_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-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
index 1c38cf6063f..b69cf7ec466 100644
---
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
+++
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
@@ -23,7 +23,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.component.google.sheets.BatchGoogleSheetsClientFactory;
import org.apache.camel.component.google.sheets.GoogleSheetsClientFactory;
-import org.apache.camel.component.google.sheets.GoogleSheetsVerifierExtension;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.HealthCheckComponent;
@@ -45,7 +44,6 @@ public class GoogleSheetsStreamComponent extends
HealthCheckComponent {
public GoogleSheetsStreamComponent(CamelContext context) {
super(context);
- registerExtension(new
GoogleSheetsVerifierExtension("google-sheets-stream", context));
this.configuration = new GoogleSheetsStreamConfiguration();
}
diff --git
a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
deleted file mode 100644
index c0ed495f641..00000000000
---
a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
+++ /dev/null
@@ -1,69 +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.sheets;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-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 GoogleSheetsVerifierExtensionTest extends CamelTestSupport {
-
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Test
- public void testVerifyParameters() {
- Component component = context().getComponent("google-sheets");
-
- 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 testVerifyConnectivity() {
- Component component = context().getComponent("google-sheets");
- 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");
- parameters.put("spreadsheetId", UUID.randomUUID().toString());
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- }
-
-}
