maxhov · Mar 13, 2026 · Oct 30, 2024 · Oct 30, 2024 · Oct 31, 2024 · Nov 4, 2024
diff --git a/connector/base/src/main/java/com/blazebit/query/connector/base/ConvertingFieldAccessor.java b/connector/base/src/main/java/com/blazebit/query/connector/base/ConvertingFieldAccessor.java
@@ -4,6 +4,7 @@
  */
 package com.blazebit.query.connector.base;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import com.blazebit.query.spi.DataFormatFieldAccessor;
@@ -46,7 +47,7 @@ public Object get(Object o) {
 			}
 			return converterMethod.invoke( null, value );
 		}
-		catch (Exception e) {
+		catch (InvocationTargetException | IllegalAccessException e) {
 			throw new RuntimeException( e );
 		}
 	}

diff --git a/...google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/AssetDataFetcher.java b/...google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/AssetDataFetcher.java
@@ -13,9 +13,6 @@
 import com.google.cloud.asset.v1.Asset;
 import com.google.cloud.asset.v1.AssetServiceClient;
 import com.google.cloud.asset.v1.AssetServiceSettings;
-import com.google.cloud.resourcemanager.v3.Folder;
-import com.google.cloud.resourcemanager.v3.Organization;
-import com.google.cloud.resourcemanager.v3.Project;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,49 +22,49 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-public class AssetDataFetcher implements DataFetcher<Asset>, Serializable {
+public class AssetDataFetcher implements DataFetcher<GcpAsset>, Serializable {
 
 	public static final AssetDataFetcher INSTANCE = new AssetDataFetcher();
 
 	private AssetDataFetcher() {
 	}
 
 	@Override
-	public List<Asset> fetch(DataFetchContext context) {
+	public List<GcpAsset> fetch(DataFetchContext context) {
 		try {
 			List<CredentialsProvider> credentialsProviders = GcpConnectorConfig.GCP_CREDENTIALS_PROVIDER.getAll( context );
-			List<Asset> list = new ArrayList<>();
-			List<? extends Organization> organizations = context.getSession().getOrFetch( Organization.class );
-			List<? extends Folder> folders = context.getSession().getOrFetch( Folder.class );
-			List<? extends Project> projects = context.getSession().getOrFetch( Project.class );
+			List<GcpAsset> list = new ArrayList<>();
+			List<? extends GcpOrganization> organizations = context.getSession().getOrFetch( GcpOrganization.class );
+			List<? extends GcpFolder> folders = context.getSession().getOrFetch( GcpFolder.class );
+			List<? extends GcpProject> projects = context.getSession().getOrFetch( GcpProject.class );
 
 			for ( CredentialsProvider credentialsProvider : credentialsProviders ) {
 				final AssetServiceSettings settings = AssetServiceSettings.newBuilder()
 						.setCredentialsProvider(credentialsProvider)
 						.build();
 				try (AssetServiceClient client = AssetServiceClient.create( settings )) {
-					for ( Organization organization : organizations ) {
+					for ( GcpOrganization organization : organizations ) {
 						final AssetServiceClient.ListAssetsPagedResponse response = client.listAssets(
-								organization.getName()
+								organization.getPayload().getName()
 						);
 						for ( Asset instance : response.iterateAll() ) {
-							list.add( instance );
+							list.add( new GcpAsset( instance.getName(), instance ) );
 						}
 					}
-					for ( Folder folder : folders ) {
+					for ( GcpFolder folder : folders ) {
 						final AssetServiceClient.ListAssetsPagedResponse response = client.listAssets(
-								folder.getName()
+								folder.getPayload().getName()
 						);
 						for ( Asset instance : response.iterateAll() ) {
-							list.add( instance );
+							list.add( new GcpAsset( instance.getName(), instance ) );
 						}
 					}
-					for ( Project project : projects ) {
+					for ( GcpProject project : projects ) {
 						final AssetServiceClient.ListAssetsPagedResponse response = client.listAssets(
-								project.getName()
+								project.getPayload().getName()
 						);
 						for ( Asset instance : response.iterateAll() ) {
-							list.add( instance );
+							list.add( new GcpAsset( instance.getName(), instance ) );
 						}
 					}
 				}
@@ -81,6 +78,6 @@ public List<Asset> fetch(DataFetchContext context) {
 
 	@Override
 	public DataFormat getDataFormat() {
-		return DataFormats.beansConvention( Asset.class, GcpConventionContext.INSTANCE );
+		return DataFormats.beansConvention( GcpAsset.class, GcpConventionContext.INSTANCE );
 	}
 }
diff --git a/...oogle/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/FolderDataFetcher.java b/...oogle/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/FolderDataFetcher.java
@@ -13,7 +13,6 @@
 import com.google.cloud.resourcemanager.v3.Folder;
 import com.google.cloud.resourcemanager.v3.FoldersClient;
 import com.google.cloud.resourcemanager.v3.FoldersSettings;
-import com.google.cloud.resourcemanager.v3.Organization;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -23,29 +22,29 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-public class FolderDataFetcher implements DataFetcher<Folder>, Serializable {
+public class FolderDataFetcher implements DataFetcher<GcpFolder>, Serializable {
 
 	public static final FolderDataFetcher INSTANCE = new FolderDataFetcher();
 
 	private FolderDataFetcher() {
 	}
 
 	@Override
-	public List<Folder> fetch(DataFetchContext context) {
+	public List<GcpFolder> fetch(DataFetchContext context) {
 		try {
 			List<CredentialsProvider> credentialsProviders = GcpConnectorConfig.GCP_CREDENTIALS_PROVIDER.getAll( context );
-			List<Folder> list = new ArrayList<>();
-			List<? extends Organization> organizations = context.getSession().getOrFetch( Organization.class );
+			List<GcpFolder> list = new ArrayList<>();
+			List<? extends GcpOrganization> organizations = context.getSession().getOrFetch( GcpOrganization.class );
 
 			for ( CredentialsProvider credentialsProvider : credentialsProviders ) {
-				for ( Organization organization : organizations ) {
+				for ( GcpOrganization organization : organizations ) {
 					final FoldersSettings settings = FoldersSettings.newBuilder()
 							.setCredentialsProvider( credentialsProvider )
 							.build();
 					try (FoldersClient client = FoldersClient.create( settings )) {
-						final FoldersClient.ListFoldersPagedResponse response = client.listFolders( organization.getName() );
+						final FoldersClient.ListFoldersPagedResponse response = client.listFolders( organization.getPayload().getName() );
 						for ( Folder instance : response.iterateAll() ) {
-							list.add( instance );
+							list.add( new GcpFolder( instance.getName(), instance ) );
 						}
 					}
 				}
@@ -59,6 +58,6 @@ public List<Folder> fetch(DataFetchContext context) {
 
 	@Override
 	public DataFormat getDataFormat() {
-		return DataFormats.beansConvention( Folder.class, GcpConventionContext.INSTANCE );
+		return DataFormats.beansConvention( GcpFolder.class, GcpConventionContext.INSTANCE );
 	}
 }
diff --git a/connector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpAsset.java b/connector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpAsset.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.connector.gcp.base;
+
+import com.google.cloud.asset.v1.Asset;
+
+public class GcpAsset extends GcpWrapper<Asset> {
+	public GcpAsset(String resourceId, Asset asset) {
+		super(resourceId, asset);
+	}
+
+	@Override
+	public Asset getPayload() {
+		return super.getPayload();
+	}
+}
diff --git a/...le/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpConventionContext.java b/...le/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpConventionContext.java
@@ -5,10 +5,14 @@
 package com.blazebit.query.connector.gcp.base;
 
 import com.blazebit.query.connector.base.ConventionContext;
+import com.blazebit.query.connector.base.ConvertingFieldAccessor;
+import com.blazebit.query.spi.DataFormatFieldAccessor;
 import com.google.protobuf.ByteString;
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.time.Duration;
+import java.time.Instant;
 
 /**
  * A method filter to exclude internal and cyclic methods from the GCP models.
@@ -20,25 +24,58 @@ public class GcpConventionContext implements ConventionContext {
 
 	public static final ConventionContext INSTANCE = new GcpConventionContext();
 
+	private static final Method CONVERT_DURATION;
+	private static final Method CONVERT_TIMESTAMP;
+
+	static {
+		try {
+			CONVERT_DURATION = GcpTypeConverters.class.getMethod( "convertDuration", com.google.protobuf.Duration.class );
+			CONVERT_TIMESTAMP = GcpTypeConverters.class.getMethod( "convertTimestamp", com.google.protobuf.Timestamp.class );
+		}
+		catch (NoSuchMethodException e) {
+			throw new RuntimeException( e );
+		}
+	}
+
 	private GcpConventionContext() {
 	}
 
 	@Override
 	public ConventionContext getSubFilter(Class<?> concreteClass, Member member) {
 		final Method method = (Method) member;
 		if ( method.getReturnType() == ByteString.class
+				|| com.google.protobuf.ProtocolStringList.class.isAssignableFrom(method.getReturnType())
 				|| method.getName().endsWith( "OrBuilder" )
 				|| method.getName().endsWith( "OrBuilderList" )
 				|| method.getDeclaringClass().getPackageName().startsWith( "com.google.protobuf" ) ) {
 			return null;
 		}
-		switch ( method.getName() ) {
-			case "getDefaultInstanceForType":
-			case "getParserForType":
-			case "getSerializedSize":
-				return null;
-			default:
-				return this;
+		return switch ( method.getName() ) {
+			case "getDefaultInstanceForType", "getParserForType", "getSerializedSize" -> null;
+			default -> this;
+		};
+	}
+
+	@Override
+	public Class<?> resolveType(Class<?> typeClass) {
+		if ( typeClass == com.google.protobuf.Duration.class ) {
+			return Duration.class;
+		}
+		if ( typeClass == com.google.protobuf.Timestamp.class ) {
+			return Instant.class;
+		}
+		return typeClass;
+	}
+
+	@Override
+	public DataFormatFieldAccessor createConvertingAccessor(
+			DataFormatFieldAccessor accessor, Class<?> sourceType, Class<?> targetType) {
+		if ( sourceType == com.google.protobuf.Duration.class ) {
+			return new ConvertingFieldAccessor( accessor, CONVERT_DURATION );
+		}
+		if ( sourceType == com.google.protobuf.Timestamp.class ) {
+			return new ConvertingFieldAccessor( accessor, CONVERT_TIMESTAMP );
 		}
+		return accessor;
 	}
 }
diff --git a/connector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpFolder.java b/connector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpFolder.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.connector.gcp.base;
+
+import com.google.cloud.resourcemanager.v3.Folder;
+
+public class GcpFolder extends GcpWrapper<Folder> {
+	public GcpFolder(String resourceId, Folder folder) {
+		super(resourceId, folder);
+	}
+
+	@Override
+	public Folder getPayload() {
+		return super.getPayload();
+	}
+}
diff --git a/.../google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpOrganization.java b/.../google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpOrganization.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.connector.gcp.base;
+
+import com.google.cloud.resourcemanager.v3.Organization;
+
+public class GcpOrganization extends GcpWrapper<Organization> {
+	public GcpOrganization(String resourceId, Organization organization) {
+		super(resourceId, organization);
+	}
+
+	@Override
+	public Organization getPayload() {
+		return super.getPayload();
+	}
+}
diff --git a/...ector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpProject.java b/...ector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpProject.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.connector.gcp.base;
+
+import com.google.cloud.resourcemanager.v3.Project;
+
+public class GcpProject extends GcpWrapper<Project> {
+	public GcpProject(String resourceId, Project project) {
+		super(resourceId, project);
+	}
+
+	@Override
+	public Project getPayload() {
+		return super.getPayload();
+	}
+}
diff --git a/...oogle/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpTypeConverters.java b/...oogle/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpTypeConverters.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.connector.gcp.base;
+
+import java.time.Duration;
+import java.time.Instant;
+
+/**
+ * Static conversion methods for protobuf types to java.time types.
+ * Default/unset protobuf instances (0s, 0ns) are converted to {@code null}.
+ *
+ * @author Christian Beikov
+ * @since 1.0.0
+ */
+public final class GcpTypeConverters {
+
+	private GcpTypeConverters() {
+	}
+
+	/**
+	 * Converts a protobuf {@link com.google.protobuf.Duration} to a {@link Duration}.
+	 *
+	 * @param d The protobuf duration
+	 * @return The java.time duration, or {@code null} if the protobuf duration is the default instance
+	 */
+	public static Duration convertDuration(com.google.protobuf.Duration d) {
+		if ( d == null || d.equals( com.google.protobuf.Duration.getDefaultInstance() ) ) {
+			return null;
+		}
+		return Duration.ofSeconds( d.getSeconds(), d.getNanos() );
+	}
+
+	/**
+	 * Converts a protobuf {@link com.google.protobuf.Timestamp} to an {@link Instant}.
+	 *
+	 * @param t The protobuf timestamp
+	 * @return The java.time instant, or {@code null} if the protobuf timestamp is the default instance
+	 */
+	public static Instant convertTimestamp(com.google.protobuf.Timestamp t) {
+		if ( t == null || t.equals( com.google.protobuf.Timestamp.getDefaultInstance() ) ) {
+			return null;
+		}
+		return Instant.ofEpochSecond( t.getSeconds(), t.getNanos() );
+	}
+}
diff --git a/...ector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpWrapper.java b/...ector/google/gcp/base/src/main/java/com/blazebit/query/connector/gcp/base/GcpWrapper.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.connector.gcp.base;
+
+public abstract class GcpWrapper<T> {
+
+	private final String resourceId;
+	private final T payload;
+
+	public GcpWrapper(String resourceId, T payload) {
+		this.resourceId = resourceId;
+		this.payload = payload;
+	}
+
+	public String getResourceId() {
+		return resourceId;
+	}
+
+	public T getPayload() {
+		return payload;
+	}
+}