yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2026-01-06 12:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backend][JavaClientFix] Java Client Fix (#6726)

Browse Source 
* [Backend][JavaClientFix] Updated package for generated code , use lombok annotation for logging, fixed code as per standards

* [Backend][JavaClientFix] Added core and client

* [Backend][JavaClientFix] Checkstyle fix
This commit is contained in:
mohitdeuex 2022-08-15 11:05:49 +05:30 committed by GitHub
parent c968fc8912
commit 6005cdf435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openmetadata-clients/openmetadata-java-client/lombok.config Normal file
View File

@ -0,0 +1 @@
lombok.log.fieldName = LOG

8
openmetadata-clients/openmetadata-java-client/pom.xml
View File

@ -21,7 +21,7 @@
<dependency>
<groupId>org.open-metadata</groupId>
<artifactId>openmetadata-core</artifactId>
<version>0.11.4</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@ -99,6 +99,10 @@
<artifactId>feign-okhttp</artifactId>
<version>11.7</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- TEST -->
<dependency>
<groupId>junit</groupId>
@ -160,6 +164,8 @@
<library>feign</library>
<generateApiTests>true</generateApiTests>
<generateModelTests>true</generateModelTests>
<apiPackage>org.openmetadata.client.api</apiPackage>
<modelPackage>org.openmetadata.client.model</modelPackage>
<configOptions>
<generateForOpenFeign>true</generateForOpenFeign>
<sourceFolder>src/main/java/</sourceFolder>

11
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/gateway/OpenMetadata.java
View File

@ -21,18 +21,17 @@ import feign.jackson.JacksonDecoder;
import feign.jackson.JacksonEncoder;
import feign.okhttp.OkHttpClient;
import feign.slf4j.Slf4jLogger;
import io.swagger.client.ApiClient;
import io.swagger.client.api.CatalogApi;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.api.CatalogVersion;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.api.CatalogApi;
import org.openmetadata.client.interceptors.CustomRequestInterceptor;
import org.openmetadata.client.security.factory.AuthenticationProviderFactory;
import org.openmetadata.core.util.VersionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class OpenMetadata {
private static final Logger LOG = LoggerFactory.getLogger(OpenMetadata.class);
private static final CatalogVersion CATALOG_VERSION_CLIENT;
static {
@ -112,7 +111,7 @@ public class OpenMetadata {
public String[] getServerVersion() {
CatalogApi api = apiClient.buildClient(CatalogApi.class);
io.swagger.client.model.CatalogVersion serverVersion = api.getCatalogVersion();
org.openmetadata.client.model.CatalogVersion serverVersion = api.getCatalogVersion();
return VersionUtils.getVersionFromString(serverVersion.getVersion());
}

6
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/interceptors/CustomRequestInterceptor.java
View File

@ -16,12 +16,10 @@ package org.openmetadata.client.interceptors;
import com.fasterxml.jackson.databind.ObjectMapper;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.openmetadata.client.gateway.OpenMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class CustomRequestInterceptor<K> implements RequestInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(OpenMetadata.class);
private final Class<K> type;
ObjectMapper mapper;

2
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/listUtils/ListUtils.java
View File

@ -1,12 +1,12 @@
package org.openmetadata.client.listUtils;
import io.swagger.client.model.Paging;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.openmetadata.client.model.Paging;
public class ListUtils {

9
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/Auth0AuthenticationProvider.java
View File

@ -14,23 +14,20 @@
package org.openmetadata.client.security;
import feign.RequestTemplate;
import io.swagger.client.ApiClient;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.security.client.Auth0SSOClientConfig;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.interceptors.Auth0AccessTokenRequestInterceptor;
import org.openmetadata.client.model.AccessTokenResponse;
import org.openmetadata.client.security.interfaces.Auth0AccessTokenApi;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class Auth0AuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG = LoggerFactory.getLogger(Auth0AuthenticationProvider.class);
private OpenMetadataServerConnection serverConfig;
private final Auth0SSOClientConfig securityConfig;

5
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/AzureAuthenticationProvider.java
View File

@ -22,14 +22,13 @@ import com.microsoft.aad.msal4j.IClientCredential;
import feign.RequestTemplate;
import java.io.IOException;
import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.security.client.AzureSSOClientConfig;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class AzureAuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG = LoggerFactory.getLogger(AzureAuthenticationProvider.class);
private OpenMetadataServerConnection serverConfig;
private final AzureSSOClientConfig securityConfig;
private String generatedAuthToken;

8
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/CustomOIDCAuthenticationProvider.java
View File

@ -15,21 +15,19 @@ package org.openmetadata.client.security;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import io.swagger.client.ApiClient;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.security.client.CustomOIDCSSOClientConfig;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.model.AccessTokenResponse;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
import org.openmetadata.client.security.interfaces.CustomOIDCAccessTokenApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class CustomOIDCAuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG = LoggerFactory.getLogger(CustomOIDCAuthenticationProvider.class);
private OpenMetadataServerConnection serverConfig;
private final CustomOIDCSSOClientConfig securityConfig;
private String generatedAuthToken;

5
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/GoogleAuthenticationProvider.java
View File

@ -19,14 +19,13 @@ import com.google.auth.oauth2.ServiceAccountCredentials;
import feign.RequestTemplate;
import java.io.FileInputStream;
import java.util.Arrays;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.security.client.GoogleSSOClientConfig;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class GoogleAuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG = LoggerFactory.getLogger(GoogleAuthenticationProvider.class);
private OpenMetadataServerConnection serverConfig;
private GoogleSSOClientConfig securityConfig;
private String generatedAuthToken;

2
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/NoOpAuthenticationProvider.java
View File

@ -14,9 +14,11 @@
package org.openmetadata.client.security;
import feign.RequestTemplate;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
@Slf4j
public class NoOpAuthenticationProvider implements AuthenticationProvider {
public NoOpAuthenticationProvider() {}

9
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/OktaAuthenticationProvider.java
View File

@ -14,23 +14,20 @@
package org.openmetadata.client.security;
import feign.RequestTemplate;
import io.swagger.client.ApiClient;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.interceptors.OktaAccessTokenRequestInterceptor;
import org.openmetadata.client.model.AccessTokenResponse;
import org.openmetadata.client.model.OktaSSOConfig;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
import org.openmetadata.client.security.interfaces.OktaAccessTokenApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class OktaAuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG = LoggerFactory.getLogger(GoogleAuthenticationProvider.class);
public static final String clientAssertionType = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
private OpenMetadataServerConnection serverConfig;
private OktaSSOConfig securityConfig;

6
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/OpenMetadataAuthenticationProvider.java
View File

@ -14,15 +14,13 @@
package org.openmetadata.client.security;
import feign.RequestTemplate;
import lombok.extern.slf4j.Slf4j;
import org.openmetadata.catalog.security.client.OpenMetadataJWTClientConfig;
import org.openmetadata.catalog.services.connections.metadata.OpenMetadataServerConnection;
import org.openmetadata.client.security.interfaces.AuthenticationProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class OpenMetadataAuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG = LoggerFactory.getLogger(OpenMetadataAuthenticationProvider.class);
private final OpenMetadataJWTClientConfig securityConfig;
private String generatedAuthToken;
private Long expirationTimeMillis;

2
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/interfaces/Auth0AccessTokenApi.java
View File

@ -2,7 +2,7 @@ package org.openmetadata.client.security.interfaces;
import feign.Headers;
import feign.RequestLine;
import io.swagger.client.ApiClient;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.model.AccessTokenResponse;
public interface Auth0AccessTokenApi extends ApiClient.Api {

2
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/interfaces/CustomOIDCAccessTokenApi.java
View File

@ -2,7 +2,7 @@ package org.openmetadata.client.security.interfaces;
import feign.Headers;
import feign.RequestLine;
import io.swagger.client.ApiClient;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.model.AccessTokenResponse;
public interface CustomOIDCAccessTokenApi extends ApiClient.Api {

7
openmetadata-clients/openmetadata-java-client/src/main/java/org/openmetadata/client/security/interfaces/OktaAccessTokenApi.java
View File

@ -13,9 +13,12 @@
package org.openmetadata.client.security.interfaces;
import feign.*;
import io.swagger.client.ApiClient;
import feign.Headers;
import feign.Param;
import feign.QueryMap;
import feign.RequestLine;
import java.util.Map;
import org.openmetadata.client.ApiClient;
import org.openmetadata.client.model.AccessTokenResponse;
public interface OktaAccessTokenApi extends ApiClient.Api {

2
pom.xml
View File

@ -28,6 +28,7 @@
<module>catalog-rest-service</module>
<module>openmetadata-ui</module>
<module>openmetadata-dist</module>
<module>openmetadata-core</module>
<module>openmetadata-clients</module>
</modules>
<packaging>pom</packaging>
@ -420,7 +421,6 @@
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>