Removed unnecessary code that already existed in main

Author: NirYanay2005

nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-aws/src/main/java/org/apache/nifi/services/iceberg/aws/S3IcebergFileIOProvider.java

@@ -103,39 +103,35 @@ public class S3IcebergFileIOProvider extends AbstractControllerService implement
             )
             .build();
 
-    static final PropertyDescriptor ENDPOINT = new PropertyDescriptor.Builder()
-            .name("Endpoint")
-            .description("Endpoint Override URL, use for on-premise s3 compactible solutions")
+    static final PropertyDescriptor ENDPOINT_URL = new PropertyDescriptor.Builder()
+            .name("Endpoint URL")
+            .description("""
+                Endpoint URL to use instead of the AWS default including scheme, host, port, and path.
+                The AWS libraries select an endpoint URL based on the AWS region, but this property overrides
+                the selected endpoint URL, allowing use with other S3-compatible endpoints.""")
             .required(false)
-            .addValidator(StandardValidators.URI_VALIDATOR)
-            .dependsOn(
-                    AUTHENTICATION_STRATEGY,
-                    AuthenticationStrategy.BASIC_CREDENTIALS
-            )
+            .addValidator(StandardValidators.URL_VALIDATOR)
             .build();
 
-    static final PropertyDescriptor PATH_STYLE_ACCESS  = new PropertyDescriptor.Builder()
+    static final PropertyDescriptor PATH_STYLE_ACCESS = new PropertyDescriptor.Builder()
             .name("Path Style Access")
-            .description("Path Style Access, use for on-premise s3 compactible solutions")
+            .description("""
+                Path-style access can be enforced by setting this property to true. Set it to true if the configured
+                endpoint does not support virtual-hosted-style requests, only path-style requests.""")
+            .allowableValues(Boolean.TRUE.toString(), Boolean.FALSE.toString())
+            .defaultValue(String.valueOf(S3FileIOProperties.PATH_STYLE_ACCESS_DEFAULT))
             .required(true)
             .addValidator(StandardValidators.BOOLEAN_VALIDATOR)
-            .allowableValues("true", "false")
-            .defaultValue(String.valueOf(S3FileIOProperties.PATH_STYLE_ACCESS_DEFAULT))
-            .dependsOn(
-                    AUTHENTICATION_STRATEGY,
-                    AuthenticationStrategy.BASIC_CREDENTIALS
-            )
             .build();
 
     static final PropertyDescriptor STORAGE_CLASS  = new PropertyDescriptor.Builder()
             .name("Storage Class")
-            .description("Storage Class, use for on-premise s3 compactible solutions")
-            .required(false)
+            .description("""
+                    Specifies the S3 storage class to use when writing objects. 
+                    Primarily intended for on-premises or S3-compatible object storage implementations.""")
+            .required(true)
             .allowableValues(StorageClass.values())
-            .dependsOn(
-                    AUTHENTICATION_STRATEGY,
-                    AuthenticationStrategy.BASIC_CREDENTIALS
-            )
+            .defaultValue(String.valueOf(StorageClass.STANDARD))
             .build();
 
     private static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS = List.of(
@@ -144,7 +140,7 @@ public class S3IcebergFileIOProvider extends AbstractControllerService implement
             SECRET_ACCESS_KEY,
             SESSION_TOKEN,
             CLIENT_REGION,
-            ENDPOINT,
+            ENDPOINT_URL,
             PATH_STYLE_ACCESS,
             STORAGE_CLASS
     );
@@ -189,22 +185,24 @@ private Map<String, String> getConfiguredProperties(final ConfigurationContext c
 
             final String accessKeyId = context.getProperty(ACCESS_KEY_ID).getValue();
             final String secretAccessKey = context.getProperty(SECRET_ACCESS_KEY).getValue();
-            final String endpoint = context.getProperty(ENDPOINT).getValue();
-            final String pathStyleAccess = context.getProperty(PATH_STYLE_ACCESS).getValue();
-            final String storageCLass = context.getProperty(STORAGE_CLASS).getValue();
-
             contextProperties.put(S3FileIOProperties.ACCESS_KEY_ID, accessKeyId);
             contextProperties.put(S3FileIOProperties.SECRET_ACCESS_KEY, secretAccessKey);
-            contextProperties.put(S3FileIOProperties.ENDPOINT, endpoint);
-            contextProperties.put(S3FileIOProperties.PATH_STYLE_ACCESS, pathStyleAccess);
-            contextProperties.put(S3FileIOProperties.WRITE_STORAGE_CLASS, storageCLass);
 
             if (AuthenticationStrategy.SESSION_CREDENTIALS == authenticationStrategy) {
                 final String sessionToken = context.getProperty(SESSION_TOKEN).getValue();
                 contextProperties.put(S3FileIOProperties.SESSION_TOKEN, sessionToken);
             }
         }
 
