Removed unnecessary logic

Author: dave-fn

core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSupplier.java

@@ -18,6 +18,7 @@
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -105,8 +106,8 @@ static ProfileFileSupplier fixedProfileFile(ProfileFile profileFile) {
     }
 
     /**
-     * Creates a {@link ProfileFileSupplier} by combining the {@link ProfileFile} objects from two {@code ProfileFileSupplier}s.
-     * Objects are passed into {@link ProfileFile.Aggregator}.
+     * Creates a {@link ProfileFileSupplier} by combining the {@link ProfileFile} objects from multiple {@code
+     * ProfileFileSupplier}s. Objects are passed into {@link ProfileFile.Aggregator}.
      *
      * @param suppliers Array of {@code ProfileFileSupplier} objects. {@code ProfileFile} objects are passed to
      *                  {@link ProfileFile.Aggregator#addFile(ProfileFile)} in the same argument order as the supplier that
@@ -118,25 +119,41 @@ static ProfileFileSupplier aggregate(ProfileFileSupplier... suppliers) {
         return new ProfileFileSupplier() {
 
             final AtomicReference<ProfileFile> currentAggregateProfileFile = new AtomicReference<>();
+            final ConcurrentHashMap<Supplier<ProfileFile>, ProfileFile> currentValuesBySupplier = new ConcurrentHashMap<>();
 
             @Override
             public ProfileFile get() {
-                ProfileFile.Aggregator aggregator = ProfileFile.aggregator();
+                boolean refreshAggregate = false;
                 for (ProfileFileSupplier supplier : suppliers) {
-                    aggregator.addFile(supplier.get());
+                    if (didSuppliedValueChange(supplier)) {
+                        refreshAggregate = true;
+                    }
+                }
+
+                if (refreshAggregate) {
+                    refreshCurrentAggregate();
                 }
 
-                return refreshAndGetCurrentAggregate(aggregator);
+                return  currentAggregateProfileFile.get();
+            }
+
+            private boolean didSuppliedValueChange(Supplier<ProfileFile> supplier) {
+                ProfileFile next = supplier.get();
+                ProfileFile current = currentValuesBySupplier.put(supplier, next);
+
+                return !Objects.equals(next, current);
             }
 
-            private ProfileFile refreshAndGetCurrentAggregate(ProfileFile.Aggregator aggregator) {
+            private void refreshCurrentAggregate() {
+                ProfileFile.Aggregator aggregator = ProfileFile.aggregator();
+                currentValuesBySupplier.values()
+                                       .stream()
+                                       .forEach(aggregator::addFile);
                 ProfileFile current = currentAggregateProfileFile.get();
                 ProfileFile next = aggregator.build();
                 if (!Objects.equals(current, next)) {
                     currentAggregateProfileFile.compareAndSet(current, next);
                 }
-
-                return currentAggregateProfileFile.get();
             }
 
         };

core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileRefresher.java

@@ -23,7 +23,6 @@
 import java.time.Instant;
 import java.util.Objects;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
@@ -44,12 +43,10 @@ public final class ProfileFileRefresher {
     private volatile ProfileFileRefreshRecord currentRefreshRecord;
     private final Supplier<ProfileFile> profileFile;
     private final Path profileFilePath;
-    private final Function<RuntimeException, ProfileFile> exceptionHandler;
     private final Consumer<ProfileFile> onProfileFileReload;
     private final Clock clock;
 
     private ProfileFileRefresher(Builder builder) {
-        this.exceptionHandler = builder.exceptionHandler;
         this.clock = builder.clock;
         this.profileFile = builder.profileFile;
         this.profileFilePath = builder.profileFilePath;
@@ -81,18 +78,7 @@ public ProfileFile refreshIfStale() {
     }
 
     private RefreshResult<ProfileFileRefreshRecord> refreshResult() {
-        try {
-            return reloadAsRefreshResultIfStale();
-        } catch (RuntimeException exception) {
-            Instant now = Instant.now();
-            ProfileFile exceptionProfileFile = exceptionHandler.apply(exception);
-            ProfileFileRefreshRecord refreshRecord = ProfileFileRefreshRecord.builder()
-                                                                             .profileFile(exceptionProfileFile)
-                                                                             .refreshTime(now)
-                                                                             .build();
-
-            return wrapIntoRefreshResult(refreshRecord, now);
-        }
+        return reloadAsRefreshResultIfStale();
     }
 
     private RefreshResult<ProfileFileRefreshRecord> reloadAsRefreshResultIfStale() {
@@ -156,7 +142,6 @@ public static final class Builder {
         private Supplier<ProfileFile> profileFile;
         private Path profileFilePath;
         private Consumer<ProfileFile> onProfileFileReload = p -> { };
-        private Function<RuntimeException, ProfileFile> exceptionHandler;
         private Clock clock = Clock.systemUTC();
 
         private Builder() {
@@ -181,15 +166,6 @@ public Builder clock(Clock clock) {
             return this;
         }
 
-        /**
-         * @param exceptionHandler Handler which takes action when a Runtime exception occurs while loading a profile file.
-         *                         Handler can return a previously stored profile file or throw back the exception.
-         */
-        public Builder exceptionHandler(Function<RuntimeException, ProfileFile> exceptionHandler) {
-            this.exceptionHandler = exceptionHandler;
-            return this;
-        }
-
         /**
          * Sets a custom action to perform when a profile file is reloaded. This action is executed when both the cache is stale
          * and the disk file associated with the profile file has been modified since the last load.