(gravitino) branch main updated: [MINOR] Revert changes that remove getter method in EntityCombinedFileset (#6975)

[roryqi]

This is an automated email from the ASF dual-hosted git repository.

roryqi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/main by this push:
     new 98632c3090 [MINOR] Revert changes that remove getter method in 
EntityCombinedFileset (#6975)
98632c3090 is described below

commit 98632c309005858110cb842780c45b3e87e0df00
Author: Mini Yu <y...@datastrato.com>
AuthorDate: Thu Apr 17 10:48:32 2025 +0800

    [MINOR] Revert changes that remove getter method in EntityCombinedFileset 
(#6975)
    
    ### What changes were proposed in this pull request?
    
    Add back getter method in EntityCombinedFileset that is caused by #6922
    
    ### Why are the changes needed?
    
    It's used by other import project.
    
    ### Does this PR introduce _any_ user-facing change?
    
    N/A
    
    ### How was this patch tested?
    
    N/A.
---
 .../gravitino/catalog/EntityCombinedFileset.java   |  8 ++++
 .../catalog/TestEntityCombinedFileset.java         | 54 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git 
a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java 
b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
index 0964a0781f..bdfdad3507 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
@@ -40,6 +40,14 @@ public final class EntityCombinedFileset implements Fileset {
     this.filesetEntity = filesetEntity;
   }
 
+  public FilesetEntity filesetEntity() {
+    return filesetEntity;
+  }
+
+  public Fileset fileset() {
+    return fileset;
+  }
+
   public static EntityCombinedFileset of(Fileset fileset, FilesetEntity 
filesetEntity) {
     return new EntityCombinedFileset(fileset, filesetEntity);
   }
diff --git 
a/core/src/test/java/org/apache/gravitino/catalog/TestEntityCombinedFileset.java
 
b/core/src/test/java/org/apache/gravitino/catalog/TestEntityCombinedFileset.java
new file mode 100644
index 0000000000..6813995133
--- /dev/null
+++ 
b/core/src/test/java/org/apache/gravitino/catalog/TestEntityCombinedFileset.java
@@ -0,0 +1,54 @@
+/*
+ * 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.gravitino.catalog;
+
+import static org.apache.gravitino.file.Fileset.LOCATION_NAME_UNKNOWN;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.gravitino.file.Fileset;
+import org.apache.gravitino.meta.AuditInfo;
+import org.apache.gravitino.meta.FilesetEntity;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+public class TestEntityCombinedFileset {
+
+  /**
+   * This test has no real assertions, but it's just to use the getter 
methods, by calling them
+   * others will not delete the getters by mistake.
+   */
+  @Test
+  void testGetters() {
+    Fileset fileset = Mockito.mock(Fileset.class);
+    FilesetEntity filesetEntity =
+        FilesetEntity.builder()
+            .withId(1L)
+            .withName("fileset")
+            .withAuditInfo(AuditInfo.EMPTY)
+            .withFilesetType(Fileset.Type.MANAGED)
+            .withStorageLocations(ImmutableMap.of(LOCATION_NAME_UNKNOWN, 
"testLocation"))
+            .withProperties(ImmutableMap.of())
+            .build();
+
+    EntityCombinedFileset entityCombinedFileset = 
EntityCombinedFileset.of(fileset, filesetEntity);
+    Assertions.assertEquals(fileset, entityCombinedFileset.fileset());
+    Assertions.assertEquals(filesetEntity, 
entityCombinedFileset.filesetEntity());
+  }
+}