+        if (context.getProperty(ENDPOINT_URL).isSet()) {
+            final String endpoint = context.getProperty(ENDPOINT_URL).getValue();
+            contextProperties.put(S3FileIOProperties.ENDPOINT, endpoint);
+        }
+        final String pathStyleAccess = context.getProperty(PATH_STYLE_ACCESS).getValue();
+        contextProperties.put(S3FileIOProperties.PATH_STYLE_ACCESS, pathStyleAccess);
+
+        final String storageClass = context.getProperty(STORAGE_CLASS).getValue();
+        contextProperties.put(S3FileIOProperties.WRITE_STORAGE_CLASS, storageClass);
         // HttpURLConnection Client Type avoids additional dependencies
         contextProperties.put(HttpClientProperties.CLIENT_TYPE, HttpClientProperties.CLIENT_TYPE_URLCONNECTION);
 
@@ -214,4 +212,4 @@ private Map<String, String> getConfiguredProperties(final ConfigurationContext c
         final S3FileIOProperties ioProperties = new S3FileIOProperties(contextProperties);
         return ioProperties.properties();
     }
-}
+}

nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-aws/src/test/java/org/apache/nifi/services/iceberg/aws/S3IcebergFileIOProviderTest.java

@@ -47,12 +47,6 @@ class S3IcebergFileIOProviderTest {
 
     private static final String SESSION_TOKEN = "SessionToken";
 
-    private static final String ENDPOINT = "Endpoint";
-
-    private static final String PATH_STYLE_ACCESS = "PathStyleAccess";
-
-    private static final String STORAGE_CLASS = "StorageClass";
-
     private TestRunner runner;
 
     private S3IcebergFileIOProvider provider;
@@ -88,9 +82,6 @@ void testGetFileIOSessionCredentials() {
         runner.setProperty(provider, S3IcebergFileIOProvider.SECRET_ACCESS_KEY, SECRET_ACCESS_KEY);
         runner.setProperty(provider, S3IcebergFileIOProvider.SESSION_TOKEN, SESSION_TOKEN);
         runner.setProperty(provider, S3IcebergFileIOProvider.CLIENT_REGION, CLIENT_REGION);
-        runner.setProperty(provider, S3IcebergFileIOProvider.ENDPOINT, ENDPOINT);
-        runner.setProperty(provider, S3IcebergFileIOProvider.PATH_STYLE_ACCESS, PATH_STYLE_ACCESS);
-        runner.setProperty(provider, S3IcebergFileIOProvider.STORAGE_CLASS, STORAGE_CLASS);
 
         runner.enableControllerService(provider);
 
@@ -105,9 +96,6 @@ void testGetFileIOSessionCredentials() {
             assertEquals(SECRET_ACCESS_KEY, configuredProperties.get(S3FileIOProperties.SECRET_ACCESS_KEY));
             assertEquals(SESSION_TOKEN, configuredProperties.get(S3FileIOProperties.SESSION_TOKEN));
             assertEquals(CLIENT_REGION, configuredProperties.get(AwsClientProperties.CLIENT_REGION));
-            assertEquals(ENDPOINT, configuredProperties.get(S3FileIOProperties.ENDPOINT));
-            assertEquals(PATH_STYLE_ACCESS, configuredProperties.get(S3FileIOProperties.PATH_STYLE_ACCESS));
-            assertEquals(STORAGE_CLASS, configuredProperties.get(S3FileIOProperties.WRITE_STORAGE_CLASS));
         }
     }
 

nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/pom.xml

@@ -50,6 +50,11 @@
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-parquet</artifactId>
         </dependency>
+        <!-- Iceberg Data dependencies -->
+        <dependency>
+            <groupId>org.apache.iceberg</groupId>
+            <artifactId>iceberg-data</artifactId>
+        </dependency>
         <!-- Override Parquet version from iceberg-parquet -->
         <dependency>
             <groupId>org.apache.parquet</groupId>