move feature switch

Author: Jonas-Isr

cloudplatform/connectivity-destination-service/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationService.java

@@ -80,10 +80,6 @@ public class DestinationService implements DestinationLoader
     @Getter( AccessLevel.PACKAGE )
     private final ResilienceConfiguration allDestResilience;
 
-    @Nonnull
-    @Setter
-    private Boolean prependGetAllDestinationCall = false;
-
     /**
      * Create instance with all default settings
      */
@@ -130,8 +126,7 @@ static ResilienceConfiguration createResilienceConfiguration(
                 this,
                 destinationName,
                 options,
-                this::loadAndParseDestination,
-                prependGetAllDestinationCall);
+                this::loadAndParseDestination);
     }
 
     Destination loadAndParseDestination( final String destName, final DestinationOptions options )
@@ -437,6 +432,8 @@ public static final class Cache
 
         private static boolean cacheEnabled = true;
         private static boolean changeDetectionEnabled = true;
+        private static boolean getAllDocumentsPrepended = false;
+        // JONAS: put feature switch here
 
         static {
             recreateSingleCache();
@@ -454,6 +451,14 @@ static boolean isChangeDetectionEnabled()
             return changeDetectionEnabled;
         }
 
+        static boolean isGetAllDocumentsPrepended() {
+          return getAllDocumentsPrepended;
+        }
+
+        public static void setGetAllDocumentsPrepended(boolean bool) {
+          getAllDocumentsPrepended = bool;
+        }
+
         @Nonnull
         static com.github.benmanes.caffeine.cache.Cache<CacheKey, Destination> instanceSingle()
         {
@@ -507,6 +512,7 @@ static void reset()
                 cacheEnabled = true;
             }
             changeDetectionEnabled = true;
+            getAllDocumentsPrepended = false;
 
             sizeLimit = Option.some(DEFAULT_SIZE_LIMIT);
             expirationDuration = Option.some(DEFAULT_EXPIRATION_DURATION);
@@ -850,8 +856,7 @@ private static Try<Destination> getOrComputeDestination(
             @Nonnull final DestinationService loader,
             @Nonnull final String destinationName,
             @Nonnull final DestinationOptions options,
-            @Nonnull final BiFunction<String, DestinationOptions, Destination> destinationDownloader,
-            @Nonnull final Boolean prependGetAllCall )
+            @Nonnull final BiFunction<String, DestinationOptions, Destination> destinationDownloader)
         {
             if( !cacheEnabled ) {
                 return Try.ofSupplier(() -> destinationDownloader.apply(destinationName, options));
@@ -879,7 +884,7 @@ private static Try<Destination> getOrComputeDestination(
                         isolationLocks(),
                         destinationDownloader,
                         getAllCommand,
-                        prependGetAllCall);
+                        getAllDocumentsPrepended);
             return command.flatMap(GetOrComputeSingleDestinationCommand::execute);
         }
 

cloudplatform/connectivity-destination-service/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationServiceTest.java

@@ -1930,7 +1930,8 @@ void testPrependGetAllDestinationsCall()
             .when(destinationServiceAdapter)
             .getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
 
-        loader.setPrependGetAllDestinationCall(true);
+          DestinationService.Cache.setGetAllDocumentsPrepended(true);
+
 
         final DestinationOptions options =
             DestinationOptions.builder().augmentBuilder(augmenter().retrievalStrategy(ALWAYS_PROVIDER)).build();
@@ -1943,7 +1944,7 @@ void testPrependGetAllDestinationsCall()
             .getConfigurationAsJson(eq("/v1/destinations/" + destinationName), any());
         verifyNoMoreInteractions(destinationServiceAdapter);
 
-        loader.setPrependGetAllDestinationCall(false);
+      DestinationService.Cache.setGetAllDocumentsPrepended(false);
     }
 
     @Test
@@ -1956,7 +1957,7 @@ void testPrependGetAllDestinationsCallWithMissingDestination()
             .when(destinationServiceAdapter)
             .getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
 
-        loader.setPrependGetAllDestinationCall(true);
+      DestinationService.Cache.setGetAllDocumentsPrepended(true);
 
         final DestinationOptions options =
             DestinationOptions.builder().augmentBuilder(augmenter().retrievalStrategy(ALWAYS_PROVIDER)).build();
@@ -1969,6 +1970,6 @@ void testPrependGetAllDestinationsCallWithMissingDestination()
         verify(destinationServiceAdapter, times(1)).getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
         verifyNoMoreInteractions(destinationServiceAdapter);
 
-        loader.setPrependGetAllDestinationCall(false);
+      DestinationService.Cache.setGetAllDocumentsPrepended(false);
     }
 }